Skip to content

M
mkimage-profiles
Commit 7d09fed7 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

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).
parent 51f5b880
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 25 deletions
conf.d/simply.mk
View file @ 7d09fed7
......@@ -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
features.in/branding/config.mk
View file @ 7d09fed7
......@@ -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
features.in/slinux/config.mk
View file @ 7d09fed7
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)
pkg.in/lists/slinux/misc
View file @ 7d09fed7
......@@ -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-
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment