[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-283-gef9a09b7f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-283-gef9a09b7f
|
From: Sébastien S. <ss...@us...> - 2021-09-15 15:49:56
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ef9a09b7fd204c95164d3895cae4fee38352aabf (commit)
from a512a09296707b20cc780d741b94501f2d53e868 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ef9a09b7fd204c95164d3895cae4fee38352aabf
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Sep 15 17:47:12 2021 +0200
[BUILDROOT] Bump BR to 2021.02.5
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...fix_installation_bug_on_some_host_systems.patch | 17 +++---
...yer2rgb-neon-update-URL-in-Config.in-file.patch | 32 ------------
...usted-firmware-change-ENABLE_STACK_PROTEC.patch | 46 ----------------
...usted-firmware-don-t-force-ENABLE_STACK_P.patch | 61 ----------------------
5 files changed, 10 insertions(+), 148 deletions(-)
delete mode 100644 patches/buildroot/2021.02/402-package-bayer2rgb-neon-update-URL-in-Config.in-file.patch
delete mode 100644 patches/buildroot/2021.02/408-boot-arm-trusted-firmware-change-ENABLE_STACK_PROTEC.patch
delete mode 100644 patches/buildroot/2021.02/409-boot-arm-trusted-firmware-don-t-force-ENABLE_STACK_P.patch
diff --git a/Makefile b/Makefile
index 55cd89b31..cdc313507 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2021.02
-BUILDROOT_MINOR_VERSION ?= 4
+BUILDROOT_MINOR_VERSION ?= 5
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch b/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
index d5767d6d0..efd7c1828 100644
--- a/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
+++ b/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
@@ -6,13 +6,14 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/alsa-utils/alsa-utils.mk
===================================================================
---- buildroot.orig/package/alsa-utils/alsa-utils.mk 2012-02-21 16:43:24.000000000 +0100
-+++ buildroot/package/alsa-utils/alsa-utils.mk 2012-02-21 16:45:59.000000000 +0100
-@@ -52,7 +52,7 @@
- if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
- mkdir -p $(TARGET_DIR)/usr/share/; \
- rm -rf $(TARGET_DIR)/usr/share/alsa/; \
+--- buildroot.orig/package/alsa-utils/alsa-utils.mk
++++ buildroot/package/alsa-utils/alsa-utils.mk
+@@ -77,7 +77,7 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS
+ fi
+ if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
+ mkdir -p $(TARGET_DIR)/usr/share/; \
- cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
-+ cp -rdpf $(STAGING_DIR)/usr/share/alsa $(TARGET_DIR)/usr/share/alsa; \
- fi
++ cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa; \
+ fi
endef
+
diff --git a/patches/buildroot/2021.02/402-package-bayer2rgb-neon-update-URL-in-Config.in-file.patch b/patches/buildroot/2021.02/402-package-bayer2rgb-neon-update-URL-in-Config.in-file.patch
deleted file mode 100644
index 11608e937..000000000
--- a/patches/buildroot/2021.02/402-package-bayer2rgb-neon-update-URL-in-Config.in-file.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 21b471eab79d40a48e938779e0f864cc41306bf8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Mon, 28 Jun 2021 13:16:54 +0200
-Subject: [PATCH 402/406] package/bayer2rgb-neon: update URL in Config.in file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The URL at Phytec is obsolete and not even used by Buildroot.
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- package/bayer2rgb-neon/Config.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package/bayer2rgb-neon/Config.in b/package/bayer2rgb-neon/Config.in
-index ed065c1ed7..8fd18b4fa9 100644
---- a/package/bayer2rgb-neon/Config.in
-+++ b/package/bayer2rgb-neon/Config.in
-@@ -9,7 +9,7 @@ config BR2_PACKAGE_BAYER2RGB_NEON
- to decode raw camera bayer to RGB using
- NEON hardware acceleration.
-
-- https://git.phytec.de/bayer2rgb-neon/
-+ https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb
-
- comment "bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9"
- depends on BR2_arm && BR2_ARM_CPU_HAS_NEON
---
-2.31.1
-
diff --git a/patches/buildroot/2021.02/408-boot-arm-trusted-firmware-change-ENABLE_STACK_PROTEC.patch b/patches/buildroot/2021.02/408-boot-arm-trusted-firmware-change-ENABLE_STACK_PROTEC.patch
deleted file mode 100644
index 164b97a5a..000000000
--- a/patches/buildroot/2021.02/408-boot-arm-trusted-firmware-change-ENABLE_STACK_PROTEC.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5f432df7e2d26d6d57d750cbee1a573c1f886e26 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <tho...@bo...>
-Date: Sat, 7 Aug 2021 12:56:10 +0200
-Subject: [PATCH] boot/arm-trusted-firmware: change ENABLE_STACK_PROTECTOR
- value when disabled
-
-Since commit
-cf176128ec4ad60c29c8828cab1887f69edb9473 ("boot/arm-trusted-firmware:
-add SSP option"), we are passing ENABLE_STACK_PROTECTOR=none when we
-want to disable SSP usage in TF-A. While this works fine in recent
-versions of TF-A, older versions such as TF-A will end up passing
--fstack-protector-none in this situation, which fails as this is not a
-valid gcc option (the valid gcc option is -fno-stack-protector).
-
-To solve this, we pass ENABLE_STACK_PROTECTOR=0 which was in older
-TF-A versions used to say "don't do anything with SSP", and is also
-still supported in newer versions of TF-A.
-
-Fixes:
-
- https://gitlab.com/buildroot.org/buildroot/-/jobs/1478738580
-
-Signed-off-by: Thomas Petazzoni <tho...@bo...>
----
- boot/arm-trusted-firmware/Config.in | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
-index 7e46a10270..9e171f414f 100644
---- a/boot/arm-trusted-firmware/Config.in
-+++ b/boot/arm-trusted-firmware/Config.in
-@@ -204,7 +204,10 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
-
- config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL
- string
-- default "none" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
-+ # While newer versions of TF-A support "none" as
-+ # ENABLE_STACK_PROTECTOR value, older versions (e.g 2.0) only
-+ # supported "0" to disable SSP.
-+ default "0" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
- default "default" if BR2_SSP_REGULAR
- default "strong" if BR2_SSP_STRONG
- default "all" if BR2_SSP_ALL
---
-2.20.1
-
diff --git a/patches/buildroot/2021.02/409-boot-arm-trusted-firmware-don-t-force-ENABLE_STACK_P.patch b/patches/buildroot/2021.02/409-boot-arm-trusted-firmware-don-t-force-ENABLE_STACK_P.patch
deleted file mode 100644
index d2ecb4e00..000000000
--- a/patches/buildroot/2021.02/409-boot-arm-trusted-firmware-don-t-force-ENABLE_STACK_P.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ccac9a5bbbd7374187a0f0017101ece0c202851d Mon Sep 17 00:00:00 2001
-From: Baruch Siach <ba...@tk...>
-Date: Mon, 16 Aug 2021 06:30:11 +0300
-Subject: [PATCH] boot/arm-trusted-firmware: don't force ENABLE_STACK_PROTECTOR
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 5f432df7e2d2 ("boot/arm-trusted-firmware: change
-ENABLE_STACK_PROTECTOR value when disabled") set
-ENABLE_STACK_PROTECTOR=0 when disabled. But since we pass this value as
-MAKE_OPT, the internal ATF logic that sets ENABLE_STACK_PROTECTOR again
-based on its initial value breaks. This leads to build failure:
-
-make[1]: *** [/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o] Error 1
-aarch64-buildroot-linux-uclibc-gcc.br_real: error: unrecognized command-line option â-fstack-protector-0â; did you mean â-fstack-protectorâ?
-
-Move ENABLE_STACK_PROTECTOR to make environment instead to allow make to
-change its value.
-
-Fixes:
-https://gitlab.com/buildroot.org/buildroot/-/jobs/1497663294
-
-Cc: Dick Olsson <hi...@se...>
-Cc: Sergey Matyukevich <geo...@gm...>
-Cc: Thomas Petazzoni <tho...@bo...
-Signed-off-by: Baruch Siach <ba...@tk...>
-Signed-off-by: Peter Korsgaard <pe...@ko...>
----
- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
-index 1f08f5dabb..00b68a30af 100644
---- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
-+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
-@@ -51,7 +51,10 @@ endif
- ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \
-- PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \
-+ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM)
-+
-+ARM_TRUSTED_FIRMWARE_MAKE_ENV += \
-+ $(TARGET_MAKE_ENV) \
- ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL))
-
- ifeq ($(BR2_ARM_CPU_ARMV7A),y)
-@@ -164,7 +167,8 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \
-
- define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
- $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
-- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
-+ $(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \
-+ $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
- $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
- $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD)
- endef
---
-2.20.1
-
hooks/post-receive
--
armadeus
|