From 5fc270f996a7c22459f581130b2357439cbcf3c7 Mon Sep 17 00:00:00 2001 From: Gleb Fotengauer-Malinovskiy Date: Mon, 23 Apr 2012 17:43:36 +0400 Subject: [PATCH] move simply to conf.d/simply.mk There will be two types of Simply: DVD and Live versions. --- conf.d/live.mk | 4 ---- conf.d/simply.mk | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 conf.d/simply.mk diff --git a/conf.d/live.mk b/conf.d/live.mk index 0b7653eb..993bc4c8 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -54,10 +54,6 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary @$(call add,LIVE_PACKAGES,FlightGear fgo input-utils) @$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html) -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-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \ use/x11/cinnamon use/x11/3d-free diff --git a/conf.d/simply.mk b/conf.d/simply.mk new file mode 100644 index 00000000..537709e1 --- /dev/null +++ b/conf.d/simply.mk @@ -0,0 +1,9 @@ +# simply images + +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) + +endif