slinux: fix e2k build

plymouth might better be used through the corresponding feature (it's the single place to know how it performs on various arches), and some other packages are just missing.

slinux: fix e2k build
949d005e · Michael Shigorin · Anton Midyukov · 9024e2db · 949d005e · 949d005e
Commit 949d005e authored Mar 23, 2021 by Michael Shigorin Committed by Anton Midyukov Apr 28, 2021
5 changed files
--- a/conf.d/slinux.mk
+++ b/conf.d/slinux.mk
@@ -9,7 +9,10 @@ distro/slinux-live: distro/.livecd-install use/slinux/base

 distro/slinux: distro/.installer use/slinux/full use/rescue/base
 	@$(call set,INSTALLER,simply-linux)
-	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/multimedia-full-sound-juicer slinux/multimedia-full-obs-studio slinux/net-base)
+	@$(call add,MAIN_GROUPS,slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/multimedia-full-sound-juicer slinux/multimedia-full-obs-studio slinux/net-base)
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/graphics-full-shotwell)
+endif
 	@$(call set,META_VOL_ID,Simply Linux $(DISTRO_VERSION) $(ARCH))
 	@$(call set,META_APP_ID,Simply Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
 	@$(call set,KFLAVOURS,un-def)

--- a/pkg.in/lists/slinux/games-base
+++ b/pkg.in/lists/slinux/games-base
@@ -14,7 +14,7 @@ gnome-games-klotski
 #gnome-games-iagno
 gnome-games-mahjongg
 #gnome-games-swell-foop
-gnome-games-aisleriot
+gnome-games-aisleriot@!E2K
 # ALT bug #28998
 #gnome-games-sudoku
 gnome-games-chess
--- a/pkg.in/lists/slinux/games-full
+++ b/pkg.in/lists/slinux/games-full
@@ -7,7 +7,7 @@ freeciv
 Ri-li
 openttd
 #astromenace
-PokerTH
+PokerTH@!E2K

 #celestia-gnome


--- a/pkg.in/lists/slinux/misc-base
+++ b/pkg.in/lists/slinux/misc-base
@@ -152,7 +152,7 @@ rekonq-@ARM
 xdg-user-dirs
 x-cursor-theme-jimmac

-plymouth
+plymouth@!E2K
 #branding-simply-linux-bootsplash

 # Office

--- a/pkg.in/lists/slinux/misc-full
+++ b/pkg.in/lists/slinux/misc-full
@@ -7,7 +7,8 @@ stardict-engcom

 # NVIDIA drivers
 #kernel-modules-nvidia-@KERNEL_MOD@
-nvidia-xconfig
+nvidia-xconfig@X86
+nvidia-xconfig@aarch64

 # ATI proprietary driver
 #fglrx_glx