[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-327-g60a8947d8
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-327-g60a8947d8
|
From: Sébastien S. <ss...@us...> - 2022-04-21 10:46:02
|
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 60a8947d8966dff69bcf8c0871f507b5a45ef14d (commit)
via d653557a6cce93878f02a0aafc01ec8c8d43ba08 (commit)
from 77744c972813c353eb9e972032b9602382cbc8b3 (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 60a8947d8966dff69bcf8c0871f507b5a45ef14d
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 21 12:43:38 2022 +0200
[BUILDROOT] 2022.02: add custom patches to ATF
commit d653557a6cce93878f02a0aafc01ec8c8d43ba08
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 14 10:33:17 2022 +0200
[BUILDROOT] Bump BR to 2022.02.1
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../004-armadeus-add-custom-patches-to-atf.patch | 53 +++++++++++++
...e-libzlib-security-bump-version-to-1.2.12.patch | 89 ----------------------
patches/buildroot/2022.02/cleanup_buildroot.sh | 5 +-
4 files changed, 56 insertions(+), 93 deletions(-)
create mode 100644 patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch
delete mode 100644 patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
diff --git a/Makefile b/Makefile
index 378ae1324..95730eeb6 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?=
+BUILDROOT_MINOR_VERSION ?= 1
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch b/patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch
new file mode 100644
index 000000000..1025cc137
--- /dev/null
+++ b/patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch
@@ -0,0 +1,53 @@
+Add custom patches to ATF
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+Index: buildroot/boot/arm-trusted-firmware/Config.in
+===================================================================
+--- buildroot.orig/boot/arm-trusted-firmware/Config.in
++++ buildroot/boot/arm-trusted-firmware/Config.in
+@@ -63,6 +63,16 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_C
+
+ endif
+
++config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH
++ string "Custom ARM Trusted Firmware (ATF) patches"
++ help
++ A space-separated list of patches to apply to ATF.
++ Each patch can be described as an URL, a local file path,
++ or a directory. In the case of a directory, all files
++ matching *.patch in the directory will be applied.
++
++ Most users may leave this empty
++
+ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM
+ string "ATF platform"
+ help
+Index: buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+===================================================================
+--- buildroot.orig/boot/arm-trusted-firmware/arm-trusted-firmware.mk
++++ buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+@@ -39,6 +39,24 @@ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_
+ ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-a-toolchain
+ endif
+
++# Analogous code exists in linux/linux.mk. Basically, the generic
++# package infrastructure handles downloading and applying remote
++# patches. Local patches are handled depending on whether they are
++# directories or files.
++ARM_TRUSTED_FIRMWARE_PATCHES = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH))
++ARM_TRUSTED_FIRMWARE_PATCH = $(filter ftp://% http://% https://%,$(ARM_TRUSTED_FIRMWARE_PATCHES))
++
++define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES
++ for p in $(filter-out ftp://% http://% https://%,$(ARM_TRUSTED_FIRMWARE_PATCHES)) ; do \
++ if test -d $$p ; then \
++ $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \
++ else \
++ $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \
++ fi \
++ done
++endef
++ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES
++
+ ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM))
+
+ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y)
diff --git a/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch b/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
deleted file mode 100644
index a12bd0997..000000000
--- a/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 0612a2231fa3b7de6356afd22436892d9d620461 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <ber...@t-...>
-Date: Wed, 30 Mar 2022 20:06:05 +0200
-Subject: [PATCH 1/1] package/libzlib: security bump version to 1.2.12
-
-Fixes CVE-2018-25032.
-
-Release notes:
-http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html
-
-Changelog: https://github.com/madler/zlib/blob/master/ChangeLog
-
-Added upstream patch to fix build error.
-
-Updated license hash due to version bump, reformatted hashes:
-https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389
-
-Signed-off-by: Bernd Kuhls <ber...@t-...>
-Signed-off-by: Peter Korsgaard <pe...@ko...>
-(cherry picked from commit a7fa40a9c1e93c063bbc5c5d4cac0c67493087a7)
-Signed-off-by: Peter Korsgaard <pe...@ko...>
----
- ...hat-discarded-provided-CC-definition.patch | 28 +++++++++++++++++++
- package/libzlib/libzlib.hash | 4 +--
- package/libzlib/libzlib.mk | 2 +-
- 3 files changed, 31 insertions(+), 3 deletions(-)
- create mode 100644 package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
-
-diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
-new file mode 100644
-index 0000000000..398e1c9481
---- /dev/null
-+++ b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
-@@ -0,0 +1,28 @@
-+From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
-+From: Mark Adler <ma...@al...>
-+Date: Mon, 28 Mar 2022 18:34:10 -0700
-+Subject: [PATCH] Fix configure issue that discarded provided CC definition.
-+
-+Downloaded from upstream commit:
-+https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d
-+
-+Signed-off-by: Bernd Kuhls <ber...@t-...>
-+---
-+ configure | 3 +++
-+ 1 file changed, 3 insertions(+)
-+
-+diff --git a/configure b/configure
-+index 52ff4a04e..3fa3e8618 100755
-+--- a/configure
-++++ b/configure
-+@@ -174,7 +174,10 @@ if test -z "$CC"; then
-+ else
-+ cc=${CROSS_PREFIX}cc
-+ fi
-++else
-++ cc=${CC}
-+ fi
-++
-+ cflags=${CFLAGS-"-O3"}
-+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
-+ case "$cc" in
-diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash
-index e3736b1011..e6ca974e2f 100644
---- a/package/libzlib/libzlib.hash
-+++ b/package/libzlib/libzlib.hash
-@@ -1,4 +1,4 @@
- # From http://www.zlib.net/
--sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz
-+sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz
- # License files, locally calculated
--sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README
-+sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README
-diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
-index a10fc748d1..933732d6ba 100644
---- a/package/libzlib/libzlib.mk
-+++ b/package/libzlib/libzlib.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
-
--LIBZLIB_VERSION = 1.2.11
-+LIBZLIB_VERSION = 1.2.12
- LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz
- LIBZLIB_SITE = http://www.zlib.net
- LIBZLIB_LICENSE = Zlib
---
-2.34.1
-
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index d276a19f0..e8ad29e66 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -11,6 +11,8 @@
rm -rf buildroot/Makefile
rm -rf buildroot/arch/Config.in.arm
+rm -rf buildroot/boot/arm-trusted-firmware/Config.in
+rm -rf buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/package/Config.in
@@ -43,9 +45,6 @@ rm -rf buildroot/package/libimxvpuapi2/Config.in
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.hash
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.mk
rm -rf buildroot/package/libopenssl/libopenssl.mk
-rm -rf buildroot/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
-rm -rf buildroot/package/libzlib/libzlib.hash
-rm -rf buildroot/package/libzlib/libzlib.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
hooks/post-receive
--
armadeus
|