keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactored regular images

Browse Source 
This change mostly concerns with making icewm flavour
the lean one again.

The goal is to widen the dynamic range of regular image features:
icewm is not a desktop thus can bear withouth systemd-logind
even if a bunch of network-managing-media-mounting crap has been
rigged to depend on it, and ALT domain client should be included
in most builds for convenient testing in SMB environments but can
stay out of this minimal and "different" image.

It also receives the "un-def" kernel flavour (3.8.0 as of today)
which might benefit from the more available testing facility too.

Its branding is also simplified, plain syslinux menu is fine;
in similar vein, refind feature is flipped from icewm-only to
all-but-icewm set of images with its state being good enough
as of refind 0.6.7 and mkimage 0.2.7.
This commit is contained in:
Michael Shigorin 2013-02-21 12:13:06 +04:00
parent 83790cbc31
commit 85223fc12a
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
conf.d/regular.mk
View File

@ -1,24 +1,31 @@
# regular build/usage images
ifeq (distro,$(IMAGE_CLASS))
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
# WM base target
distro/.regular-base: distro/.base +live +wireless use/live/ru \
use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
use/systemd use/firmware/wireless use/efi/signed use/luks \
+vmguest use/memtest use/branding use/syslinux/ui/gfxboot
use/firmware/wireless use/efi/signed use/luks \
+vmguest use/memtest use/branding
@$(call add,LIVE_LISTS,$(call tags,base regular))
@$(call add,LIVE_LISTS,$(call tags,rescue extra))
@$(call add,LIVE_LISTS,domain-client)
@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
@$(call set,KFLAVOURS,std-def)
@$(call add,THE_BRANDING,indexhtml notes alterator)
@$(call add,KMODULES,r8168)
@$(call try,SAVE_PROFILE,yes)
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-base \
use/systemd use/syslinux/ui/gfxboot use/efi/refind
@$(call add,LIVE_LISTS,domain-client)
@$(call add,THE_BRANDING,bootloader)
@$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
@$(call add,THE_BRANDING,graphics)
distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind
distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm
@$(call add,LIVE_PACKAGES,xxkb mutt)
@$(call set,KFLAVOURS,un-def)
distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
@ -42,7 +49,6 @@ distro/regular-tde: distro/.regular-desktop +tde +plymouth
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 +plymouth
@$(call add,LIVE_PACKAGES,kde4-regular)
@$(call add,LIVE_PACKAGES,plasma-applet-networkmanager)
@$(call add,LIVE_PACKAGES,settime-rfc867) # time sync for kerberos
distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:

3
pkg.in/lists/domain-client
View File

@ -13,6 +13,8 @@ installer-feature-weak-passwd
libnss-fallback
libnss-mdns
settime-rfc867
krb5-ticket-watcher
alterator-browser-qt
@ -20,4 +22,3 @@ alterator-standalone
alterator-auth
alterator-net-shares