simply: use/branding

NB: for the feature to work properly the chosen branding package set should have proper Provides: and Conflicts:, specifically it must explicitly conflict with the most lexicographically cool package set around (these days it's sisyphus-server-light).

simply: use/branding
7d09fed7 · Michael Shigorin · 51f5b880 · 7d09fed7 · 7d09fed7 · 7d09fed7
Commit 7d09fed7 authored Apr 25, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 25 deletions

simply.mk conf.d/simply.mk +6 -3

config.mk features.in/branding/config.mk +0 -1

config.mk features.in/slinux/config.mk +2 -4

misc pkg.in/lists/slinux/misc +0 -17

No files found.
--- a/conf.d/simply.mk
+++ b/conf.d/simply.mk
@@ -2,8 +2,11 @@

 ifeq (distro,$(IMAGE_CLASS))

-distro/live-simply: distro/.livecd-install use/isohybrid use/slinux-live use/systemd \
-	use/firmware/wireless use/x11/drm use/x11/3d-proprietary use/syslinux/ui/gfxboot
-	@$(call set,BRANDING,simply-linux)
+distro/live-simply: distro/.livecd-install use/isohybrid use/slinux \
+	use/systemd use/firmware/wireless use/x11/drm use/x11/3d-proprietary \
+	use/branding/complete
+	@$(call add,THE_PACKAGES,apt-conf-sisyphus)
+	@$(call add,THE_LISTS,slinux/live-install)
+	@$(call add,THE_PACKAGES,apt-conf-sisyphus)	###

 endif
--- a/features.in/branding/config.mk
+++ b/features.in/branding/config.mk
@@ -10,4 +10,3 @@ use/branding/full: use/branding use/syslinux/ui/gfxboot

 use/branding/complete: use/branding/full
 	@$(call add,INSTALL2_BRANDING,notes slideshow)
-	@$(call add,THE_BRANDING,menu)	### not sure if it's generic enough
--- a/features.in/slinux/config.mk
+++ b/features.in/slinux/config.mk
 use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add_feature)
+	@$(call set,BRANDING,simply-linux)
+	@$(call add,THE_BRANDING,menu xfce-settings)
 	@$(call add,THE_LISTS,gnome-p2p)
 	@$(call add,THE_LISTS,slinux/$(ARCH))
 	@$(call add,THE_LISTS,slinux/games)
@@ -11,7 +13,3 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add,THE_LISTS,slinux/network)
 	@$(call add,THE_LISTS,slinux/xfce)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
-	@$(call add,THE_PACKAGES,apt-conf-sisyphus)
-
-use/slinux-live: use/slinux
-	@$(call add,THE_LISTS,slinux/live-install)
--- a/pkg.in/lists/slinux/misc
+++ b/pkg.in/lists/slinux/misc
@@ -20,23 +20,6 @@ gdm2.20-help
 ntfsprogs-
 driconf-

-# Branding things
-branding-simply-linux-xfce-settings
-branding-simply-linux-menu
-branding-simply-linux-alterator
-branding-sisyphus-server-light-alterator-
-
-#branding-simply-linux-bootloader
-#branding-simply-linux-bootsplash
-branding-simply-linux-graphics
-branding-simply-linux-indexhtml
-branding-simply-linux-notes
-#branding-simply-linux-release
-branding-simply-linux-slideshow
-
-
-#added through use/syslinux/gfx... ?
-#branding-simply-linux-bootloader
 gdm-theme-simply

 kde4libs-