[PATCH] wic: Honor APPEND

[PATCH] wic: Honor APPEND

[Kevin Hao]

APPEND is used to add additional parameters to kernel by features, such
as read-only-rootfs. So we should honor this variable when we compose
the kernel parameter in wic. I know we also can resolve this kind of
issue by using the .wks.in template introduced by commit 42e870c5ed4b
("image_types.bbclass: support template .wks.in files for wic"), but the
APPEND is needed by all the wks, it would seems pretty ridiculous to me
to change all the .wks to .wks.in and then foist the APPEND into them.
So the APPEND is definitely deserved to export to the wic directly.

[Yocto #12809]

Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
---
 meta/classes/image_types_wic.bbclass | 2 +-
 scripts/lib/wic/ksparser.py          | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index fc9b106a9a81..b83308b45cb5 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -4,7 +4,7 @@ WICVARS ?= "\
            BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \
            IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \
            ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \
-           KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME"
+           KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND"
 
 inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)}
 
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 707a2e801962..650b976223e0 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -246,6 +246,11 @@ class KickStart():
                     elif line.startswith('bootloader'):
                         if not self.bootloader:
                             self.bootloader = parsed
+                            # Concatenate the strings set in APPEND
+                            append_var = get_bitbake_var("APPEND")
+                            if append_var:
+                                self.bootloader.append = ' '.join(filter(None, \
+                                                         (self.bootloader.append, append_var)))
                         else:
                             err = "%s:%d: more than one bootloader specified" \
                                       % (confpath, lineno)
-- 
2.25.0.191.gde93cc14ab7e

Re: [PATCH] wic: Honor APPEND

[Richard Purdie]

On Thu, 2020-02-13 at 10:31 +0800, Kevin Hao wrote:
> APPEND is used to add additional parameters to kernel by features,
> such
> as read-only-rootfs. So we should honor this variable when we compose
> the kernel parameter in wic. I know we also can resolve this kind of
> issue by using the .wks.in template introduced by commit 42e870c5ed4b
> ("image_types.bbclass: support template .wks.in files for wic"), but
> the
> APPEND is needed by all the wks, it would seems pretty ridiculous to
> me
> to change all the .wks to .wks.in and then foist the APPEND into
> them.
> So the APPEND is definitely deserved to export to the wic directly.
> 
> [Yocto #12809]
> 
> Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
> ---
>  meta/classes/image_types_wic.bbclass | 2 +-
>  scripts/lib/wic/ksparser.py          | 5 +++++
>  2 files changed, 6 insertions(+), 1 deletion(-)

This seems to cause a selftest failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/688

oe-selftest -r wic.Wic2.test_image_env

Cheers,

Richard

Re: [PATCH] wic: Honor APPEND

[Kevin Hao]

[-- Attachment #1: Type: text/plain, Size: 1353 bytes --]

On Sat, Feb 15, 2020 at 08:07:34AM +0000, Richard Purdie wrote:
> On Thu, 2020-02-13 at 10:31 +0800, Kevin Hao wrote:
> > APPEND is used to add additional parameters to kernel by features,
> > such
> > as read-only-rootfs. So we should honor this variable when we compose
> > the kernel parameter in wic. I know we also can resolve this kind of
> > issue by using the .wks.in template introduced by commit 42e870c5ed4b
> > ("image_types.bbclass: support template .wks.in files for wic"), but
> > the
> > APPEND is needed by all the wks, it would seems pretty ridiculous to
> > me
> > to change all the .wks to .wks.in and then foist the APPEND into
> > them.
> > So the APPEND is definitely deserved to export to the wic directly.
> > 
> > [Yocto #12809]
> > 
> > Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
> > ---
> >  meta/classes/image_types_wic.bbclass | 2 +-
> >  scripts/lib/wic/ksparser.py          | 5 +++++
> >  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> This seems to cause a selftest failure:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/688
> 
> oe-selftest -r wic.Wic2.test_image_env

The APPEND is optional, so I should add it in the optional variables list
in wic.Wic2.test_image_env. The fix is coming soon.

Thanks,
Kevin

> 
> Cheers,
> 
> Richard
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 499 bytes --]