Skip to content

M
mkimage-profiles
Commit ba00aa4d authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

dev, regular.mk: separate subtargets for sysv/systemd from use/dev/builder/live

For systemd not needed livecd-qemu-arch. systemd-binfmt.service makes all the work.
parent 44c60e5c
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 1 deletion
conf.d/regular.mk
View file @ ba00aa4d
...@@ -257,7 +257,7 @@ distro/regular-server-pve: distro/.regular-server-base +systemd \ ...@@ -257,7 +257,7 @@ distro/regular-server-pve: distro/.regular-server-base +systemd \
pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy) pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
distro/regular-builder: distro/.regular-bare mixin/regular-builder \ distro/regular-builder: distro/.regular-bare mixin/regular-builder \
use/dev/builder/live use/stage2/kms +sysvinit +efi +power +nm \ use/dev/builder/live/sysv use/stage2/kms +sysvinit +efi +power +nm \
use/live/base use/live/rw use/live/repo use/live/textinstall \ use/live/base use/live/rw use/live/repo use/live/textinstall \
use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30 use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30
@$(call add,THE_PACKAGES,ccache cifs-utils wodim) @$(call add,THE_PACKAGES,ccache cifs-utils wodim)
......
features.in/dev/config.mk
View file @ ba00aa4d
...@@ -16,8 +16,17 @@ use/dev/builder/base: use/dev/mkimage ...@@ -16,8 +16,17 @@ use/dev/builder/base: use/dev/mkimage
use/dev/builder/live: use/dev/builder/base use/dev/builder/live: use/dev/builder/base
@$(call add,LIVE_LISTS,$(call tags,live builder)) @$(call add,LIVE_LISTS,$(call tags,live builder))
ifeq (,$(filter-out x86_64 ,$(ARCH))) ifeq (,$(filter-out x86_64 ,$(ARCH)))
use/dev/builder/live/sysv: use/dev/builder/live
@$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc) @$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc)
use/dev/builder/live/systemd: use/dev/builder/live
@$(call add,LIVE_PACKAGES,qemu-user-static-binfmt)
@$(call add,DEFAULT_SERVICES_ENABLE,systemd-binfmt)
else
use/dev/builder/live/sysv use/dev/builder/live/systemd: \
use/dev/builder/live; @:
endif endif
use/dev/builder/full: use/dev use/dev/builder/live use/dev/repo use/dev/builder/full: use/dev use/dev/builder/live use/dev/repo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment