diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-02-29 23:46:20 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-01 15:51:38 +0000 |
| commit | 60597ab063892193290ae18f1ccb8ebc8a499c5b (patch) | |
| tree | a1d3b478d03430d7c63e35fa13ec8857d700fe53 | |
| parent | e175f94ab6392e28f158e7b475a4d85e103768f0 (diff) | |
| download | poky-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.bbclass | 5 |
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" | |||
| 3 | INITRD_IMAGE ?= "core-image-minimal-initramfs" | 3 | INITRD_IMAGE ?= "core-image-minimal-initramfs" |
| 4 | INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" | 4 | INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" |
| 5 | SYSLINUX_ROOT = "root=/dev/ram0 " | 5 | SYSLINUX_ROOT = "root=/dev/ram0 " |
| 6 | SYSLINUX_TIMEOUT = "10" | 6 | SYSLINUX_TIMEOUT ?= "10" |
| 7 | LABELS += "boot install" | 7 | SYSLINUX_LABELS ?= "boot install" |
| 8 | LABELS_append = " ${SYSLINUX_LABELS} " | ||
| 8 | 9 | ||
| 9 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" | 10 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" |
| 10 | 11 | ||