| Message ID | 20230910163550.3900070-1-martin.jansa@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | layer.conf: update LAYERSERIES_COMPAT for nanbield | expand |
On Sun, 10 Sep 2023 18:35:50 +0200, Martin Jansa wrote: > * oe-core switched to nanbield in: > https://git.openembedded.org/openembedded-core/commit/?id=f212cb12a0db9c9de5afd3cc89b1331d386e55f6 > > Applied, thanks! [1/1] layer.conf: update LAYERSERIES_COMPAT for nanbield commit: 2d809a7c3511b9fcb71f1b264184e7840a378adc Best regards,
On Mon, Sep 11, 2023 at 11:57 PM Jon Mason via lists.yoctoproject.org <jdmason=kudzu.us@lists.yoctoproject.org> wrote: > > > On Sun, 10 Sep 2023 18:35:50 +0200, Martin Jansa wrote: > > * oe-core switched to nanbield in: > > https://git.openembedded.org/openembedded-core/commit/?id=f212cb12a0db9c9de5afd3cc89b1331d386e55f6 > > > > > > Applied, thanks! > > [1/1] layer.conf: update LAYERSERIES_COMPAT for nanbield > commit: 2d809a7c3511b9fcb71f1b264184e7840a378adc Actually, what was included in meta-arm was Khem's patch, not yours (though identical patches, his was the one that made it in). Weird that the b4 tooling got confused. Sorry for the noise. Thanks, Jon > Best regards, > -- > Jon Mason <jon.mason@arm.com> > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#5035): https://lists.yoctoproject.org/g/meta-arm/message/5035 > Mute This Topic: https://lists.yoctoproject.org/mt/101275923/3616920 > Group Owner: meta-arm+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/leave/7218881/3616920/1111825316/xyzzy [jdmason@kudzu.us] > -=-=-=-=-=-=-=-=-=-=-=- >
On Tue, Sep 12, 2023 at 12:01:50AM -0400, Jon Mason wrote: > On Mon, Sep 11, 2023 at 11:57 PM Jon Mason via lists.yoctoproject.org > <jdmason=kudzu.us@lists.yoctoproject.org> wrote: > > > > > > On Sun, 10 Sep 2023 18:35:50 +0200, Martin Jansa wrote: > > > * oe-core switched to nanbield in: > > > https://git.openembedded.org/openembedded-core/commit/?id=f212cb12a0db9c9de5afd3cc89b1331d386e55f6 > > > > > > > > > > Applied, thanks! > > > > [1/1] layer.conf: update LAYERSERIES_COMPAT for nanbield > > commit: 2d809a7c3511b9fcb71f1b264184e7840a378adc > > Actually, what was included in meta-arm was Khem's patch, not yours > (though identical patches, his was the one that made it in). Weird > that the b4 tooling got confused. Sorry for the noise. And I was really wondering about that - which one got in and why exacly?
On Tue, Sep 12, 2023 at 12:16:47AM -0400, Denys Dmytriyenko wrote: > On Tue, Sep 12, 2023 at 12:01:50AM -0400, Jon Mason wrote: > > On Mon, Sep 11, 2023 at 11:57 PM Jon Mason via lists.yoctoproject.org > > <jdmason=kudzu.us@lists.yoctoproject.org> wrote: > > > > > > > > > On Sun, 10 Sep 2023 18:35:50 +0200, Martin Jansa wrote: > > > > * oe-core switched to nanbield in: > > > > https://git.openembedded.org/openembedded-core/commit/?id=f212cb12a0db9c9de5afd3cc89b1331d386e55f6 > > > > > > > > > > > > > > Applied, thanks! > > > > > > [1/1] layer.conf: update LAYERSERIES_COMPAT for nanbield > > > commit: 2d809a7c3511b9fcb71f1b264184e7840a378adc > > > > Actually, what was included in meta-arm was Khem's patch, not yours > > (though identical patches, his was the one that made it in). Weird > > that the b4 tooling got confused. Sorry for the noise. > > And I was really wondering about that - which one got in and why exacly? This patch was never applied by my scripts, either because it didn't apply cleanly (doubtful), the git repo was in a weird state when it landed, or it was simply never seen. I'm guessing it was the second one. Khem's one was seen and pulled it. So that is why that one got in over this one. This probably means I need to revisit the script and make it a little more sturdy. > > -- > Denys >
diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf index e192a83d..97d9728c 100644 --- a/meta-arm-bsp/conf/layer.conf +++ b/meta-arm-bsp/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-arm-bsp" BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-arm-bsp = "5" -LAYERSERIES_COMPAT_meta-arm-bsp = "mickledore" +LAYERSERIES_COMPAT_meta-arm-bsp = "nanbield" LAYERDEPENDS_meta-arm-bsp = "core meta-arm" # This won't be used by layerindex-fetch, but works everywhere else diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf index a6f403ec..bce70dac 100644 --- a/meta-arm-toolchain/conf/layer.conf +++ b/meta-arm-toolchain/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_PATTERN_arm-toolchain := "^${LAYERDIR}/" BBFILE_PRIORITY_arm-toolchain = "5" LAYERDEPENDS_arm-toolchain = "core" -LAYERSERIES_COMPAT_arm-toolchain = "mickledore" +LAYERSERIES_COMPAT_arm-toolchain = "nanbield" diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf index 2b354375..b506af8b 100644 --- a/meta-arm/conf/layer.conf +++ b/meta-arm/conf/layer.conf @@ -13,7 +13,7 @@ LAYERDEPENDS_meta-arm = " \ core \ arm-toolchain \ " -LAYERSERIES_COMPAT_meta-arm = "mickledore" +LAYERSERIES_COMPAT_meta-arm = "nanbield" # runfvp --console needs telnet, so pull this in for testimage. HOSTTOOLS_NONFATAL += "telnet"
* oe-core switched to nanbield in: https://git.openembedded.org/openembedded-core/commit/?id=f212cb12a0db9c9de5afd3cc89b1331d386e55f6 Signed-off-by: Martin Jansa <martin.jansa@gmail.com> --- meta-arm-bsp/conf/layer.conf | 2 +- meta-arm-toolchain/conf/layer.conf | 2 +- meta-arm/conf/layer.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)