Skip to contentSkip to conversation

configs/orangepi_r1_defconfig: drop double _HOST_UBOOT_TOOLS=y

PATCH Applied Peter Korsgaard 2 participants 6 messages May 19, 2024 – May 22, 2024

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/5 configs/orangepi_r1_defconfig: drop double _HOST_UBOOT_TOOLS=y

Fixes the following warning:
orangepi_r1_defconfig:35:warning: override: reassigning to symbol BR2_PACKAGE_HOST_UBOOT_TOOLS

While we're at it, move the HOST_UBOOT_TOOLS_* options where savedefconfig would put them.

Signed-off-by Peter Korsgaard <[email protected]>
---
 configs/orangepi_r1_defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
configs/orangepi_r1_defconfig +2 -3
index bad1f9400c..332761bb71 100644
@@ -26,13 +26,12 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-r1/genimage.cfg"
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#1 lore raw

PATCH 2/5 configs/orangepi_r1_defconfig: bump U-boot to v2024.01 to fix compatibility with setuptools >= 69

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

setuptools.extern.packaging.version.InvalidVersion: Invalid version: 'u-boot-2020.10'
make[5]: *** [scripts/dtc/pylibfdt/Makefile:30: scripts/dtc/pylibfdt/_libfdt.so] Error 1
make[4]: *** [scripts/Makefile.build:419: scripts/dtc/pylibfdt] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:419: scripts/dtc] Error 2
make[2]: *** [Makefile:577: scripts] Error 2
make[1]: *** [package/pkg-generic.mk:283: /builds/buildroot.org/buildroot/output/build/uboot-2020.10/.stamp_built] Error 2

Commit 6b62384e3d2a9e1 (package/python-setuptools: bump to version 69.0.3) bumped setuptools, which now errors out when passed a version with a prefix string. This u-boot- prefix string is dropped since U-Boot 2023.01 with commit c977b1843504 (libfdt: Fix invalid version warning), so bump U-Boot to v2024.01 to fix this issue.

Signed-off-by Peter Korsgaard <[email protected]>
---
 configs/orangepi_r1_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/orangepi_r1_defconfig +1 -1
index 332761bb71..d7a21894bd 100644
@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_r1"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#2 lore raw

PATCH 3/5 configs/orangepi_r1_defconfig: bump Linux to 5.10.217 to fix gcc 13.x build

In reply to Peter Korsgaard

The 5.10.10 kernel fails to build with GCC 13.x:

In file included from <command-line>:
drivers/ata/libahci.c: In function ‘ahci_led_store’:
././include/linux/compiler_types.h:315:45: error: call to ‘__compiletime_assert_321’ declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
315 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
././include/linux/compiler_types.h:296:25: note: in definition of macro ‘__compiletime_assert’

  296 |                         prefix ## suffix();                             \
      |                         ^~~~~~
././include/linux/compiler_types.h:315:9: note: in expansion of macro ‘_compiletime_assert’
  315 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |         ^~~~~~~~~~~~~~~~~~~
./include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’
   39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
      |                                     ^~~~~~~~~~~~~~~~~~
./include/linux/build_bug.h:50:9: note: in expansion of macro ‘BUILD_BUG_ON_MSG’
   50 |         BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
      |         ^~~~~~~~~~~~~~~~
./include/linux/nospec.h:58:9: note: in expansion of macro ‘BUILD_BUG_ON’
   58 |         BUILD_BUG_ON(sizeof(_s) > sizeof(long));                        \
      |         ^~~~~~~~~~~~
drivers/ata/libahci.c:1137:23: note: in expansion of macro ‘array_index_nospec’
 1137 |                 pmp = array_index_nospec(pmp, EM_MAX_SLOTS);
      |                       ^~~~~~~~~~~~~~~~~~

This is fixed upstream by commit f07788079f515ca (ata: ahci: fix enum constants for gcc-13), which has been backported to 5.10.x as of 5.10.184, so bump to v5.10.217 to fix the build.

Signed-off-by Peter Korsgaard <[email protected]>
---
 configs/orangepi_r1_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/orangepi_r1_defconfig +1 -1
index d7a21894bd..318fa126a7 100644
@@ -7,7 +7,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1"
 BR2_SYSTEM_DHCP="eth0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.217"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-r1"
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#3 lore raw

PATCH 4/5 configs/orangepi_r1_defconfig: bump Linux kernel to 6.6.31

In reply to Peter Korsgaard

And update the dts path to match the updated location after commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories").

Signed-off-by Peter Korsgaard <[email protected]>
---
 configs/orangepi_r1_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/orangepi_r1_defconfig +3 -3
index 318fa126a7..80f88a168f 100644
@@ -1,16 +1,16 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1"
 BR2_SYSTEM_DHCP="eth0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.217"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.31"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-r1"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-orangepi-r1"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-r1/linux-extras.config"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_TARGET_ROOTFS_EXT2=y
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#4 lore raw

PATCH 5/5 configs/orangepi_r1_defconfig: add hashes for Linux/headers/u-boot

In reply to Peter Korsgaard

And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the defconfig from .checkpackageignore.

Signed-off-by Peter Korsgaard <[email protected]>
---
 .checkpackageignore                                             | 1 -
 .../orangepi-r1/patches/linux-headers/linux-headers.hash        | 1 +
 board/orangepi/orangepi-r1/patches/linux/linux.hash             | 2 ++
 board/orangepi/orangepi-r1/patches/uboot/uboot.hash             | 2 ++
 configs/orangepi_r1_defconfig                                   | 2 ++
 5 files changed, 7 insertions(+), 1 deletion(-)
 create mode 120000 board/orangepi/orangepi-r1/patches/linux-headers/linux-headers.hash
 create mode 100644 board/orangepi/orangepi-r1/patches/linux/linux.hash
 create mode 100644 board/orangepi/orangepi-r1/patches/uboot/uboot.hash
.checkpackageignore +0 -1
index 070b97116a..3821d4bc16 100644
@@ -272,7 +272,6 @@ configs/orangepi_one_plus_defconfig lib_defconfig.ForceCheckHash
 configs/orangepi_pc2_defconfig lib_defconfig.ForceCheckHash
 configs/orangepi_pc_defconfig lib_defconfig.ForceCheckHash
 configs/orangepi_pc_plus_defconfig lib_defconfig.ForceCheckHash
-configs/orangepi_r1_defconfig lib_defconfig.ForceCheckHash
 configs/orangepi_zero3_defconfig lib_defconfig.ForceCheckHash
 configs/orangepi_zero_defconfig lib_defconfig.ForceCheckHash
 configs/orangepi_zero_plus2_defconfig lib_defconfig.ForceCheckHash
board/orangepi/orangepi-r1/patches/linux-headers/linux-headers.hash new file +1 -0
new file mode 120000
index 0000000000..5808d92afe
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file
board/orangepi/orangepi-r1/patches/linux/linux.hash new file +2 -0
new file mode 100644
index 0000000000..2ec07fd81b
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  d6ecff966f8c95ec4cb3bb303904f757b7de6a6bcfef0d0771cb852158e61c20  linux-6.6.31.tar.xz
board/orangepi/orangepi-r1/patches/uboot/uboot.hash new file +2 -0
new file mode 100644
index 0000000000..bc999536af
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3  u-boot-2024.01.tar.bz2
configs/orangepi_r1_defconfig +2 -0
index 80f88a168f..b48e6d0015 100644
@@ -2,6 +2,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-r1/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1"
 BR2_SYSTEM_DHCP="eth0"
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Applied
#5 lore raw
In reply to Peter Korsgaard

Hello Peter,

Le 19/05/2024 à 12:13, Peter Korsgaard a écrit :

Quoted 21 lines

Fixes the following warning:
orangepi_r1_defconfig:35:warning: override: reassigning to symbol BR2_PACKAGE_HOST_UBOOT_TOOLS

While we're at it, move the HOST_UBOOT_TOOLS_* options where savedefconfig would put them.

Signed-off-by Peter Korsgaard <[email protected]>
---
 configs/orangepi_r1_defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
configs/orangepi_r1_defconfig +0 -2
index bad1f9400c..332761bb71 100644
@@ -26,13 +26,12 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y

configs/orangepi_r1_defconfig BR2_TARGET_UBOOT_NEEDS_PYTHON3=y · line 37

Quoted 10 lines
configs/orangepi_r1_defconfig +2 -1
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-r1/genimage.cfg"

Applied to master, thanks.

Best regards,
Romain

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot