Skip to content

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

live.mk: use/live/ru related refactoring

Introduced distro/.live-desktop-ru as a shortcut for distro/.live-desktop use/live/ru which occurs several times already (and the counter will increase right now).
parent 0efba3e4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
conf.d/live.mk
View file @ 165059b1
...@@ -8,6 +8,7 @@ distro/syslinux: distro/.init \ ...@@ -8,6 +8,7 @@ distro/syslinux: distro/.init \
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @: distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
distro/.live-desktop: distro/.base +live use/plymouth/live; @: distro/.live-desktop: distro/.base +live use/plymouth/live; @:
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
distro/.live-kiosk: distro/.base use/live/base use/live/autologin \ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/syslinux/timeout/1 use/cleanup +power use/syslinux/timeout/1 use/cleanup +power
...@@ -31,7 +32,7 @@ distro/.livecd-install: distro/.live-base use/live/install; @: ...@@ -31,7 +32,7 @@ distro/.livecd-install: distro/.live-base use/live/install; @:
distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @: distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @: distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
distro/live-tde: distro/.live-desktop use/live/ru use/live/install +tde; @: distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
distro/live-rescue: distro/live-icewm distro/live-rescue: distro/live-icewm
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11))) @$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
...@@ -56,15 +57,14 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary ...@@ -56,15 +57,14 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils) @$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html) @$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \ distro/live-cinnamon: distro/.live-desktop-ru use/live/autologin \
use/x11/cinnamon use/x11/3d-proprietary; @: use/x11/cinnamon use/x11/3d-proprietary; @:
distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free distro/live-mate: distro/.live-desktop-ru use/live/nodm use/x11/3d-free
@$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate)) @$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate))
@$(call set,KFLAVOURS,un-def) # the newest one @$(call set,KFLAVOURS,un-def) # the newest one
distro/live-enlightenment: distro/.live-desktop use/live/autologin \ distro/live-enlightenment: distro/.live-desktop-ru use/live/autologin use/x11/3d-free
use/live/ru use/x11/3d-free
@$(call add,LIVE_PACKAGES,enlightenment) @$(call add,LIVE_PACKAGES,enlightenment)
distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
......
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