configs/beelink_gs1: increase rootfs size to 120M

Il giorno 29 gen 2022, alle ore 12:18, Clément Péron <[email protected]> ha scritto:

U-boot libfdt fails to compile on CI.
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status

https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208

As this fix has been already upstreamed just bump U-boot package.

Let's also bump Kernel and ATF as the board is properly supported upstream.

Signed-off-by Clément Péron <[email protected]>

---
configs/beelink_gs1_defconfig | 10 +++++-----

1 file changed, 5 insertions(+), 5 deletions(-)

configs/beelink_gs1_defconfig +0 -0

index 1872aabdf0..ca953df3ea 100644
@@ -11,11 +11,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh"

BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg"

configs/beelink_gs1_defconfig +2 -2

-# Kernel Linux headers same as kernel, a 5.5 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y
+# Kernel Linux headers same as kernel, 5.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y

BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y

configs/beelink_gs1_defconfig +1 -1

-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15"

BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1"

configs/beelink_gs1_defconfig +0 -0

@@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # Firmware

BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y

configs/beelink_gs1_defconfig +1 -1

-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"

BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6"

# Bootloader
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y

configs/beelink_gs1_defconfig +1 -1

-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"

BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYTHON3=y

Signature · 6 lines

2.32.0

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

U-boot libfdt fails to compile on CI.
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status

https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208

As this fix has been already upstreamed just bump U-boot package.

Let's also bump Kernel and ATF as the board is properly supported upstream.

Signed-off-by Clément Péron <[email protected]>

---
 configs/beelink_gs1_defconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

For the moment Beelink GS1 use a default rootfs size of 60M, which is a bit low if you want to add some packages like a graphic stack.

Increase the rootfs size to 120M.

Reviewed-by Giulio Benetti <[email protected]>

Signed-off-by Clément Péron <[email protected]>

---
 configs/beelink_gs1_defconfig | 1 +
 1 file changed, 1 insertion(+)

Quoted 11 lines · On Sat, 29 Jan 2022 12:17:30 +0100 Clément Péron <[email protected]> wrote:

For the moment Beelink GS1 use a default rootfs size of 60M, which is a bit low if you want to add some packages like a graphic stack.

Increase the rootfs size to 120M.

Reviewed-by Giulio Benetti <[email protected]>

Signed-off-by Clément Péron <[email protected]>

---
 configs/beelink_gs1_defconfig | 1 +
 1 file changed, 1 insertion(+)

I have not applied this one. Indeed, any defconfig that uses the default rootfs size of 60M would have the problem of "if I add more packages, it doesn't fit in the image". The defconfigs are meant to be minimal, so it doesn't make sense to increase the size to 120M to accommodate some possible package additions. Maybe even 120M is not going to be enough depending on how many packages you add (and how large they are).

So I've marked this patch as Rejected.

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com