Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build
@ 2024-05-06  7:40 Peter Korsgaard
  2024-05-06  7:40 ` [Buildroot] [PATCH v2 2/2] configs/sheevaplug_defconfig: add hashes for u-boot and Linux Peter Korsgaard
  2024-05-06 19:31 ` [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Thomas Petazzoni via buildroot
  0 siblings, 2 replies; 4+ messages in thread
From: Peter Korsgaard @ 2024-05-06  7:40 UTC (permalink / raw)
  To: buildroot

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/6761770801

The Linux kernel fails to build since commit e88225ed882 (package/binutils:
make 2.41 the default version):

arch/arm/mm/proc-feroceon.S: Assembler messages:
arch/arm/mm/proc-feroceon.S:587: Error: junk at end of line, first unrecognized character is `#'
make[3]: *** [scripts/Makefile.build:430: arch/arm/mm/proc-feroceon.o] Error 1
make[3]: *** Waiting for unfinished jobs....

Fix the build by bumping the kernel to 4.14.336, which includes commit
3ab03df64f77 (ARM: 8933/1: replace Sun/Solaris style flag on section
directive):

https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=3ab03df64f7754728a2257c47775a70a88428331

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/sheevaplug_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 7f186df22c..0879f17071 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -27,7 +27,7 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.253"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.336"
 BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5"
 BR2_LINUX_KERNEL_APPENDED_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH v2 2/2] configs/sheevaplug_defconfig: add hashes for u-boot and Linux
  2024-05-06  7:40 [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Peter Korsgaard
@ 2024-05-06  7:40 ` Peter Korsgaard
  2024-05-06 19:31 ` [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2024-05-06  7:40 UTC (permalink / raw)
  To: buildroot

And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES.

Generated by utils/add-custom-hashes, with the (redundant)
linux-headers.hash replaced by a symlink.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/sheevaplug/patches/linux-headers/linux-headers.hash | 1 +
 board/sheevaplug/patches/linux/linux.hash                 | 2 ++
 board/sheevaplug/patches/uboot/uboot.hash                 | 2 ++
 configs/sheevaplug_defconfig                              | 1 +
 4 files changed, 6 insertions(+)
 create mode 120000 board/sheevaplug/patches/linux-headers/linux-headers.hash
 create mode 100644 board/sheevaplug/patches/linux/linux.hash
 create mode 100644 board/sheevaplug/patches/uboot/uboot.hash

diff --git a/board/sheevaplug/patches/linux-headers/linux-headers.hash b/board/sheevaplug/patches/linux-headers/linux-headers.hash
new file mode 120000
index 0000000000..5808d92afe
--- /dev/null
+++ b/board/sheevaplug/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file
diff --git a/board/sheevaplug/patches/linux/linux.hash b/board/sheevaplug/patches/linux/linux.hash
new file mode 100644
index 0000000000..b207306a2b
--- /dev/null
+++ b/board/sheevaplug/patches/linux/linux.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c  linux-4.14.336.tar.xz
diff --git a/board/sheevaplug/patches/uboot/uboot.hash b/board/sheevaplug/patches/uboot/uboot.hash
new file mode 100644
index 0000000000..d6818bac36
--- /dev/null
+++ b/board/sheevaplug/patches/uboot/uboot.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4  u-boot-2018.07.tar.bz2
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 0879f17071..6b3719a507 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -4,6 +4,7 @@ BR2_arm926t=y
 
 # system
 BR2_GLOBAL_PATCH_DIR="board/sheevaplug/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_SYSTEM_DHCP="eth0"
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build
  2024-05-06  7:40 [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Peter Korsgaard
  2024-05-06  7:40 ` [Buildroot] [PATCH v2 2/2] configs/sheevaplug_defconfig: add hashes for u-boot and Linux Peter Korsgaard
@ 2024-05-06 19:31 ` Thomas Petazzoni via buildroot
  2024-05-07  6:29   ` Peter Korsgaard
  1 sibling, 1 reply; 4+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-05-06 19:31 UTC (permalink / raw)
  To: Peter Korsgaard; +Cc: buildroot

On Mon,  6 May 2024 09:40:11 +0200
Peter Korsgaard <peter@korsgaard.com> wrote:

> Fixes:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/6761770801
> 
> The Linux kernel fails to build since commit e88225ed882 (package/binutils:
> make 2.41 the default version):
> 
> arch/arm/mm/proc-feroceon.S: Assembler messages:
> arch/arm/mm/proc-feroceon.S:587: Error: junk at end of line, first unrecognized character is `#'
> make[3]: *** [scripts/Makefile.build:430: arch/arm/mm/proc-feroceon.o] Error 1
> make[3]: *** Waiting for unfinished jobs....
> 
> Fix the build by bumping the kernel to 4.14.336, which includes commit
> 3ab03df64f77 (ARM: 8933/1: replace Sun/Solaris style flag on section
> directive):
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=3ab03df64f7754728a2257c47775a70a88428331
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  configs/sheevaplug_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Series applied. In the second patch you had forgotten (perhaps
intentionally?) to update .checkpackageignore, so I did it while
applying.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build
  2024-05-06 19:31 ` [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Thomas Petazzoni via buildroot
@ 2024-05-07  6:29   ` Peter Korsgaard
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2024-05-07  6:29 UTC (permalink / raw)
  To: Thomas Petazzoni; +Cc: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

Hi,

 >> Fix the build by bumping the kernel to 4.14.336, which includes commit
 >> 3ab03df64f77 (ARM: 8933/1: replace Sun/Solaris style flag on section
 >> directive):
 >> 
 >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=3ab03df64f7754728a2257c47775a70a88428331
 >> 
 >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 >> ---
 >> configs/sheevaplug_defconfig | 2 +-
 >> 1 file changed, 1 insertion(+), 1 deletion(-)

 > Series applied. In the second patch you had forgotten (perhaps
 > intentionally?) to update .checkpackageignore, so I did it while
 > applying.

Ahh, I hadn't seen commit 7931f78c16f08f7 yet, still running a bit
behind for 2024.02.x after the holidays.

Thanks for fixing it up.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-05-07  6:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-06  7:40 [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Peter Korsgaard
2024-05-06  7:40 ` [Buildroot] [PATCH v2 2/2] configs/sheevaplug_defconfig: add hashes for u-boot and Linux Peter Korsgaard
2024-05-06 19:31 ` [Buildroot] [PATCH v2 1/2] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Thomas Petazzoni via buildroot
2024-05-07  6:29   ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox