keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mixin.mk, regular.mk: factored out mixin-builder

Browse Source 
This mixin will be used for non-x86 image builds.
This commit is contained in:
Anton Midyukov 2019-03-21 12:55:20 +07:00 committed by Michael Shigorin
parent 2f5cb67331
commit 4c191a8727
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/mixin.mk
View File

@ -113,6 +113,11 @@ mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
use/syslinux/ui/menu use/syslinux/timeout/600 \
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
mixin/cloud-init:
@$(call add,BASE_PACKAGES,cloud-init)

10
conf.d/regular.mk
View File

@ -248,15 +248,11 @@ distro/regular-server-pve: distro/.regular-server-systemd \
pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
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/live/base use/live/rw use/live/repo/online use/live/textinstall \
use/isohybrid use/syslinux/timeout/30 \
use/stage2/net-eth use/net-eth/dhcp
@$(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)
use/isohybrid use/syslinux/timeout/30 use/stage2/net-eth
@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
distro/regular-server-samba4: distro/.regular-server-managed
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))