summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-29 23:46:20 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 15:38:12 +0000
commit825e5a552bbaa215c55da4425e78df3c2f1cddaf (patch)
tree09422f90d078bdcf7adc5c53f61cb6c087b406cb /meta
parent0889f693916bb8f77003af419f71212201b4d9c9 (diff)
downloadopenembedded-core-825e5a552bbaa215c55da4425e78df3c2f1cddaf.tar.gz
openembedded-core-825e5a552bbaa215c55da4425e78df3c2f1cddaf.tar.bz2
openembedded-core-825e5a552bbaa215c55da4425e78df3c2f1cddaf.tar.xz
openembedded-core-825e5a552bbaa215c55da4425e78df3c2f1cddaf.zip
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image-live.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 1476840ea..2f3261ec1 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"