diff mbox series

[RESEND] u-boot: upgrade 2024.07 -> 2024.10

Message ID 20241014113549.1594444-1-festevam@gmail.com
State New
Headers show
Series [RESEND] u-boot: upgrade 2024.07 -> 2024.10 | expand

Commit Message

Fabio Estevam Oct. 14, 2024, 11:35 a.m. UTC
From: Fabio Estevam <festevam@denx.de>

Upgrade to U-Boot 2024.10.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 meta/recipes-bsp/u-boot/u-boot-common.inc                       | 2 +-
 .../u-boot/{u-boot-tools_2024.07.bb => u-boot-tools_2024.10.bb} | 0
 .../recipes-bsp/u-boot/{u-boot_2024.07.bb => u-boot_2024.10.bb} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-bsp/u-boot/{u-boot-tools_2024.07.bb => u-boot-tools_2024.10.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot_2024.07.bb => u-boot_2024.10.bb} (100%)

Comments

Quentin Schulz Oct. 15, 2024, 12:25 p.m. UTC | #1
Hi Fabio,

On 10/14/24 1:35 PM, Fabio Estevam via lists.openembedded.org wrote:
> From: Fabio Estevam <festevam@denx.de>
> 
> Upgrade to U-Boot 2024.10.
> 

It seems like AUH is trying to do the same and fails, c.f. 
https://lore.kernel.org/openembedded-core/01010192901b0371-284b1cb4-52f7-451c-806a-9e474e608d04-000000@us-west-2.amazonses.com/T/#u

mkeficapsule tool now requires gnutls it seems?

Or has it always been failing and it's just that I read it now in an AUH 
patch?

Cheers,
Quentin
Mathieu Dubois-Briand Oct. 17, 2024, 1:19 p.m. UTC | #2
On Mon, Oct 14, 2024 at 08:35:49AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <festevam@denx.de>
> 
> Upgrade to U-Boot 2024.10.
> 
> Signed-off-by: Fabio Estevam <festevam@denx.de>

Hi Fabio,

I tried to apply your patch, and I got the following error on the
autobuilder:

ERROR: u-boot-1_2024.10-r0 do_patch: Applying patch
'0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch' on
target directory
'/srv/pokybuild/yocto-worker/meta-arm/build/build/tmp/work/fvp_base-poky-linux/u-boot/2024.10/git'
CmdError('quilt --quiltrc
/srv/pokybuild/yocto-worker/meta-arm/build/build/tmp/work/fvp_base-poky-linux/u-boot/2024.10/recipe-sysroot-native/etc/quiltrc
push', 0, 'stdout: Applying patch
0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch
patching file arch/arm/include/asm/system.h
Hunk #1 succeeded at 163 with fuzz 2 (offset 9 lines).
Hunk #2 FAILED at 376.
1 out of 2 hunks FAILED -- rejects in file arch/arm/include/asm/system.h
patching file arch/arm/mach-exynos/include/mach/system.h
Hunk #1 FAILED at 36.
1 out of 1 hunk FAILED -- rejects in file
arch/arm/mach-exynos/include/mach/system.h
Patch 0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch
can be reverse-applied

https://valkyrie.yoctoproject.org/#/builders/75/builds/249/steps/12/logs/stdio

Can you have a look please ?
Quentin Schulz Oct. 17, 2024, 1:47 p.m. UTC | #3
Hi Mathieu,

On 10/17/24 3:19 PM, Mathieu Dubois-Briand via lists.openembedded.org wrote:
> [You don't often get email from mathieu.dubois-briand=bootlin.com@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> 
> On Mon, Oct 14, 2024 at 08:35:49AM -0300, Fabio Estevam wrote:
>> From: Fabio Estevam <festevam@denx.de>
>>
>> Upgrade to U-Boot 2024.10.
>>
>> Signed-off-by: Fabio Estevam <festevam@denx.de>
> 
> Hi Fabio,
> 
> I tried to apply your patch, and I got the following error on the
> autobuilder:
> 
> ERROR: u-boot-1_2024.10-r0 do_patch: Applying patch
> '0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch' on
> target directory

This is for/with meta-arm/meta-arm-bsp folks to look at I believe?

@cc ross and jon

Cheers,
Quentin

> '/srv/pokybuild/yocto-worker/meta-arm/build/build/tmp/work/fvp_base-poky-linux/u-boot/2024.10/git'
> CmdError('quilt --quiltrc
> /srv/pokybuild/yocto-worker/meta-arm/build/build/tmp/work/fvp_base-poky-linux/u-boot/2024.10/recipe-sysroot-native/etc/quiltrc
> push', 0, 'stdout: Applying patch
> 0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch
> patching file arch/arm/include/asm/system.h
> Hunk #1 succeeded at 163 with fuzz 2 (offset 9 lines).
> Hunk #2 FAILED at 376.
> 1 out of 2 hunks FAILED -- rejects in file arch/arm/include/asm/system.h
> patching file arch/arm/mach-exynos/include/mach/system.h
> Hunk #1 FAILED at 36.
> 1 out of 1 hunk FAILED -- rejects in file
> arch/arm/mach-exynos/include/mach/system.h
> Patch 0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch
> can be reverse-applied
> 
> https://valkyrie.yoctoproject.org/#/builders/75/builds/249/steps/12/logs/stdio
> 
> Can you have a look please ?
> 
> --
> Mathieu Dubois-briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com/
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#206018): https://lists.openembedded.org/g/openembedded-core/message/206018
> Mute This Topic: https://lists.openembedded.org/mt/108999417/6293953
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [quentin.schulz@cherry.de]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Ross Burton Oct. 17, 2024, 2:23 p.m. UTC | #4
On 17 Oct 2024, at 14:47, Quentin Schulz <quentin.schulz@cherry.de> wrote:
> 
> Hi Mathieu,
> 
> On 10/17/24 3:19 PM, Mathieu Dubois-Briand via lists.openembedded.org wrote:
>> [You don't often get email from mathieu.dubois-briand=bootlin.com@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>> On Mon, Oct 14, 2024 at 08:35:49AM -0300, Fabio Estevam wrote:
>>> From: Fabio Estevam <festevam@denx.de>
>>> 
>>> Upgrade to U-Boot 2024.10.
>>> 
>>> Signed-off-by: Fabio Estevam <festevam@denx.de>
>> Hi Fabio,
>> I tried to apply your patch, and I got the following error on the
>> autobuilder:
>> ERROR: u-boot-1_2024.10-r0 do_patch: Applying patch
>> '0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch' on
>> target directory
> 
> This is for/with meta-arm/meta-arm-bsp folks to look at I believe?

Yes, we apply a patch in a bbappend.  Ignore this, we’ll fix meta-arm when it lands.

Ross
Mathieu Dubois-Briand Oct. 17, 2024, 3:52 p.m. UTC | #5
On Thu, Oct 17, 2024 at 03:47:58PM +0200, Quentin Schulz via lists.openembedded.org wrote:
> Hi Mathieu,
> 
> On 10/17/24 3:19 PM, Mathieu Dubois-Briand via lists.openembedded.org wrote:
> > [You don't often get email from mathieu.dubois-briand=bootlin.com@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> > 
> > On Mon, Oct 14, 2024 at 08:35:49AM -0300, Fabio Estevam wrote:
> > > From: Fabio Estevam <festevam@denx.de>
> > > 
> > > Upgrade to U-Boot 2024.10.
> > > 
> > > Signed-off-by: Fabio Estevam <festevam@denx.de>
> > 
> > Hi Fabio,
> > 
> > I tried to apply your patch, and I got the following error on the
> > autobuilder:
> > 
> > ERROR: u-boot-1_2024.10-r0 do_patch: Applying patch
> > '0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch' on
> > target directory
> 
> This is for/with meta-arm/meta-arm-bsp folks to look at I believe?
> 
> @cc ross and jon
> 

Oops, my bad, this is indeed for meta-arm. Thanks Quentin !
diff mbox series

Patch

diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index 1b5382a6ad..113f215cf6 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -12,7 +12,7 @@  PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "3f772959501c99fbe5aa0b22a36efe3478d1ae1c"
+SRCREV = "f919c3a889f0ec7d63a48b5d0ed064386b0980bd"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2024.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2024.10.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools_2024.07.bb
rename to meta/recipes-bsp/u-boot/u-boot-tools_2024.10.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot_2024.07.bb b/meta/recipes-bsp/u-boot/u-boot_2024.10.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2024.07.bb
rename to meta/recipes-bsp/u-boot/u-boot_2024.10.bb