From: Saul Wold <sgw@linux.intel.com>
Date: Thu, 1 Mar 2012 07:46:20 +0000 (-0800)
Subject: image-live: Allow LABELS to be modified
X-Git-Tag: 2015-4~11579
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=825e5a552bbaa215c55da4425e78df3c2f1cddaf;p=openembedded-core.git

image-live: Allow LABELS to be modified

This is to allow other image types to set the syslinux labels

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 1476840eab..2f3261ec16 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -3,8 +3,9 @@ AUTO_SYSLINUXCFG = "1"
 INITRD_IMAGE ?= "core-image-minimal-initramfs"
 INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
 SYSLINUX_ROOT = "root=/dev/ram0 "
-SYSLINUX_TIMEOUT = "10"
-LABELS += "boot install"
+SYSLINUX_TIMEOUT ?= "10"
+SYSLINUX_LABELS ?= "boot install"
+LABELS_append = " ${SYSLINUX_LABELS} "
 
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"