moved distro/syslinux from test.mk back to live.mk

Thanks go to ildar@ for spotting this: my ~/.mkimage/profiles.mk routinely contains DEBUG = 1 line which effectively masked this regression in commit 307fb51f. Wouldn't be a big deal but syslinux.iso is recommended in tutorial docs being slim and fast-building, and it's also what's buildable locally in live-builder.iso environment.

moved distro/syslinux from test.mk back to live.mk
e6c59ac3 · Michael Shigorin · 6711fd92 · e6c59ac3 · e6c59ac3
Commit e6c59ac3 authored Nov 11, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

live.mk conf.d/live.mk +2 -0

test.mk conf.d/test.mk +0 -3

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -3,6 +3,8 @@ ifeq (distro,$(IMAGE_CLASS))

 distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
 distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
+distro/syslinux: distro/.init \
+	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:

 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
 distro/.live-desktop: distro/.base +live use/plymouth/live; @:

--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -3,9 +3,6 @@ ifneq (,$(DEBUG))

 ifeq (distro,$(IMAGE_CLASS))

-distro/syslinux: distro/.init \
-	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
-
 distro/syslinux-auto: distro/.init use/hdt use/syslinux/timeout/1; @:
 distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @: