From 0744eef34d836bc8ef086ed657377bc15ed753a9 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Fri, 6 Aug 2021 15:14:14 +0200 Subject: [PATCH] configs/acmesystems_acqua_a5_*: bump at91bootstrap3 version AT91Bootstrap 3.10.2 has a bug in its Makefile:[1] it gives the -nostartfiles flag to the ld command, although this is a gcc flag, not an ld flag. The bug happens to be harmless when using binutils 2.35. However, the ld shipped with binutils 2.36 is more strict in its option parsing, and fails with the following error: .../output/host/bin/arm-buildroot-linux-uclibcgnueabihf-ld: Error: unable to disambiguate: -nostartfiles (did you mean --nostartfiles ?) The bug was fixed upstream in commit 3207586a.[2] However, since there has been no tagged 3.x release since then, we just upgrade to the current head of the branch at91bootstrap-3.x. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1478738145 https://gitlab.com/buildroot.org/buildroot/-/jobs/1478738152 [1] https://github.com/linux4sam/at91bootstrap/issues/127 [2] https://github.com/linux4sam/at91bootstrap/commit/3207586a79aba527bbf20560930089b800f191ac Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni --- configs/acmesystems_acqua_a5_256mb_defconfig | 2 +- configs/acmesystems_acqua_a5_512mb_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index 618ef0e756..00b99c0ad8 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.2" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="5232adb1c42636e1e9cf495a6abd1a8d66475f83" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-256m" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index e9d74be7c8..f4af2501b8 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.2" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="5232adb1c42636e1e9cf495a6abd1a8d66475f83" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-512m" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y