summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-03-01 11:00:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-02 23:08:51 +0000
commite72233a6a17853d3047f01f3a579feec384be3a7 (patch)
treec5113fe1b1f872193adc699ce536fe1dec5e6bf3
parent4eaef67a3892be84f1e06278c4ea82468049f283 (diff)
downloadpoky-e72233a6a17853d3047f01f3a579feec384be3a7.tar.gz
bootimg: set default value for LABELS variable
With empty LABELS variable build_efi_cfg skips most of its functionality producing warning message: 'LABELS not defined, nothing to do' This causes build failure for efi images. Setting default value for LABELS to 'boot install' should fix this issue. (From OE-Core rev: b8cb64714cb9ca3174f11a245ee1cf5367dd432f) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/bootimg.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 7946839ce0..0249a9dcf7 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -49,6 +49,8 @@ EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}",
49 49
50KERNEL_IMAGETYPE ??= "bzImage" 50KERNEL_IMAGETYPE ??= "bzImage"
51 51
52LABELS ?= "boot install"
53
52# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not 54# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
53# contain "efi". This way legacy is supported by default if neither is 55# contain "efi". This way legacy is supported by default if neither is
54# specified, maintaining the original behavior. 56# specified, maintaining the original behavior.