Patchwork [2/4] image-live: Allow LABELS to be modified

login
register
mail settings
Submitter Saul Wold
Date March 1, 2012, 7:46 a.m.
Message ID <f21df1f9163d0b08617d8d25c9305183ba1c4d11.1330587785.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/22519/
State Accepted
Commit 825e5a552bbaa215c55da4425e78df3c2f1cddaf
Headers show

Comments

Saul Wold - March 1, 2012, 7:46 a.m.
This is to allow other image types to set the syslinux labels

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/image-live.bbclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Patch

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"