Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit 74126092 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

dev, live.mk: refactor live-builder bits

It feels like time to introduce regular-builder.iso, let's help it by factoring most of the common part out into the feature.
parent 6082b77d
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 12 deletions
conf.d/live.mk
View file @ 74126092
...@@ -21,20 +21,12 @@ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \ ...@@ -21,20 +21,12 @@ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/fonts/otf/adobe +power use/fonts/otf/adobe +power
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common') @$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \ distro/live-builder-mini: distro/.live-base use/dev/builder/base \
use/stage2/net-eth use/net-eth/dhcp use/syslinux/timeout/30 \ use/syslinux/timeout/30 use/isohybrid \
use/isohybrid use/stage2/net-eth use/net-eth/dhcp; @:
@$(call set,KFLAVOURS,$(BIGRAM))
@$(call add,LIVE_LISTS,\
$(call tags,(base || live) && (server || builder)))
@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
@$(call add,LIVE_PACKAGES,zsh sudo)
distro/live-builder: distro/live-builder-mini \ distro/live-builder: distro/live-builder-mini \
use/efi/signed use/live/rw use/live/repo use/dev/repo use/dev/builder/full use/live/rw +efi; @:
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
distro/live-install: distro/.live-base use/live/textinstall; @: distro/live-install: distro/.live-base use/live/textinstall; @:
distro/.livecd-install: distro/.live-base use/live/install; @: distro/.livecd-install: distro/.live-base use/live/install; @:
......
features.in/dev/config.mk
View file @ 74126092
...@@ -11,3 +11,15 @@ use/dev/repo: use/dev use/repo/main ...@@ -11,3 +11,15 @@ use/dev/repo: use/dev use/repo/main
@$(call add,MAIN_PACKAGES,rpm-build basesystem) @$(call add,MAIN_PACKAGES,rpm-build basesystem)
@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check) @$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator) @$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
use/dev/builder/base: use/dev/mkimage use/dev
@$(call set,KFLAVOURS,$(BIGRAM))
@$(call add,LIVE_LISTS,\
$(call tags,(base || live) && (server || builder)))
@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
use/dev/builder/full: use/dev/builder/base use/dev/repo
@$(call add,MAIN_LISTS,$(call tags,live builder))
@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ xorriso)
@$(call add,LIVE_PACKAGES,sudo)
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