[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-188-g05ae6cb57
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-188-g05ae6cb57
|
From: Sébastien S. <ss...@us...> - 2020-04-22 12:40:19
|
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 05ae6cb57901f55d99a2fc8b73f438b0f9afdf93 (commit)
from 4fd125be7b4bc9ecdec7c99e273ee77b2c396862 (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 05ae6cb57901f55d99a2fc8b73f438b0f9afdf93
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Apr 22 14:33:52 2020 +0200
[BUILDROOT] 2019.02/2020.01: drop patch 146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
Busybox is installed with the noclobber option which prevents it to
overwrite full-blown versions of apps installed by other packages.
This patch is thus no more needed. Remove it.
-----------------------------------------------------------------------
Summary of changes:
...-disable_ip_busybox_if_iproute2_buildroot.patch | 36 ----------------------
patches/buildroot/2019.02/cleanup_buildroot.sh | 1 -
...-disable_ip_busybox_if_iproute2_buildroot.patch | 36 ----------------------
patches/buildroot/2020.02/cleanup_buildroot.sh | 1 -
4 files changed, 74 deletions(-)
delete mode 100644 patches/buildroot/2019.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
delete mode 100644 patches/buildroot/2020.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
diff --git a/patches/buildroot/2019.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch b/patches/buildroot/2019.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
deleted file mode 100644
index 3e1f5a78e..000000000
--- a/patches/buildroot/2019.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch disable the ip tools options of the busybox config when the iproute2 package is selected
-in buildroot config. It modify the makefile of the busybox package in buildroot.
-We need to disable ip from busybox if we choose to use iproute2 because by default,
-the binary used for ip is the ip of busybox (/bin/ip) and we need to use ip of iproute2
-(/sbin/ip). This patch fix the conflict with the two binaries.
-
-Signed-off-by: Kevin Joly <jol...@gm...>
-
-Index: buildroot/package/busybox/busybox.mk
-===================================================================
---- buildroot.orig/package/busybox/busybox.mk
-+++ buildroot/package/busybox/busybox.mk
-@@ -217,6 +217,15 @@ define BUSYBOX_NOCLOBBER_INSTALL
- $(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh
- endef
-
-+# If IPROUTE2 is selected, disable all the ip tools of busybox
-+ifeq ($(BR2_PACKAGE_IPROUTE2),y)
-+define BUSYBOX_IPROUTE2
-+ $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IP,$(BUSYBOX_BUILD_CONFIG))
-+ $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN,$(BUSYBOX_BUILD_CONFIG))
-+ $(call KCONFIG_DISABLE_OPT,CONFIG_IP,$(BUSYBOX_BUILD_CONFIG))
-+endef
-+endif
-+
- define BUSYBOX_KCONFIG_FIXUP_CMDS
- $(BUSYBOX_SET_MMU)
- $(BUSYBOX_SET_LARGEFILE)
-@@ -224,6 +233,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
- $(BUSYBOX_PREFER_STATIC)
- $(BUSYBOX_SET_MDEV)
- $(BUSYBOX_SET_CRYPT_SHA)
-+ $(BUSYBOX_IPROUTE2)
- $(BUSYBOX_LINUX_PAM)
- $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
- $(BUSYBOX_SET_INIT)
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 1ec2617bc..e1084f205 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -32,7 +32,6 @@ rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be
rm -rf buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
rm -rf buildroot/package/busybox/0008-passwd-initialize-pointers-correctly.patch
rm -rf buildroot/package/busybox/S10mdev
-rm -rf buildroot/package/busybox/busybox.mk
rm -rf buildroot/package/cmux/Config.in
rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
diff --git a/patches/buildroot/2020.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch b/patches/buildroot/2020.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
deleted file mode 100644
index 3e1f5a78e..000000000
--- a/patches/buildroot/2020.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch disable the ip tools options of the busybox config when the iproute2 package is selected
-in buildroot config. It modify the makefile of the busybox package in buildroot.
-We need to disable ip from busybox if we choose to use iproute2 because by default,
-the binary used for ip is the ip of busybox (/bin/ip) and we need to use ip of iproute2
-(/sbin/ip). This patch fix the conflict with the two binaries.
-
-Signed-off-by: Kevin Joly <jol...@gm...>
-
-Index: buildroot/package/busybox/busybox.mk
-===================================================================
---- buildroot.orig/package/busybox/busybox.mk
-+++ buildroot/package/busybox/busybox.mk
-@@ -217,6 +217,15 @@ define BUSYBOX_NOCLOBBER_INSTALL
- $(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh
- endef
-
-+# If IPROUTE2 is selected, disable all the ip tools of busybox
-+ifeq ($(BR2_PACKAGE_IPROUTE2),y)
-+define BUSYBOX_IPROUTE2
-+ $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IP,$(BUSYBOX_BUILD_CONFIG))
-+ $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN,$(BUSYBOX_BUILD_CONFIG))
-+ $(call KCONFIG_DISABLE_OPT,CONFIG_IP,$(BUSYBOX_BUILD_CONFIG))
-+endef
-+endif
-+
- define BUSYBOX_KCONFIG_FIXUP_CMDS
- $(BUSYBOX_SET_MMU)
- $(BUSYBOX_SET_LARGEFILE)
-@@ -224,6 +233,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
- $(BUSYBOX_PREFER_STATIC)
- $(BUSYBOX_SET_MDEV)
- $(BUSYBOX_SET_CRYPT_SHA)
-+ $(BUSYBOX_IPROUTE2)
- $(BUSYBOX_LINUX_PAM)
- $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
- $(BUSYBOX_SET_INIT)
diff --git a/patches/buildroot/2020.02/cleanup_buildroot.sh b/patches/buildroot/2020.02/cleanup_buildroot.sh
index 0b03f4c9b..4738a6fdb 100755
--- a/patches/buildroot/2020.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2020.02/cleanup_buildroot.sh
@@ -24,7 +24,6 @@ rm -rf buildroot/package/beremiz/beremiz.mk
rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
rm -rf buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
rm -rf buildroot/package/busybox/S10mdev
-rm -rf buildroot/package/busybox/busybox.mk
rm -rf buildroot/package/cmux/Config.in
rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
hooks/post-receive
--
armadeus
|