From 60597ab063892193290ae18f1ccb8ebc8a499c5b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 29 Feb 2012 23:46:20 -0800 Subject: image-live: Allow LABELS to be modified This is to allow other image types to set the syslinux labels (From OE-Core rev: 825e5a552bbaa215c55da4425e78df3c2f1cddaf) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/image-live.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/classes/image-live.bbclass') 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" -- cgit v1.2.3-54-g00ecf