Skip to content

M
mkimage-profiles
Commit 62ab13cc authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

distro/installer related graph cleanup

As was duly noted by Leo-sp50, both server.mk and desktop.mk duplicate a few bits layered over bare distro/installer which happened to be both a dependency (thus should reduce redundancy) and a "real distro" target (well, it doesn't just work yet, need to provide networking and sources.list in install2 by hand). Fixed by moving a "node" to distro/.installer along with typical additions and leaving a bare installer as is by now; there's a need to get it working at least for DHCP/ftp.altlinux.org case.
parent 4355f401
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
conf.d/desktop.mk
View file @ 62ab13cc
# desktop distributions
ifeq (distro,$(IMAGE_CLASS))
distro/desktop-base: distro/installer use/repo/main \
use/syslinux/ui-vesamenu use/x11/xorg use/bootloader/grub
distro/desktop-base: distro/.installer \
use/syslinux/ui-vesamenu use/x11/xorg
@$(call set,INSTALLER,desktop)
distro/desktop-mini: distro/desktop-base \
......
conf.d/live.mk
View file @ 62ab13cc
# live images
ifeq (distro,$(IMAGE_CLASS))
distro/syslinux: distro/.init \
use/syslinux/localboot.cfg use/syslinux/ui-vesamenu \
use/hdt use/memtest
distro/dos: distro/.init use/dos use/syslinux/ui-menu
distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
distro/live: distro/.base use/live/base use/power/acpi/cpufreq
......
conf.d/server.mk
View file @ 62ab13cc
# server distributions
ifeq (distro,$(IMAGE_CLASS))
distro/server-base: distro/installer use/repo/main \
use/syslinux/ui-menu use/memtest use/bootloader/grub
distro/server-base: distro/.installer use/syslinux/ui-menu use/memtest
@$(call add,BASE_LISTS,server-base)
distro/server-mini: distro/server-base use/cleanup/x11-alterator
......
lib/distro.mk
View file @ 62ab13cc
......@@ -23,15 +23,12 @@ distro/.init: profile/bare
distro/.base: distro/.init
@$(call set,KFLAVOURS,std-def)
# bootloader test target
distro/syslinux: distro/.init \
use/syslinux/localboot.cfg use/syslinux/ui-vesamenu \
use/hdt use/memtest
# something marginally useful (as a network-only installer)
# NB: doesn't carry stage3 thus cannot use/bootloader
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
endif
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