Skip to content

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

e2k.mk: installer targets refactoring

This one started with pulling use/init/sysv/polkit out from distro/.e2k-installer since there are now some systemd-based e2k installers as well; it looks better to provide two distinct intermediate targets (and leave polkit-sysvinit up for the distro ones).
parent bc37f884
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
conf.d/e2k.mk
View file @ d87956cc
...@@ -56,10 +56,9 @@ distro/e2k-101-rescue: distro/.e2k-rescue ...@@ -56,10 +56,9 @@ distro/e2k-101-rescue: distro/.e2k-rescue
# NB: this one is NOT suited for a particular processor yet! # NB: this one is NOT suited for a particular processor yet!
# (that's to be done downstream) # (that's to be done downstream)
distro/.e2k-installer: distro/.base mixin/e2k-base \ distro/.e2k-installer-base: distro/.base mixin/e2k-base \
use/init/sysv/polkit use/net-ssh \ use/install2 use/install2/packages use/e2k/install2 \
use/install2 use/install2/packages \ use/net-ssh +net-eth
use/e2k/install2 +net-eth
@$(call set,INSTALLER,altlinux-generic) @$(call set,INSTALLER,altlinux-generic)
@$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT) @$(call set,META_VOL_SET,ALT)
...@@ -76,17 +75,21 @@ distro/.e2k-installer: distro/.base mixin/e2k-base \ ...@@ -76,17 +75,21 @@ distro/.e2k-installer: distro/.base mixin/e2k-base \
@$(call add,THE_BRANDING,alterator) @$(call add,THE_BRANDING,alterator)
@$(call set,BRANDING,alt-workstation) ### conflicts w/alt-sisyphus @$(call set,BRANDING,alt-workstation) ### conflicts w/alt-sisyphus
distro/e2k-801-builder: distro/.e2k-installer \ distro/.e2k-installer-sysv: distro/.e2k-installer-base +sysvinit; @:
distro/.e2k-installer: distro/.e2k-installer-base +systemd; @:
distro/e2k-801-builder: distro/.e2k-installer-sysv \
use/e2k/8c use/e2k/install2/801 use/dev/groups/builder; @: use/e2k/8c use/e2k/install2/801 use/dev/groups/builder; @:
distro/e2k-101-base: distro/.e2k-installer use/e2k/1cp use/e2k/install2/101 distro/e2k-101-base: distro/.e2k-installer-sysv use/e2k/1cp use/e2k/install2/101
@$(call add,INSTALL2_PACKAGES,dummy-xorg-drv-vivante) @$(call add,INSTALL2_PACKAGES,dummy-xorg-drv-vivante)
distro/e2k-101-mate: distro/e2k-101-base mixin/e2k-desktop mixin/e2k-mate distro/e2k-101-mate: distro/.e2k-installer use/e2k/101 \
mixin/e2k-desktop mixin/e2k-mate
@$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome) @$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome)
@$(call add,THE_PACKAGES,LibreOffice-langpack-ru) @$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
distro/e2k-4xx-installer: distro/.e2k-installer use/e2k/install2/4xx distro/e2k-4xx-installer: distro/.e2k-installer-sysv use/e2k/install2/4xx
@$(call set,INSTALLER,altlinux-server) @$(call set,INSTALLER,altlinux-server)
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm) @$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
......
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