armh.mk: rebased cubox images

Most of these are slated to employ oem feature by now, no sense to call it in almost every dependency chain; the only image left with predefined locale and credentials is cubox-xfce-ru.

armh.mk: rebased cubox images
615d1793 · Michael Shigorin · fc3569a4 · 615d1793
Commit 615d1793 authored Jul 22, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 8 deletions

armh.mk conf.d/armh.mk +11 -8

No files found.
--- a/conf.d/armh.mk
+++ b/conf.d/armh.mk
@@ -49,19 +49,22 @@ vm/.cubox-bare: vm/.arm-base use/armh use/armh-cubox use/services/ssh +systemd \
 	@$(call add,BASE_PACKAGES,LibreOffice4-full LibreOffice4-langpack-ru)
 	@$(call add,BASE_LISTS,$(call tags,(base || desktop) && regular))

-vm/.cubox-base: vm/.cubox-bare use/deflogin/altlinuxroot; @:
-vm/.cubox-gtk: vm/.cubox-base use/x11/lightdm/gtk +nm; @:
-
-vm/cubox-xfce: vm/.cubox-bare use/slinux/arm use/oem use/net-usershares \
-	use/domain-client +nm; @:
+vm/.cubox-base: vm/.cubox-bare use/oem; @:

-vm/cubox-xfce-ru: vm/.cubox-gtk use/slinux/arm use/x11-autologin
+vm/cubox-xfce-ru: vm/.cubox-bare use/deflogin/altlinuxroot \
+	use/slinux/arm use/x11/lightdm/gtk use/x11-autologin +nm
 	@$(call add,BASE_PACKAGES,livecd-ru)

+# these images use a king of OEM setup
+vm/.cubox-gtk: vm/.cubox-base use/x11/lightdm/gtk +nm; @:
+
+vm/cubox-xfce: vm/.cubox-gtk \
+	use/slinux/arm use/net-usershares use/domain-client; @:
+
 vm/cubox-mate: vm/.cubox-gtk use/x11/mate; @:

-vm/cubox-kde4: vm/.cubox-bare \
-	use/oem use/x11/kde4 use/x11/kdm4 use/fonts/zerg +pulse +nm
+vm/cubox-kde4: vm/.cubox-base use/x11/kde4 use/x11/kdm4 use/fonts/zerg +pulse
+	@$(call add,BASE_LISTS,$(call tags,desktop && kde4 && !extra))

 endif