[oe-commits] Saul Wold : image-live: Allow LABELS to be modified

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 825e5a552bbaa215c55da4425e78df3c2f1cddaf
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=825e5a552bbaa215c55da4425e78df3c2f1cddaf

Author: Saul Wold <sgw at linux.intel.com>
Date:   Wed Feb 29 23:46:20 2012 -0800

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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/image-live.bbclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 1476840..2f3261e 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"