Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Anton Palgunov
mkimage-profiles
Commits
4c191a87
Commit
4c191a87
authored
Mar 21, 2019
by
Anton Midyukov
Committed by
Michael Shigorin
Apr 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mixin.mk, regular.mk: factored out mixin-builder
This mixin will be used for non-x86 image builds.
parent
2f5cb673
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
mixin.mk
conf.d/mixin.mk
+5
-0
regular.mk
conf.d/regular.mk
+3
-7
No files found.
conf.d/mixin.mk
View file @
4c191a87
...
@@ -113,6 +113,11 @@ mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
...
@@ -113,6 +113,11 @@ mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
use/syslinux/ui/menu use/syslinux/timeout/600 \
use/syslinux/ui/menu use/syslinux/timeout/600 \
use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
mixin/regular-builder: use/dev/builder/base use/net-eth/dhcp
@$(call add,THE_PACKAGES,bash-completion elinks gpm lftp openssh)
@$(call add,THE_PACKAGES,rpm-utils screen tmux wget zsh)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
### vm.mk
### vm.mk
mixin/cloud-init:
mixin/cloud-init:
@$(call add,BASE_PACKAGES,cloud-init)
@$(call add,BASE_PACKAGES,cloud-init)
...
...
conf.d/regular.mk
View file @
4c191a87
...
@@ -248,15 +248,11 @@ distro/regular-server-pve: distro/.regular-server-systemd \
...
@@ -248,15 +248,11 @@ distro/regular-server-pve: distro/.regular-server-systemd \
pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
distro/regular-builder: distro/.regular-bare \
distro/regular-builder: distro/.regular-bare
mixin/regular-builder
\
use/dev/builder/full +sysvinit +efi +power \
use/dev/builder/full +sysvinit +efi +power \
use/live/base use/live/rw use/live/repo/online use/live/textinstall \
use/live/base use/live/rw use/live/repo/online use/live/textinstall \
use/isohybrid use/syslinux/timeout/30 \
use/isohybrid use/syslinux/timeout/30 use/stage2/net-eth
use/stage2/net-eth use/net-eth/dhcp
@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
@$(call add,LIVE_PACKAGES,cifs-utils elinks lftp openssh wget)
@$(call add,LIVE_PACKAGES,bash-completion gpm screen tmux zsh)
@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
distro/regular-server-samba4: distro/.regular-server-managed
distro/regular-server-samba4: distro/.regular-server-managed
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment