diff mbox series

[5/5] oeqa/selftest/overlayfs: Don't overwrite DISTRO_FEATURES

Message ID 20231219143531.3514266-5-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit fdcc011608fd9558a081d0ace3eaf7192d9fcaef
Headers show
Series [1/5] testimage: Exclude wtmp from target-dumper commands | expand

Commit Message

Richard Purdie Dec. 19, 2023, 2:35 p.m. UTC
Whilst debugging an autobuilder failure, I wondered why it was rebuilding qemu-system-native
instead of reusing from sstate. The reason was it was overwriting DISTRO_FEATURES,
in this case removing opengl which caused much to rebuild.

The test doesn't need that so don't do it.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/lib/oeqa/selftest/cases/overlayfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jose Quaresma Dec. 19, 2023, 3:03 p.m. UTC | #1
Richard Purdie <richard.purdie@linuxfoundation.org> escreveu no dia terça,
19/12/2023 à(s) 14:35:

> Whilst debugging an autobuilder failure, I wondered why it was rebuilding
> qemu-system-native
> instead of reusing from sstate. The reason was it was overwriting
> DISTRO_FEATURES,
> in this case removing opengl which caused much to rebuild.
>
> The test doesn't need that so don't do it.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/lib/oeqa/selftest/cases/overlayfs.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py
> b/meta/lib/oeqa/selftest/cases/overlayfs.py
> index 4031ded0fe4..a20fa6acc2d 100644
> --- a/meta/lib/oeqa/selftest/cases/overlayfs.py
> +++ b/meta/lib/oeqa/selftest/cases/overlayfs.py
> @@ -79,7 +79,7 @@ DISTRO_FEATURES:append = " systemd overlayfs usrmerge"
>
>          config = """
>  IMAGE_INSTALL:append = " overlayfs-user"
> -DISTRO_FEATURES += "systemd overlayfs usrmerge"
> +DISTRO_FEATURES:append "systemd overlayfs usrmerge"
>

The equal sign is not there and also the extra space before systemd.

DISTRO_FEATURES:append = " systemd overlayfs usrmerge"

Jose


>  OVERLAYFS_QA_SKIP[mnt-overlay] = "mount-configured"
>  """
>
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#192744):
> https://lists.openembedded.org/g/openembedded-core/message/192744
> Mute This Topic: https://lists.openembedded.org/mt/103263022/5052612
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Richard Purdie Dec. 19, 2023, 3:06 p.m. UTC | #2
On Tue, 2023-12-19 at 15:03 +0000, Jose Quaresma wrote:
> 
> 
> Richard Purdie <richard.purdie@linuxfoundation.org> escreveu no dia
> terça, 19/12/2023 à(s) 14:35:
> > Whilst debugging an autobuilder failure, I wondered why it was
> > rebuilding qemu-system-native
> > instead of reusing from sstate. The reason was it was overwriting
> > DISTRO_FEATURES,
> > in this case removing opengl which caused much to rebuild.
> > 
> > The test doesn't need that so don't do it.
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> >  meta/lib/oeqa/selftest/cases/overlayfs.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py
> > b/meta/lib/oeqa/selftest/cases/overlayfs.py
> > index 4031ded0fe4..a20fa6acc2d 100644
> > --- a/meta/lib/oeqa/selftest/cases/overlayfs.py
> > +++ b/meta/lib/oeqa/selftest/cases/overlayfs.py
> > @@ -79,7 +79,7 @@ DISTRO_FEATURES:append = " systemd overlayfs
> > usrmerge"
> > 
> >          config = """
> >  IMAGE_INSTALL:append = " overlayfs-user"
> > -DISTRO_FEATURES += "systemd overlayfs usrmerge"
> > +DISTRO_FEATURES:append "systemd overlayfs usrmerge"
> > 
> 
> 
> The equal sign is not there and also the extra space before systemd.
> 
> DISTRO_FEATURES:append = " systemd overlayfs usrmerge"

Well spotted! I'll fix on the branch. I had confirmed the issue but not
tested the final fix :(. This issue was causing a cascade of other
problems I'm busy trying to untangle.

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py
index 4031ded0fe4..a20fa6acc2d 100644
--- a/meta/lib/oeqa/selftest/cases/overlayfs.py
+++ b/meta/lib/oeqa/selftest/cases/overlayfs.py
@@ -79,7 +79,7 @@  DISTRO_FEATURES:append = " systemd overlayfs usrmerge"
 
         config = """
 IMAGE_INSTALL:append = " overlayfs-user"
-DISTRO_FEATURES += "systemd overlayfs usrmerge"
+DISTRO_FEATURES:append "systemd overlayfs usrmerge"
 OVERLAYFS_QA_SKIP[mnt-overlay] = "mount-configured"
 """