diff mbox series

[yocto-autobuilder-helper] config.json: Fix check-layer for meta-poky/meta-yocto-bsp

Message ID 20231021091829.968295-1-richard.purdie@linuxfoundation.org
State New
Headers show
Series [yocto-autobuilder-helper] config.json: Fix check-layer for meta-poky/meta-yocto-bsp | expand

Commit Message

Richard Purdie Oct. 21, 2023, 9:18 a.m. UTC
Currently, the tests for meta-poky and meta-yocto-bsp were malfunctioning.
We need to a) set a distro other than poky and b) avoid the isolation wrapper
since it will use the default environment and reset to the poky distro and
default bblayers.conf which will disable the layer test.

With those two fixes, the layer checks work correctly.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 config.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Tim Orling Oct. 28, 2023, 6:10 p.m. UTC | #1
Steve,

This needs to be applied to dunfell, kirkstone, mickledore and
nanbield (none of those are performing the correct check now).

On Sat, Oct 21, 2023 at 2:18 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> Currently, the tests for meta-poky and meta-yocto-bsp were malfunctioning.
> We need to a) set a distro other than poky and b) avoid the isolation
> wrapper
> since it will use the default environment and reset to the poky distro and
> default bblayers.conf which will disable the layer test.
>
> With those two fixes, the layer checks work correctly.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  config.json | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/config.json b/config.json
> index 27e56c5..55fde54 100644
> --- a/config.json
> +++ b/config.json
> @@ -1150,11 +1150,12 @@
>          },
>          "check-layer" : {
>              "NEEDREPOS" : ["poky", "meta-mingw"],
> +            "DISTRO" : "nodistro",
>              "step1" : {
> -                "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-poky"]
> +                "EXTRACMDS" : ["bitbake-layers remove-layer ../meta-poky;
> yocto-check-layer ../meta-poky"]
>              },
>              "step2" : {
> -                "EXTRACMDS" : ["yocto-check-layer-wrapper
> ../meta-yocto-bsp"]
> +                "EXTRACMDS" : ["bitbake-layers remove-layer
> ../meta-yocto-bsp; yocto-check-layer ../meta-yocto-bsp"]
>              },
>              "step3" : {
>                  "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-mingw"]
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#61444):
> https://lists.yoctoproject.org/g/yocto/message/61444
> Mute This Topic: https://lists.yoctoproject.org/mt/102097822/924729
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe:
> https://lists.yoctoproject.org/g/yocto/leave/7531966/924729/429220467/xyzzy
> [ticotimo@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Richard Purdie Oct. 28, 2023, 10:41 p.m. UTC | #2
On Sat, 2023-10-28 at 11:10 -0700, Tim Orling wrote:
> Steve,
> 
> This needs to be applied to dunfell, kirkstone, mickledore and
> nanbield (none of those are performing the correct check now).

I've gone ahead and backported this since I've been working on this
repo a lot recently. If there are any issues we'll resolve them...

Cheers,

Richard
diff mbox series

Patch

diff --git a/config.json b/config.json
index 27e56c5..55fde54 100644
--- a/config.json
+++ b/config.json
@@ -1150,11 +1150,12 @@ 
         },
         "check-layer" : {
             "NEEDREPOS" : ["poky", "meta-mingw"],
+            "DISTRO" : "nodistro",
             "step1" : {
-                "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-poky"]
+                "EXTRACMDS" : ["bitbake-layers remove-layer ../meta-poky; yocto-check-layer ../meta-poky"]
             },
             "step2" : {
-                "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-yocto-bsp"]
+                "EXTRACMDS" : ["bitbake-layers remove-layer ../meta-yocto-bsp; yocto-check-layer ../meta-yocto-bsp"]
             },
             "step3" : {
                 "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-mingw"]