Skip to content

M
mkimage-profiles
Commit 79bb3f8d authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

plant SHELL beacons into all config-forming rules

As noted in doc/assumptions.txt, the SHELL based target tracing only works for rules with recipes, even empty but present ones. The simplest thing to do is hooking "; @:" onto the rule's tail (one-liner with a non-printing shell builting "true" command).
parent 788cad88
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 31 deletions
conf.d/desktop.mk
View file @ 79bb3f8d
......@@ -7,18 +7,15 @@ distro/.desktop-base: distro/.installer \
distro/.desktop-mini: distro/.desktop-base \
use/lowmem use/x11/xdm use/power/acpi/button \
use/cleanup/alterator
use/cleanup/alterator; @:
distro/icewm: distro/.desktop-mini +icewm
distro/tde: distro/.desktop-mini use/x11/kdm
distro/tde: distro/.desktop-mini +tde
@$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (network || tde)))
distro/ltsp-icewm: distro/icewm +ltsp
distro/ltsp-tde: distro/tde +ltsp
$(call tags,(base || desktop) && network))
distro/desktop-systemd: distro/icewm use/systemd
distro/icewm: distro/.desktop-mini +icewm; @:
distro/ltsp-icewm: distro/icewm +ltsp; @:
distro/ltsp-tde: distro/tde +ltsp; @:
distro/desktop-systemd: distro/icewm use/systemd; @:
endif
conf.d/live.mk
View file @ 79bb3f8d
......@@ -2,15 +2,14 @@
ifeq (distro,$(IMAGE_CLASS))
distro/syslinux: distro/.init \
use/syslinux/localboot.cfg use/syslinux/ui-vesamenu \
use/hdt use/memtest
use/syslinux/localboot.cfg use/syslinux/ui-vesamenu use/hdt; @:
distro/dos: distro/.init use/dos use/syslinux/ui-menu
distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
distro/live-systemd: distro/.base use/live/base use/systemd
distro/dos: distro/.init use/dos use/syslinux/ui-menu; @:
distro/rescue: distro/.base use/rescue use/syslinux/ui-menu; @:
distro/live-systemd: distro/.base use/live/base use/systemd; @:
distro/.live-base: distro/.base use/live/base use/power/acpi/button
distro/.live-desktop: distro/.base use/syslinux/ui-vesamenu +live
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
distro/.live-desktop: distro/.base use/syslinux/ui-vesamenu +live; @:
distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
......@@ -26,9 +25,9 @@ distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
distro/live-install: distro/.live-base use/syslinux/localboot.cfg
@$(call add,LIVE_PACKAGES,live-install)
distro/live-icewm: distro/.live-desktop use/live/autologin +icewm
distro/live-razorqt: distro/.live-desktop +razorqt
distro/live-tde: distro/.live-desktop +tde
distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
distro/live-razorqt: distro/.live-desktop +razorqt; @:
distro/live-tde: distro/.live-desktop +tde; @:
distro/live-rescue: distro/live-icewm
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
......
conf.d/server.mk
View file @ 79bb3f8d
......@@ -12,7 +12,7 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator
$(call tags,base && (server || network || security || pkg)))
@$(call add,BASE_LISTS,$(call tags,extra (server || network)))
distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo
distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:
distro/server-ovz: distro/server-mini \
use/hdt use/rescue use/firmware/server use/power/acpi/button
......
features.in/hdt/config.mk
View file @ 79bb3f8d
use/hdt: use/syslinux use/memtest
# optimized out use/syslinux due to use/memtest
use/hdt: use/memtest
@$(call add_feature)
@$(call add,STAGE1_PACKAGES,pciids)
@$(call add,SYSLINUX_MODULES,hdt)
features.in/live/config.mk
View file @ 79bb3f8d
+live: use/live/desktop
+live: use/live/desktop; @:
# copy stage2 as live
use/live: use/stage2 sub/stage2/live
......
features.in/ltsp/config.mk
View file @ 79bb3f8d
+ltsp: use/ltsp/base
+ltsp: use/ltsp/base; @:
use/ltsp:
@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
......
features.in/x11/config.mk
View file @ 79bb3f8d
+icewm: use/x11/icewm
+razorqt: use/x11/razorqt use/x11/lightdm
+tde: use/x11/tde use/x11/kdm
+icewm: use/x11/icewm; @:
+razorqt: use/x11/razorqt use/x11/lightdm; @:
+tde: use/x11/tde use/x11/kdm; @:
use/x11/xorg:
@$(call add,THE_LISTS,xorg)
......
lib/distro.mk
View file @ 79bb3f8d
......@@ -11,12 +11,12 @@ sub/%:
@$(call add,SUBPROFILES,$(@:sub/%=%))
# install media bootloader
boot/%: use/syslinux
boot/%:
@$(call set,BOOTLOADER,$*)
# fundamental targets
distro/.init: profile/bare
distro/.init: profile/bare; @:
# NB: the last flavour in KFLAVOURS gets to be the default one;
# the kernel packages regexp evaluation has to take place at build stage
......@@ -29,6 +29,6 @@ distro/installer: distro/.base use/install2 use/syslinux/localboot.cfg
@$(call set,INSTALLER,altlinux-generic)
@$(call set,STAGE1_KMODULES_REGEXP,drm.*) # for KMS
distro/.installer: distro/installer use/bootloader/grub use/repo/main
distro/.installer: distro/installer use/bootloader/grub use/repo/main; @:
endif
lib/sugar.mk
View file @ 79bb3f8d
......@@ -15,4 +15,4 @@ config/name/%:
@$(call set,IMAGE_NAME,$*)
# the final thing will pull the rest in
build: postclean
build: postclean; @:
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