Skip to content

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

regular.mk: use +nm

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.
parent a97ef4c9
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
conf.d/armh.mk
View file @ fd9a5fcb
...@@ -52,7 +52,7 @@ vm/.cubox-base: vm/.cubox-bare use/deflogin/altlinuxroot; @: ...@@ -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-gtk: vm/.cubox-base use/x11/lightdm/gtk +nm; @:
vm/cubox-xfce: vm/.cubox-bare use/slinux/arm use/oem use/net-usershares \ 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 vm/cubox-xfce-ru: vm/.cubox-gtk use/slinux/arm use/x11-autologin
@$(call add,BASE_PACKAGES,livecd-ru) @$(call add,BASE_PACKAGES,livecd-ru)
......
conf.d/regular.mk
View file @ fd9a5fcb
...@@ -47,17 +47,15 @@ else ...@@ -47,17 +47,15 @@ else
$(error $@ is known buggy on non-i586 at the moment) $(error $@ is known buggy on non-i586 at the moment)
endif 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 distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
@$(call add,LIVE_PACKAGES,livecd-regular-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,mobile mate))
@$(call add,LIVE_LISTS,$(call tags,desktop nm)) ### +nm?
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality
@$(call add,LIVE_PACKAGES,xterm) @$(call add,LIVE_PACKAGES,xterm)
...@@ -68,8 +66,7 @@ distro/regular-cinnamon: distro/.regular-gtk \ ...@@ -68,8 +66,7 @@ distro/regular-cinnamon: distro/.regular-gtk \
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @: distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:
distro/regular-tde: distro/.regular-desktop +tde +plymouth distro/regular-tde: distro/.regular-desktop +tde +plymouth +nm
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
@$(call add,LIVE_PACKAGES,kdegames kdeedu) @$(call add,LIVE_PACKAGES,kdegames kdeedu)
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \ distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
......
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