altcloud/mkimage-profiles
2
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

e2k, e2k.mk: better platform support

Browse Source 
The goal was simple: every use/e2k/{x11,install2}/$MACHINE
must be self-sufficient regarding platform support, that is
it must depend on the corresponding CPU-specific target.

A bit less make-tech but still better overall.

NB: llvm cleanup is not needed anymore after upgrade to
    Mesa-17/llvm-3.7, should be dropped like this year.
This commit is contained in:
Michael Shigorin 2018-05-23 14:59:35 +03:00
parent d87956cc51
commit 45d9147955
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/e2k.mk
View File

@ -79,10 +79,9 @@ distro/.e2k-installer-sysv: distro/.e2k-installer-base +sysvinit; @:
distro/.e2k-installer: distro/.e2k-installer-base +systemd; @: distro/.e2k-installer: distro/.e2k-installer-base +systemd; @:
distro/e2k-801-builder: distro/.e2k-installer-sysv \ distro/e2k-801-builder: distro/.e2k-installer-sysv \
use/e2k/8c use/e2k/install2/801 use/dev/groups/builder; @: use/e2k/install2/801 use/dev/groups/builder; @:
distro/e2k-101-base: distro/.e2k-installer-sysv use/e2k/1cp use/e2k/install2/101 distro/e2k-101-base: distro/.e2k-installer-sysv use/e2k/install2/101; @:
@$(call add,INSTALL2_PACKAGES,dummy-xorg-drv-vivante)
distro/e2k-101-mate: distro/.e2k-installer use/e2k/101 \ distro/e2k-101-mate: distro/.e2k-installer use/e2k/101 \
mixin/e2k-desktop mixin/e2k-mate mixin/e2k-desktop mixin/e2k-mate

36
features.in/e2k/config.mk
View File

@ -1,40 +1,48 @@
use/e2k: use/e2k:
@$(call add_feature) @$(call add_feature)
# at least one of these is requisite
use/e2k/1cp use/e2k/4c use/e2k/8c: use/e2k/%: use/e2k use/e2k/1cp use/e2k/4c use/e2k/8c: use/e2k/%: use/e2k
@$(call set,KFLAVOURS,elbrus-$*) @$(call set,KFLAVOURS,elbrus-$*)
use/e2k/x11: use/e2k use/x11 use/e2k/x11: use/e2k use/x11
@$(call add,THE_PACKAGES,xorg-server xinit) @$(call add,THE_PACKAGES,xorg-server xinit)
use/e2k/x11/401 use/e2k/x11/801: use/e2k/x11/%: use/e2k/x11 use/e2k/x11/401: use/e2k/x11 use/e2k/4c
@$(call add,THE_PACKAGES,xorg-conf-e$*-radeon) @$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
@$(call add,THE_PACKAGES,xorg-drv-ati) @$(call add,THE_PACKAGES,xorg-drv-ati)
use/e2k/x11/101: use/e2k/x11 use/e2k/x11/801: use/e2k/x11 use/e2k/8c
@$(call add,THE_PACKAGES,xorg-conf-e801-radeon)
@$(call add,THE_PACKAGES,xorg-drv-ati)
use/e2k/x11/101: use/e2k/x11 use/e2k/1cp
@$(call add,THE_PACKAGES,xorg-conf-e101-modesetting) @$(call add,THE_PACKAGES,xorg-conf-e101-modesetting)
@$(call add,THE_PACKAGES,dummy-xorg-drv-vivante) @$(call add,THE_PACKAGES,dummy-xorg-drv-vivante)
use/e2k/install2: use/e2k use/e2k/install2: use/e2k
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
use/e2k/install2/desktop: use/e2k/install2 use/e2k/install2/desktop: use/e2k/install2
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-ignore-cf-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
use/e2k/install2/401 use/e2k/install2/801 use/e2k/install2/101: \
use/e2k/install2/%: use/e2k/install2/desktop
@$(call add,INSTALL2_PACKAGES,xorg-conf-e$*-modesetting)
@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
use/e2k/install2/4xx: use/e2k/install2 use/e2k/4c use/e2k/install2/4xx: use/e2k/install2 use/e2k/4c
@$(call add,INSTALL2_PACKAGES,xorg-conf-e4xx-fbdev) @$(call add,INSTALL2_PACKAGES,xorg-conf-e4xx-fbdev)
@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
use/e2k/install2/401: use/e2k/install2/desktop use/e2k/4c
@$(call add,INSTALL2_PACKAGES,xorg-conf-e401-modesetting)
use/e2k/install2/801: use/e2k/install2/desktop use/e2k/8c
@$(call add,INSTALL2_PACKAGES,xorg-conf-e801-modesetting)
use/e2k/install2/101: use/e2k/install2/desktop use/e2k/1cp
@$(call add,INSTALL2_PACKAGES,xorg-conf-e101-modesetting)
@$(call add,INSTALL2_PACKAGES,dummy-xorg-drv-vivante)
use/e2k/sound/401: use/e2k/sound/401:
@$(call add,THE_PACKAGES,setup-alsa-elbrus-401) @$(call add,THE_PACKAGES,setup-alsa-elbrus-401)
use/e2k/401: use/e2k/4c \ use/e2k/401: use/e2k/install2/401 use/e2k/x11/401 use/e2k/sound/401; @:
use/e2k/x11/401 use/e2k/sound/401 use/e2k/install2/401; @: use/e2k/801: use/e2k/install2/801 use/e2k/x11/801; @:
use/e2k/101: use/e2k/install2/101 use/e2k/x11/101; @:
use/e2k/801: use/e2k/8c use/e2k/x11/801 use/e2k/install2/801; @:
use/e2k/101: use/e2k/1cp use/e2k/x11/101 use/e2k/install2/101; @: