Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] configs/openblocks_a6_defconfig: bump Linux to fix binutils 2.41 build
@ 2024-05-14 19:50 Peter Korsgaard
  2024-05-14 19:50 ` [Buildroot] [PATCH 2/2] configs/openblocks_a6_defconfig: add hashes for Linux / headers Peter Korsgaard
  2024-05-17 14:36 ` [Buildroot] [PATCH 1/2] configs/openblocks_a6_defconfig: bump Linux to fix binutils 2.41 build Yann E. MORIN
  0 siblings, 2 replies; 4+ messages in thread
From: Peter Korsgaard @ 2024-05-14 19:50 UTC (permalink / raw)
  To: buildroot

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

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/openblocks_a6_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig
index 2238c0940c..69b75f5043 100644
--- a/configs/openblocks_a6_defconfig
+++ b/configs/openblocks_a6_defconfig
@@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=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 2/2] configs/openblocks_a6_defconfig: add hashes for Linux / headers
  2024-05-14 19:50 [Buildroot] [PATCH 1/2] configs/openblocks_a6_defconfig: bump Linux to fix binutils 2.41 build Peter Korsgaard
@ 2024-05-14 19:50 ` Peter Korsgaard
  2024-05-17 14:37   ` Yann E. MORIN
  2024-05-17 14:36 ` [Buildroot] [PATCH 1/2] configs/openblocks_a6_defconfig: bump Linux to fix binutils 2.41 build Yann E. MORIN
  1 sibling, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2024-05-14 19:50 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/openblocks/a6/patches/linux-headers/linux-headers.hash | 1 +
 board/openblocks/a6/patches/linux/linux.hash                 | 2 ++
 configs/openblocks_a6_defconfig                              | 2 ++
 3 files changed, 5 insertions(+)
 create mode 120000 board/openblocks/a6/patches/linux-headers/linux-headers.hash
 create mode 100644 board/openblocks/a6/patches/linux/linux.hash

diff --git a/board/openblocks/a6/patches/linux-headers/linux-headers.hash b/board/openblocks/a6/patches/linux-headers/linux-headers.hash
new file mode 120000
index 0000000000..5808d92afe
--- /dev/null
+++ b/board/openblocks/a6/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file
diff --git a/board/openblocks/a6/patches/linux/linux.hash b/board/openblocks/a6/patches/linux/linux.hash
new file mode 100644
index 0000000000..b207306a2b
--- /dev/null
+++ b/board/openblocks/a6/patches/linux/linux.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c  linux-4.14.336.tar.xz
diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig
index 69b75f5043..6a816597ac 100644
--- a/configs/openblocks_a6_defconfig
+++ b/configs/openblocks_a6_defconfig
@@ -3,6 +3,8 @@ BR2_arm=y
 BR2_arm926t=y
 
 # system
+BR2_GLOBAL_PATCH_DIR="board/openblocks/a6/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="openblocks-a6"
 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 1/2] configs/openblocks_a6_defconfig: bump Linux to fix binutils 2.41 build
  2024-05-14 19:50 [Buildroot] [PATCH 1/2] configs/openblocks_a6_defconfig: bump Linux to fix binutils 2.41 build Peter Korsgaard
  2024-05-14 19:50 ` [Buildroot] [PATCH 2/2] configs/openblocks_a6_defconfig: add hashes for Linux / headers Peter Korsgaard
@ 2024-05-17 14:36 ` Yann E. MORIN
  1 sibling, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2024-05-17 14:36 UTC (permalink / raw)
  To: Peter Korsgaard; +Cc: buildroot

Peter, All,

On 2024-05-14 21:50 +0200, Peter Korsgaard spake thusly:
> Fixes:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/6813125272
> 
> 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>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  configs/openblocks_a6_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig
> index 2238c0940c..69b75f5043 100644
> --- a/configs/openblocks_a6_defconfig
> +++ b/configs/openblocks_a6_defconfig
> @@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=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

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
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 2/2] configs/openblocks_a6_defconfig: add hashes for Linux / headers
  2024-05-14 19:50 ` [Buildroot] [PATCH 2/2] configs/openblocks_a6_defconfig: add hashes for Linux / headers Peter Korsgaard
@ 2024-05-17 14:37   ` Yann E. MORIN
  0 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2024-05-17 14:37 UTC (permalink / raw)
  To: Peter Korsgaard; +Cc: buildroot

Peter, All,

On 2024-05-14 21:50 +0200, Peter Korsgaard spake thusly:
> 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/openblocks/a6/patches/linux-headers/linux-headers.hash | 1 +
>  board/openblocks/a6/patches/linux/linux.hash                 | 2 ++
>  configs/openblocks_a6_defconfig                              | 2 ++

    $ make check-package
    configs/openblocks_a6_defconfig:0: lib_defconfig.ForceCheckHash was
    expected to fail, did you fix the file and forget to update
    [...]/.checkpackageignore?

Fixed, and applied to master, thanks.

Regards,
Yann E. MORIN.

>  3 files changed, 5 insertions(+)
>  create mode 120000 board/openblocks/a6/patches/linux-headers/linux-headers.hash
>  create mode 100644 board/openblocks/a6/patches/linux/linux.hash
> 
> diff --git a/board/openblocks/a6/patches/linux-headers/linux-headers.hash b/board/openblocks/a6/patches/linux-headers/linux-headers.hash
> new file mode 120000
> index 0000000000..5808d92afe
> --- /dev/null
> +++ b/board/openblocks/a6/patches/linux-headers/linux-headers.hash
> @@ -0,0 +1 @@
> +../linux/linux.hash
> \ No newline at end of file
> diff --git a/board/openblocks/a6/patches/linux/linux.hash b/board/openblocks/a6/patches/linux/linux.hash
> new file mode 100644
> index 0000000000..b207306a2b
> --- /dev/null
> +++ b/board/openblocks/a6/patches/linux/linux.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c  linux-4.14.336.tar.xz
> diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig
> index 69b75f5043..6a816597ac 100644
> --- a/configs/openblocks_a6_defconfig
> +++ b/configs/openblocks_a6_defconfig
> @@ -3,6 +3,8 @@ BR2_arm=y
>  BR2_arm926t=y
>  
>  # system
> +BR2_GLOBAL_PATCH_DIR="board/openblocks/a6/patches"
> +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
>  BR2_TARGET_GENERIC_HOSTNAME="openblocks-a6"
>  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

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
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-17 14:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-14 19:50 [Buildroot] [PATCH 1/2] configs/openblocks_a6_defconfig: bump Linux to fix binutils 2.41 build Peter Korsgaard
2024-05-14 19:50 ` [Buildroot] [PATCH 2/2] configs/openblocks_a6_defconfig: add hashes for Linux / headers Peter Korsgaard
2024-05-17 14:37   ` Yann E. MORIN
2024-05-17 14:36 ` [Buildroot] [PATCH 1/2] configs/openblocks_a6_defconfig: bump Linux to fix binutils 2.41 build Yann E. MORIN

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