Skip to contentSkip to conversation

u-boot: Switch to nobranch=1

PATCH In review Fabio Estevam 4 participants 12 messages Jul 14, 2023 – Jul 16, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 u-boot: Switch to nobranch=1

From: Marek Vasut <[email protected]>

U-Boot 2023.07.y tags are not in the master branch, switch to nobranch=1 to be able to pull arbitrary commit from arbitrary branch.

---
 meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/u-boot/u-boot-common.inc +1 -1
index 56f9be010793..29beac4c1127 100644
@@ -14,7 +14,7 @@ PE = "1"
 # repo during parse
 SRCREV = "05aa6516c6bb419d01d69fac457c0de563bfd694"
 
-SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
+SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;nobranch=1"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 u-boot: Upgrade to 2023.07.02

From: Fabio Estevam <[email protected]>

Upgrade to U-Boot 2023.07.02.

---
 meta/recipes-bsp/u-boot/u-boot-common.inc                       | 2 +-
 .../{u-boot-tools_2023.07.bb => u-boot-tools_2023.07.02.bb}     | 0
 .../u-boot/{u-boot_2023.07.bb => u-boot_2023.07.02.bb}          | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-bsp/u-boot/{u-boot-tools_2023.07.bb => u-boot-tools_2023.07.02.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot_2023.07.bb => u-boot_2023.07.02.bb} (100%)
meta/recipes-bsp/u-boot/u-boot-common.inc +1 -1
index 29beac4c1127..ae9a7e6df143 100644
@@ -12,7 +12,7 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "05aa6516c6bb419d01d69fac457c0de563bfd694"
+SRCREV = "83cdab8b2c6ea0fc0860f8444d083353b47f1d5c"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;nobranch=1"
 
meta/recipes-bsp/u-boot/u-boot-tools_2023.07.02.bb renamed from meta/recipes-bsp/u-boot/u-boot-tools_2023.07.bb +0 -0
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools_2023.07.bb
rename to meta/recipes-bsp/u-boot/u-boot-tools_2023.07.02.bb
meta/recipes-bsp/u-boot/u-boot_2023.07.02.bb renamed from meta/recipes-bsp/u-boot/u-boot_2023.07.bb +0 -0
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2023.07.bb
rename to meta/recipes-bsp/u-boot/u-boot_2023.07.02.bb
Signature · 1 line
2.34.1
#2 lore raw
In reply to Fabio Estevam

It's not in master branch, but it is in a branch, so please do not use nobranch, and just adjust the branch parameter together with the version update:
https://source.denx.de/u-boot/u-boot/-/commit/83cdab8b2c6ea0fc0860f8444d083353b47f1d5c

Alex

Quoted 37 lines · Fabio Estevam

From: Marek Vasut <[email protected]>

U-Boot 2023.07.y tags are not in the master branch, switch to nobranch=1 to be able to pull arbitrary commit from arbitrary branch.

---
 meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/u-boot/u-boot-common.inc +1 -2
index 56f9be010793..29beac4c1127 100644
@@ -14,7 +14,7 @@ PE = "1"
 # repo during parse
 SRCREV = "05aa6516c6bb419d01d69fac457c0de563bfd694"
 
-SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
+SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;nobranch=1"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#184273): https://lists.openembedded.org/g/openembedded-core/message/184273
Mute This Topic: https://lists.openembedded.org/mt/100144566/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#3 lore raw
Quoted 4 lines · Alexander Kanavin

It's not in master branch, but it is in a branch, so please do not use nobranch, and just adjust the branch parameter together with the version update:
https://source.denx.de/u-boot/u-boot/-/commit/83cdab8b2c6ea0fc0860f8444d083353b47f1d5c

Won't this just make more churn later? The v2023.10 tag will be back on master (and we'll assume I don't goof it up), but if any of the "maybe we do an LTS? Hmm?" work comes through, then we start having to change things there, and then maybe can't as easily share inc files between something that tracks LTS and something that doesn't.

Signature · 1 line
Tom
#4 lore raw

Then we’ll consider options, such as moving variable bits out of .inc or introducing a variable that strips last number from PV. I would want to avoid recipes fetching from dangling branch-less commits in core. The commit being on a branch is a QA check by the fetcher.

Alex

Quoted 17 lines · Tom Rini
Quoted 4 lines · Alexander Kanavin

It's not in master branch, but it is in a branch, so please do not use nobranch, and just adjust the branch parameter together with the version update:

https://source.denx.de/u-boot/u-boot/-/commit/83cdab8b2c6ea0fc0860f8444d083353b47f1d5c

Won't this just make more churn later? The v2023.10 tag will be back on master (and we'll assume I don't goof it up), but if any of the "maybe we do an LTS? Hmm?" work comes through, then we start having to change things there, and then maybe can't as easily share inc files between something that tracks LTS and something that doesn't.

--
Tom

#5 lore raw
Quoted 4 lines · Alexander Kanavin

Then we’ll consider options, such as moving variable bits out of .inc or introducing a variable that strips last number from PV. I would want to avoid recipes fetching from dangling branch-less commits in core. The commit being on a branch is a QA check by the fetcher.

What difference does it make whether the commit is in a branch or not , as long as it is referenced ?

#6 lore raw

If you don’t list which branch a commit is on, it may be not in a branch at all and not intended for downstream consumption, or on a private or personal branch which is also not intended for private consumption. Requiring to name the branch guards us from either possibility, and means I do not have to go and check that manually or trust you blindly.

Alex

Quoted 9 lines · Marek Vasut
Quoted 4 lines · Alexander Kanavin

Then we’ll consider options, such as moving variable bits out of .inc or introducing a variable that strips last number from PV. I would want to avoid recipes fetching from dangling branch-less commits in core. The commit being on a branch is a QA check by the fetcher.

What difference does it make whether the commit is in a branch or not , as long as it is referenced ?

#7 lore raw
Quoted 2 lines · Alexander Kanavin

If you don’t list which branch a commit is on, it may be not in a branch at all

That itself is not a problem as long as the commit is referenced, right?

Quoted 1 line

and not intended for downstream consumption

We do know that specific U-Boot commit is intended for consumption.

Quoted 2 lines

, or on a private or
personal branch which is also not intended for private consumption.

This is also not applicable here.

Quoted 2 lines

Requiring to name the branch guards us from either possibility, and means I do not have to go and check that manually or trust you blindly.

This protection is really weak, this check fails on every single possibly bogus commit which is already on any random branch, so what is the gain here really ?

#8 lore raw
Quoted 3 lines · Marek Vasut

This protection is really weak, this check fails on every single possibly bogus commit which is already on any random branch, so what is the gain here really ?

The gain is that the branch name is seen in the recipe and we can make the judgement about it. You wouldn’t be able to switch from main to my-ugly-hacks or dangling commit without having to explain that. With nobranch the branch name disappears and this opens the door for bogus commits. You may reassure us that right now the commit is not bogus, this may not hold in future revision updates or if the branch is force pushed on your side.

Alex

#9 lore raw
Quoted 6 lines · Alexander Kanavin
Quoted 3 lines · Marek Vasut

This protection is really weak, this check fails on every single possibly bogus commit which is already on any random branch, so what is the gain here really ?

Quoted 7 lines

The gain is that the branch name is seen in the recipe and we can make the judgement about it. You wouldn’t be able to switch from main to my-ugly-hacks or dangling commit without having to explain that. With nobranch the branch name disappears and this opens the door for bogus commits. You may reassure us that right now the commit is not bogus, this may not hold in future revision updates or if the branch is force pushed on your side.

Does bitbake have any infrastructure atm for dealing with signed tags? I'm fine with (for now, as LTS is a hope not a feature) keeping the branch portion. But if it was possible to say it must be a tag signed by X key, that would help a little with the concern about moving to some more arbitrary commit.

Signature · 1 line
Tom
#10 lore raw
Quoted 5 lines · Tom Rini

Does bitbake have any infrastructure atm for dealing with signed tags? I'm fine with (for now, as LTS is a hope not a feature) keeping the branch portion. But if it was possible to say it must be a tag signed by X key, that would help a little with the concern about moving to some more arbitrary commit.

As far as I know, git fetcher doesn't verify tags. They don't even have to be signed, checking that a tag specified in a recipe matches a commit id specified in a recipe would also guard against unwanted commits, but the fetcher doesn't do that check either.

Alex

#11 lore raw
Quoted 11 lines · Alexander Kanavin
Quoted 5 lines · Tom Rini

Does bitbake have any infrastructure atm for dealing with signed tags? I'm fine with (for now, as LTS is a hope not a feature) keeping the branch portion. But if it was possible to say it must be a tag signed by X key, that would help a little with the concern about moving to some more arbitrary commit.

As far as I know, git fetcher doesn't verify tags. They don't even have to be signed, checking that a tag specified in a recipe matches a commit id specified in a recipe would also guard against unwanted commits, but the fetcher doesn't do that check either.

That's what I figured, thanks.

Signature · 1 line
Tom