[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-309-g72d21fabc
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2022-02-17 10:47:45
|
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 72d21fabc5c43a8b85490f0d61c876660ecf5861 (commit)
from 8c9bbc29eb6c44af31fc11b486a8763aadd2fefd (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 72d21fabc5c43a8b85490f0d61c876660ecf5861
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 17 11:45:46 2022 +0100
[BUILDROOT] Bump BR to 2021.02.9
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...ls-fix_installation_bug_on_some_host_systems.patch | 19 -------------------
patches/buildroot/2021.02/cleanup_buildroot.sh | 1 -
3 files changed, 1 insertion(+), 21 deletions(-)
delete mode 100644 patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
diff --git a/Makefile b/Makefile
index 93619dd95..4dedd4a78 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2021.02
-BUILDROOT_MINOR_VERSION ?= 8
+BUILDROOT_MINOR_VERSION ?= 9
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
deleted file mode 100644
index efd7c1828..000000000
--- a/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Depending on "cp" version, alsa-utils install may fail with:
- "$(TARGET_DIR)/usr/share/alsa/ directory doesn't exist"
-This patch fixes it.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/alsa-utils/alsa-utils.mk
-===================================================================
---- 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
- endef
-
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index af9686886..d3e71f53a 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -16,7 +16,6 @@ rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/package/Config.in
rm -rf buildroot/package/agg/Config.in
rm -rf buildroot/package/agg/agg.mk
-rm -rf buildroot/package/alsa-utils/alsa-utils.mk
rm -rf buildroot/package/apf-config/Config.in
rm -rf buildroot/package/apf-config/apf-config.mk
rm -rf buildroot/package/bayer2rgb-neon/Config.in
hooks/post-receive
--
armadeus
|