From 7d09fed79b9055a9b69ee4954c94f95b600b1480 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 25 Apr 2012 14:20:17 +0300 Subject: [PATCH] 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). --- conf.d/simply.mk | 9 ++++++--- features.in/branding/config.mk | 1 - features.in/slinux/config.mk | 6 ++---- pkg.in/lists/slinux/misc | 17 ----------------- 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/conf.d/simply.mk b/conf.d/simply.mk index 537709e1..4f6472da 100644 --- 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 diff --git a/features.in/branding/config.mk b/features.in/branding/config.mk index 7c61feb2..e4d09fd6 100644 --- 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 diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index e766df67..6af23f2a 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -1,5 +1,7 @@ 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) diff --git a/pkg.in/lists/slinux/misc b/pkg.in/lists/slinux/misc index 9aad0077..a62d44d3 100644 --- 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-