summaryrefslogtreecommitdiffstats
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:51:38 +0000
commit60597ab063892193290ae18f1ccb8ebc8a499c5b (patch)
treea1d3b478d03430d7c63e35fa13ec8857d700fe53
parente175f94ab6392e28f158e7b475a4d85e103768f0 (diff)
downloadpoky-60597ab063892193290ae18f1ccb8ebc8a499c5b.tar.gz
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 <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 1476840eab..2f3261ec16 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -3,8 +3,9 @@ AUTO_SYSLINUXCFG = "1"
3INITRD_IMAGE ?= "core-image-minimal-initramfs" 3INITRD_IMAGE ?= "core-image-minimal-initramfs"
4INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" 4INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
5SYSLINUX_ROOT = "root=/dev/ram0 " 5SYSLINUX_ROOT = "root=/dev/ram0 "
6SYSLINUX_TIMEOUT = "10" 6SYSLINUX_TIMEOUT ?= "10"
7LABELS += "boot install" 7SYSLINUX_LABELS ?= "boot install"
8LABELS_append = " ${SYSLINUX_LABELS} "
8 9
9ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" 10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
10 11