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

regular.mk: use +nm

Browse Source 
regular-xfce managed to lack NM somehow (so it even lacked
network after being installed since some build which wasn't
identified right away unfortunately); let's fix that either
during this small refactoring.
This commit is contained in:
Michael Shigorin 2013-06-26 09:58:32 +04:00
parent a97ef4c905
commit fd9a5fcbe2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.d/armh.mk
View File

@ -52,7 +52,7 @@ 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
use/domain-client +nm; @:
vm/cubox-xfce-ru: vm/.cubox-gtk use/slinux/arm use/x11-autologin
@$(call add,BASE_PACKAGES,livecd-ru)

11
conf.d/regular.mk
View File

@ -47,17 +47,15 @@ else
$(error $@ is known buggy on non-i586 at the moment)
endif
distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
distro/regular-xfce: distro/.regular-gtk use/x11/xfce +nm; @:
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm
distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
distro/regular-mate: distro/.regular-gtk use/x11/mate
distro/regular-mate: distro/.regular-gtk use/x11/mate +nm
@$(call add,LIVE_LISTS,$(call tags,mobile mate))
@$(call add,LIVE_LISTS,$(call tags,desktop nm)) ### +nm?
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality
@$(call add,LIVE_PACKAGES,xterm)
@ -68,8 +66,7 @@ distro/regular-cinnamon: distro/.regular-gtk \
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:
distro/regular-tde: distro/.regular-desktop +tde +plymouth
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
distro/regular-tde: distro/.regular-desktop +tde +plymouth +nm
@$(call add,LIVE_PACKAGES,kdegames kdeedu)
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \