diff options
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 | ||||
-rw-r--r-- | scripts/lib/wic/ksparser.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106a9a..b83308b45c 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
@@ -4,7 +4,7 @@ WICVARS ?= "\ | |||
4 | BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ | 4 | BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ |
5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ | 5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ |
6 | ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ | 6 | ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ |
7 | KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" | 7 | KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" |
8 | 8 | ||
9 | inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} | 9 | inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} |
10 | 10 | ||
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e8019..650b976223 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py | |||
@@ -246,6 +246,11 @@ class KickStart(): | |||
246 | elif line.startswith('bootloader'): | 246 | elif line.startswith('bootloader'): |
247 | if not self.bootloader: | 247 | if not self.bootloader: |
248 | self.bootloader = parsed | 248 | self.bootloader = parsed |
249 | # Concatenate the strings set in APPEND | ||
250 | append_var = get_bitbake_var("APPEND") | ||
251 | if append_var: | ||
252 | self.bootloader.append = ' '.join(filter(None, \ | ||
253 | (self.bootloader.append, append_var))) | ||
249 | else: | 254 | else: |
250 | err = "%s:%d: more than one bootloader specified" \ | 255 | err = "%s:%d: more than one bootloader specified" \ |
251 | % (confpath, lineno) | 256 | % (confpath, lineno) |