[Buildroot] [PATCH 01/50] package/busybox: backport upstream patch to fix install-noclobber

[Buildroot] [PATCH 01/50] package/busybox: backport upstream patch to fix install-noclobber

[Yann E. MORIN]

Currently, we shoehorn the noclobber option with a sed call, but
upstream has applied a set of 4 patches that adds support to do
an install without clobbering.

Backport those patches, and use the new install rule.

Note that the 3rd and 6th patches do not seem like they would be usefull
to backport, but a user may well have a custom config that enables shell
wrappers, or installs no wrapper (to install then at runtime), so it
still makes sense to backport them (especially since the 3rd was part of
the noclobber series upstream, and the 6th, a fix of it).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 ...tall-respect-noclobber-for-script-wrapper.patch | 62 +++++++++++++++++++++
 ...stall-accept-more-than-one-install-option.patch | 63 +++++++++++++++++++++
 ...m-add-rule-to-install-without-cloberring-.patch | 29 ++++++++++
 ...lets-install-don-t-try-to-install-nothing.patch | 65 ++++++++++++++++++++++
 package/busybox/busybox.mk                         |  8 +--
 5 files changed, 220 insertions(+), 7 deletions(-)
 create mode 100644 package/busybox/0003-applets-install-respect-noclobber-for-script-wrapper.patch
 create mode 100644 package/busybox/0004-applets-install-accept-more-than-one-install-option.patch
 create mode 100644 package/busybox/0005-build-system-add-rule-to-install-without-cloberring-.patch
 create mode 100644 package/busybox/0006-applets-install-don-t-try-to-install-nothing.patch

diff --git a/package/busybox/0003-applets-install-respect-noclobber-for-script-wrapper.patch b/package/busybox/0003-applets-install-respect-noclobber-for-script-wrapper.patch
new file mode 100644
index 0000000000..9ac3186ccb
--- /dev/null
+++ b/package/busybox/0003-applets-install-respect-noclobber-for-script-wrapper.patch
@@ -0,0 +1,62 @@
+From 84be5ce0d814780918771727e494fe4a2eb46636 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Thu, 28 Dec 2017 23:49:47 +0100
+Subject: [PATCH] applets/install: respect noclobber for script wrappers too
+
+Simplify the handling of --noclobber so that it applies to all types of
+installation types, even to script wrappers.
+
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ applets/install.sh | 20 ++++++++------------
+ 1 file changed, 8 insertions(+), 12 deletions(-)
+
+diff --git a/applets/install.sh b/applets/install.sh
+index f6c097e57..4b70df96e 100755
+--- a/applets/install.sh
++++ b/applets/install.sh
+@@ -77,6 +77,10 @@ install -m 755 busybox "$prefix/bin/busybox" || exit 1
+ for i in $h; do
+ 	appdir=`dirname "$i"`
+ 	app=`basename "$i"`
++	if [ "$noclobber" = "1" ] && [ -e "$prefix/$i" ]; then
++		echo "  $prefix/$i already exists"
++		continue
++	fi
+ 	mkdir -p "$prefix/$appdir" || exit 1
+ 	if [ "$scriptwrapper" = "y" ]; then
+ 		if [ "$swrapall" != "y" ] && [ "$i" = "/bin/sh" ]; then
+@@ -90,12 +94,8 @@ for i in $h; do
+ 	elif [ "$binaries" = "y" ]; then
+ 		# Copy the binary over rather
+ 		if [ -e $sharedlib_dir/$app ]; then
+-			if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then
+-				echo "   Copying $sharedlib_dir/$app to $prefix/$i"
+-				cp -pPR $sharedlib_dir/$app $prefix/$i || exit 1
+-			else
+-				echo "  $prefix/$i already exists"
+-			fi
++			echo "   Copying $sharedlib_dir/$app to $prefix/$i"
++			cp -pPR $sharedlib_dir/$app $prefix/$i || exit 1
+ 		else
+ 			echo "Error: Could not find $sharedlib_dir/$app"
+ 			exit 1
+@@ -123,12 +123,8 @@ for i in $h; do
+ 			;;
+ 			esac
+ 		fi
+-		if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then
+-			echo "  $prefix/$i -> $bb_path"
+-			ln $linkopts "$bb_path" "$prefix/$i" || exit 1
+-		else
+-			echo "  $prefix/$i already exists"
+-		fi
++		echo "  $prefix/$i -> $bb_path"
++		ln $linkopts "$bb_path" "$prefix/$i" || exit 1
+ 	fi
+ done
+ 
+-- 
+2.14.1
+
diff --git a/package/busybox/0004-applets-install-accept-more-than-one-install-option.patch b/package/busybox/0004-applets-install-accept-more-than-one-install-option.patch
new file mode 100644
index 0000000000..8bfb5d73fa
--- /dev/null
+++ b/package/busybox/0004-applets-install-accept-more-than-one-install-option.patch
@@ -0,0 +1,63 @@
+From 952d5a6024e7b2a6d5a351a8d1329bd985da3c76 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Thu, 28 Dec 2017 23:49:48 +0100
+Subject: [PATCH] applets/install: accept more than one install option
+
+Currently, it is impossible to pass more than one option to the isntall
+script, so it totally prevents using --noclobber.
+
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ applets/install.sh | 28 ++++++++++++++++------------
+ 1 file changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/applets/install.sh b/applets/install.sh
+index 4b70df96e..ae99381d7 100755
+--- a/applets/install.sh
++++ b/applets/install.sh
+@@ -8,6 +8,7 @@ if [ -z "$prefix" ]; then
+ 	echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]"
+ 	exit 1
+ fi
++shift # Keep only remaining options
+ 
+ # Source the configuration
+ . ./.config
+@@ -21,18 +22,21 @@ scriptwrapper="n"
+ binaries="n"
+ cleanup="0"
+ noclobber="0"
+-case "$2" in
+-	--hardlinks)     linkopts="-f";;
+-	--symlinks)      linkopts="-fs";;
+-	--binaries)      binaries="y";;
+-	--scriptwrapper) scriptwrapper="y";swrapall="y";;
+-	--sw-sh-hard)    scriptwrapper="y";linkopts="-f";;
+-	--sw-sh-sym)     scriptwrapper="y";linkopts="-fs";;
+-	--cleanup)       cleanup="1";;
+-	--noclobber)     noclobber="1";;
+-	"")              h="";;
+-	*)               echo "Unknown install option: $2"; exit 1;;
+-esac
++while [ ${#} -gt 0 ]; do
++	case "$1" in
++		--hardlinks)     linkopts="-f";;
++		--symlinks)      linkopts="-fs";;
++		--binaries)      binaries="y";;
++		--scriptwrapper) scriptwrapper="y"; swrapall="y";;
++		--sw-sh-hard)    scriptwrapper="y"; linkopts="-f";;
++		--sw-sh-sym)     scriptwrapper="y"; linkopts="-fs";;
++		--cleanup)       cleanup="1";;
++		--noclobber)     noclobber="1";;
++		"")              h="";;
++		*)               echo "Unknown install option: $1"; exit 1;;
++	esac
++	shift
++done
+ 
+ if [ -n "$DO_INSTALL_LIBS" ] && [ "$DO_INSTALL_LIBS" != "n" ]; then
+ 	# get the target dir for the libs
+-- 
+2.14.1
+
diff --git a/package/busybox/0005-build-system-add-rule-to-install-without-cloberring-.patch b/package/busybox/0005-build-system-add-rule-to-install-without-cloberring-.patch
new file mode 100644
index 0000000000..b722a6da91
--- /dev/null
+++ b/package/busybox/0005-build-system-add-rule-to-install-without-cloberring-.patch
@@ -0,0 +1,29 @@
+From a47375de8c7b0f4dcb95097c8119ea47b6e2636c Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Thu, 28 Dec 2017 23:49:49 +0100
+Subject: [PATCH] build system: add rule to install without cloberring
+ existing utilities
+
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ Makefile.custom | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile.custom b/Makefile.custom
+index 891c9ced7..28d0ef7bc 100644
+--- a/Makefile.custom
++++ b/Makefile.custom
+@@ -46,6 +46,9 @@ ifeq ($(strip $(CONFIG_FEATURE_SUID)),y)
+ 	@echo
+ endif
+ 
++install-noclobber: INSTALL_OPTS+=--noclobber
++install-noclobber: install
++
+ uninstall: busybox.links
+ 	rm -f $(CONFIG_PREFIX)/bin/busybox
+ 	for i in `cat busybox.links` ; do rm -f $(CONFIG_PREFIX)$$i; done
+-- 
+2.14.1
+
diff --git a/package/busybox/0006-applets-install-don-t-try-to-install-nothing.patch b/package/busybox/0006-applets-install-don-t-try-to-install-nothing.patch
new file mode 100644
index 0000000000..dd5b64039f
--- /dev/null
+++ b/package/busybox/0006-applets-install-don-t-try-to-install-nothing.patch
@@ -0,0 +1,65 @@
+From 296381ff4f69715ed880adcce7d5ce608153e767 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Sun, 15 Apr 2018 10:55:30 +0200
+Subject: [PATCH] applets/install: don't try to install nothing
+
+Commit 952d5a6024e7 (applets/install: accept more than one install
+option) changed the way we handle install options: before that commit, a
+missing install type would mean to install nothing; after, we would
+iterate over options, so we would never notice there was a mising
+option.
+
+Fix that by introducing an explicit --none option to specify to install
+nothing.
+
+Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
+Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
+Cc: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ Makefile.custom    | 3 +++
+ applets/install.sh | 6 ++++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.custom b/Makefile.custom
+index 28d0ef7bc..6f679c4e1 100644
+--- a/Makefile.custom
++++ b/Makefile.custom
+@@ -11,6 +11,9 @@ busybox.cfg.nosuid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autocon
+ 	$(Q)-SUID="DROP" $(SHELL) $^ > $@
+ 
+ .PHONY: install
++ifeq ($(CONFIG_INSTALL_APPLET_DONT),y)
++INSTALL_OPTS:= --none
++endif
+ ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y)
+ INSTALL_OPTS:= --symlinks
+ endif
+diff --git a/applets/install.sh b/applets/install.sh
+index c75a78e9d..9aede0f53 100755
+--- a/applets/install.sh
++++ b/applets/install.sh
+@@ -5,7 +5,9 @@ export LC_CTYPE=POSIX
+ 
+ prefix=$1
+ if [ -z "$prefix" ]; then
+-	echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]"
++	echo "usage: applets/install.sh DESTINATION TYPE [OPTS ...]"
++	echo "  TYPE is one of: --symlinks --hardlinks --binaries --scriptwrapper --none"
++	echo "  OPTS is one or more of: --cleanup --noclobber"
+ 	exit 1
+ fi
+ shift # Keep only remaining options
+@@ -32,7 +34,7 @@ while [ ${#} -gt 0 ]; do
+ 		--sw-sh-sym)     scriptwrapper="y"; linkopts="-fs";;
+ 		--cleanup)       cleanup="1";;
+ 		--noclobber)     noclobber="1";;
+-		"")              h="";;
++		--none)          h="";;
+ 		*)               echo "Unknown install option: $1"; exit 1;;
+ 	esac
+ 	shift
+-- 
+2.14.1
+
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index ba5a16b5b7..c566cdc3d6 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -253,12 +253,6 @@ define BUSYBOX_INSTALL_ADD_TO_SHELLS
 endef
 BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS
 
-# Enable "noclobber" in install.sh, to prevent BusyBox from overwriting any
-# full-blown versions of apps installed by other packages with sym/hard links.
-define BUSYBOX_NOCLOBBER_INSTALL
-	$(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh
-endef
-
 define BUSYBOX_KCONFIG_FIXUP_CMDS
 	$(BUSYBOX_SET_MMU)
 	$(BUSYBOX_PREFER_STATIC)
@@ -280,7 +274,7 @@ define BUSYBOX_BUILD_CMDS
 endef
 
 define BUSYBOX_INSTALL_TARGET_CMDS
-	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install
+	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install-noclobber
 	$(BUSYBOX_INSTALL_INITTAB)
 	$(BUSYBOX_INSTALL_UDHCPC_SCRIPT)
 	$(BUSYBOX_INSTALL_MDEV_CONF)
-- 
2.14.1

[Buildroot] [PATCH 02/50] package/busybox: invert dependency with whois

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 4 ++++
 package/whois/whois.mk     | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index c566cdc3d6..2b60a7faef 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -20,6 +20,10 @@ BUSYBOX_CFLAGS = \
 BUSYBOX_LDFLAGS = \
 	$(TARGET_LDFLAGS)
 
+# Packages that provide commands that may also be busybox applets:
+BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_WHOIS),whois)
+
 # Link against libtirpc if available so that we can leverage its RPC
 # support for NFS mounting with BusyBox
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
diff --git a/package/whois/whois.mk b/package/whois/whois.mk
index c9203d8c0d..6b6069c51a 100644
--- a/package/whois/whois.mk
+++ b/package/whois/whois.mk
@@ -7,8 +7,7 @@
 WHOIS_VERSION = 5.3.1
 WHOIS_SITE = http://snapshot.debian.org/archive/debian/20180522T155750Z/pool/main/w/whois
 WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
-# take precedence over busybox implementation
-WHOIS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) $(TARGET_NLS_DEPENDENCIES)
+WHOIS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
 WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 	LIBS="$(WHOIS_EXTRA_LIBS)"
-- 
2.14.1

[Buildroot] [PATCH 03/50] package/busybox: invert dependency with wget

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/wget/wget.mk       | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 2b60a7faef..a510bf564b 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_WGET),wget) \
 	$(if $(BR2_PACKAGE_WHOIS),whois)
 
 # Link against libtirpc if available so that we can leverage its RPC
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index 36afea761a..28bd0a264f 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -11,11 +11,6 @@ WGET_DEPENDENCIES = host-pkgconf
 WGET_LICENSE = GPL-3.0+
 WGET_LICENSE_FILES = COPYING
 
-# Prefer full-blown wget over busybox
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-WGET_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 WGET_CONF_OPTS += --with-ssl=gnutls
 WGET_DEPENDENCIES += gnutls
-- 
2.14.1

[Buildroot] [PATCH 04/50] package/busybox: invert dependency with vim

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/vim/vim.mk         | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index a510bf564b..eb3c848bac 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_VIM),vim) \
 	$(if $(BR2_PACKAGE_WGET),wget) \
 	$(if $(BR2_PACKAGE_WHOIS),whois)
 
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index 5ee889882a..bd4fd489c6 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -6,10 +6,7 @@
 
 VIM_VERSION = v8.0.0329
 VIM_SITE = $(call github,vim,vim,$(VIM_VERSION))
-# Win over busybox vi since vim is more feature-rich
-VIM_DEPENDENCIES = \
-	ncurses $(TARGET_NLS_DEPENDENCIES) \
-	$(if $(BR2_PACKAGE_BUSYBOX),busybox)
+VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES)
 VIM_SUBDIR = src
 VIM_CONF_ENV = \
 	vim_cv_toupper_broken=no \
-- 
2.14.1

[Buildroot] [PATCH 05/50] package/busybox: invert dependency with util-linux

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk       | 1 +
 package/util-linux/util-linux.mk | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index eb3c848bac..5d212e66e4 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \
 	$(if $(BR2_PACKAGE_VIM),vim) \
 	$(if $(BR2_PACKAGE_WGET),wget) \
 	$(if $(BR2_PACKAGE_WHOIS),whois)
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 80a8a08051..76f4b97f5f 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -31,12 +31,6 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
 # We also don't want the host-python dependency
 HOST_UTIL_LINUX_CONF_OPTS = --without-python
 
-# If both util-linux and busybox are selected, make certain util-linux
-# wins the fight over who gets to have their utils actually installed
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-UTIL_LINUX_DEPENDENCIES += busybox
-endif
-
 # Prevent the installation from attempting to move shared libraries from
 # ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are
 # the same when merged usr is in use.
-- 
2.14.1

[Buildroot] [PATCH 06/50] package/busybox: invert dependency with usbutils

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk   | 1 +
 package/usbutils/usbutils.mk | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 5d212e66e4..4e33ac232f 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_USBUTILS),usbutils) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \
 	$(if $(BR2_PACKAGE_VIM),vim) \
 	$(if $(BR2_PACKAGE_WGET),wget) \
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 43322e4a65..4bd12f34ff 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -11,11 +11,6 @@ USBUTILS_DEPENDENCIES = host-pkgconf libusb udev
 USBUTILS_LICENSE = GPL-2.0+ (utils) GPL-2.0 or GPL-3.0 (lsusb.py)
 USBUTILS_LICENSE_FILES = LICENSES/GPL-2.0.txt LICENSES/GPL-3.0.txt
 
-# Build after busybox since it's got a lightweight lsusb
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-USBUTILS_DEPENDENCIES += busybox
-endif
-
 # Nice lsusb.py script only if there's python 3.x
 ifeq ($(BR2_PACKAGE_PYTHON3),)
 define USBUTILS_REMOVE_PYTHON
-- 
2.14.1

[Buildroot] [PATCH 07/50] package/busybox: invert dependency with unzip

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/unzip/unzip.mk     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 4e33ac232f..16f69cc902 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_UNZIP),unzip) \
 	$(if $(BR2_PACKAGE_USBUTILS),usbutils) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \
 	$(if $(BR2_PACKAGE_VIM),vim) \
diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk
index 7d48d25309..cff5951ac0 100644
--- a/package/unzip/unzip.mk
+++ b/package/unzip/unzip.mk
@@ -7,8 +7,6 @@
 UNZIP_VERSION = 60
 UNZIP_SOURCE = unzip$(UNZIP_VERSION).tgz
 UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
-# take precedence over busybox implementation
-UNZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 UNZIP_LICENSE = Info-ZIP
 UNZIP_LICENSE_FILES = LICENSE
 
-- 
2.14.1

[Buildroot] [PATCH 08/50] package/busybox: invert dependency with traceroute

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk       | 1 +
 package/traceroute/traceroute.mk | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 16f69cc902..88feec7326 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
 	$(if $(BR2_PACKAGE_UNZIP),unzip) \
 	$(if $(BR2_PACKAGE_USBUTILS),usbutils) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \
diff --git a/package/traceroute/traceroute.mk b/package/traceroute/traceroute.mk
index d01c62d5ea..192197498d 100644
--- a/package/traceroute/traceroute.mk
+++ b/package/traceroute/traceroute.mk
@@ -10,11 +10,6 @@ TRACEROUTE_SITE = http://downloads.sourceforge.net/traceroute/traceroute/tracero
 TRACEROUTE_LICENSE = GPL-2.0+, LGPL-2.1+
 TRACEROUTE_LICENSE_FILES = COPYING COPYING.LIB
 
-# Prefer full-featured traceroute over busybox's version
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-TRACEROUTE_DEPENDENCIES += busybox
-endif
-
 define TRACEROUTE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)
-- 
2.14.1

[Buildroot] [PATCH 09/50] package/busybox: invert dependency with tftpd

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/tftpd/tftpd.mk     | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 88feec7326..4f43fe1e78 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_TFTPD),tftpd) \
 	$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
 	$(if $(BR2_PACKAGE_UNZIP),unzip) \
 	$(if $(BR2_PACKAGE_USBUTILS),usbutils) \
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 78df835aa5..c42456afd1 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -9,11 +9,6 @@ TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
 TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
 TFTPD_CONF_OPTS = --without-tcpwrappers
 
-# Override BusyBox implementations if BusyBox is enabled.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-TFTPD_DEPENDENCIES += busybox
-endif
-
 define TFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp
 	$(INSTALL) -D $(@D)/tftpd/tftpd $(TARGET_DIR)/usr/sbin/tftpd
-- 
2.14.1

[Buildroot] [PATCH 10/50] package/busybox: invert dependency with tar

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/tar/tar.mk         | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 4f43fe1e78..76a195d1f5 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_TAR),tar) \
 	$(if $(BR2_PACKAGE_TFTPD),tftpd) \
 	$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
 	$(if $(BR2_PACKAGE_UNZIP),unzip) \
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index 9942e77737..5e15ca7dfd 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -8,16 +8,11 @@ TAR_VERSION = 1.29
 TAR_SOURCE = tar-$(TAR_VERSION).tar.xz
 TAR_SITE = $(BR2_GNU_MIRROR)/tar
 # busybox installs in /bin, so we need tar to install as well in /bin
-# so that it overrides the Busybox symlinks.
+# so that it we don't end up with two different tar
 TAR_CONF_OPTS = --exec-prefix=/
 TAR_LICENSE = GPL-3.0+
 TAR_LICENSE_FILES = COPYING
 
-# Prefer full-blown tar over buybox's version
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-TAR_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_PACKAGE_ACL),y)
 TAR_DEPENDENCIES += acl
 TAR_CONF_OPTS += --with-posix-acls
-- 
2.14.1

[Buildroot] [PATCH 11/50] package/busybox: invert dependency with sysvinit

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk   | 1 +
 package/sysvinit/sysvinit.mk | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 76a195d1f5..2e80c5fa14 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \
 	$(if $(BR2_PACKAGE_TAR),tar) \
 	$(if $(BR2_PACKAGE_TFTPD),tftpd) \
 	$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index a606ddabf0..993e399e73 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -13,11 +13,6 @@ SYSVINIT_LICENSE_FILES = COPYING
 
 SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR)
 
-# Override BusyBox implementations if BusyBox is enabled.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-SYSVINIT_DEPENDENCIES = busybox
-endif
-
 ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
 SYSVINIT_DEPENDENCIES += libselinux
 SYSVINIT_MAKE_OPTS += WITH_SELINUX="yes"
-- 
2.14.1

[Buildroot] [PATCH 12/50] package/busybox: invert dependency with systemd

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/systemd/systemd.mk | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 2e80c5fa14..94842b35da 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_SYSTEMD),systemd) \
 	$(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \
 	$(if $(BR2_PACKAGE_TAR),tar) \
 	$(if $(BR2_PACKAGE_TFTPD),tftpd) \
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 10e11a9277..127e6dd9d2 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -18,12 +18,6 @@ SYSTEMD_DEPENDENCIES = \
 
 SYSTEMD_PROVIDES = udev
 
-# Make sure that systemd will always be built after busybox so that we have
-# a consistent init setup between two builds
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-SYSTEMD_DEPENDENCIES += busybox
-endif
-
 SYSTEMD_CONF_OPTS += \
 	-Drootlibdir='/usr/lib' \
 	-Dblkid=true \
-- 
2.14.1

[Buildroot] [PATCH 13/50] package/busybox: invert dependency with syslog-ng

[Yann E. MORIN]

In so doing, we must now ensure that busybox does not overwrite
the startup script already installed by syslog-ng.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk     | 6 +++++-
 package/syslog-ng/syslog-ng.mk | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 94842b35da..655b4b4647 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd) \
 	$(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \
 	$(if $(BR2_PACKAGE_TAR),tar) \
@@ -208,8 +209,11 @@ define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES
 endef
 endif
 
+# Only install our own if no other package already did.
 define BUSYBOX_INSTALL_LOGGING_SCRIPT
-	if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
+	if grep -q CONFIG_SYSLOGD=y $(@D)/.config && \
+		[ ! -e $(TARGET_DIR)/etc/init.d/S01logging ]; \
+	then \
 		$(INSTALL) -m 0755 -D package/busybox/S01logging \
 			$(TARGET_DIR)/etc/init.d/S01logging; \
 	fi
diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 2b6f2c09e9..793fea0972 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -17,11 +17,6 @@ SYSLOG_NG_CONF_ENV = LIBS=-lrt
 SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
 	--disable-java --disable-java-modules --disable-mongodb
 
-# We override busybox's S01logging init script
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-SYSLOG_NG_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_PACKAGE_GEOIP),y)
 SYSLOG_NG_DEPENDENCIES += geoip
 SYSLOG_NG_CONF_OPTS += --enable-geoip
-- 
2.14.1

[Buildroot] [PATCH 14/50] package/busybox: invert dependency with sysklogd

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk   | 1 +
 package/sysklogd/sysklogd.mk | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 655b4b4647..74629eb698 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
 	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd) \
 	$(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index 1c8259a9af..c4f064c10b 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -9,11 +9,6 @@ SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download
 SYSKLOGD_LICENSE = GPL-2.0+
 SYSKLOGD_LICENSE_FILES = COPYING
 
-# Override BusyBox implementations if BusyBox is enabled.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-SYSKLOGD_DEPENDENCIES = busybox
-endif
-
 # Override SKFLAGS which is used as CFLAGS.
 define SYSKLOGD_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \
-- 
2.14.1

[Buildroot] [PATCH 15/50] package/busybox: invert dependency with start-stop-daemon

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk                     | 1 +
 package/start-stop-daemon/start-stop-daemon.mk | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 74629eb698..7686667884 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
 	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
 	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd) \
diff --git a/package/start-stop-daemon/start-stop-daemon.mk b/package/start-stop-daemon/start-stop-daemon.mk
index 7071f5617e..01a6719762 100644
--- a/package/start-stop-daemon/start-stop-daemon.mk
+++ b/package/start-stop-daemon/start-stop-daemon.mk
@@ -19,8 +19,7 @@ START_STOP_DAEMON_CONF_ENV = \
 	dpkg_cv_va_copy=yes \
 	dpkg_cv_c99_snprintf=yes \
 	DPKG_DEVEL_MODE=1
-START_STOP_DAEMON_DEPENDENCIES = host-pkgconf \
-	$(if $(BR2_PACKAGE_BUSYBOX),busybox)
+START_STOP_DAEMON_DEPENDENCIES = host-pkgconf
 # Patching m4/dpkg-arch.m4
 START_STOP_DAEMON_AUTORECONF = YES
 START_STOP_DAEMON_LICENSE = GPL-2.0+
-- 
2.14.1

[Buildroot] [PATCH 16/50] package/busybox: invert dependency with rsyslogd

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/rsyslog/rsyslog.mk | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 7686667884..3a19500ad3 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_RSYSLOGD),rsyslogd) \
 	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
 	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
 	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index e32505be22..61e08ba765 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -17,11 +17,6 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
 RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
 	$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
 
-# Build after BusyBox
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-RSYSLOG_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 RSYSLOG_DEPENDENCIES += gnutls
 RSYSLOG_CONF_OPTS += --enable-gnutls
-- 
2.14.1

[Buildroot] [PATCH 17/50] package/busybox: invert dependency with psmisc

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/psmisc/psmisc.mk   | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 3a19500ad3..d861e3c1ef 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_PSMISC),psmisc) \
 	$(if $(BR2_PACKAGE_RSYSLOGD),rsyslogd) \
 	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
 	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 3d9a80462d..3916e34b08 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -23,9 +23,4 @@ ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
 PSMISC_CONF_OPTS = --disable-harden-flags
 endif
 
-# build after busybox, we prefer fat versions while we're at it
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-PSMISC_DEPENDENCIES += busybox
-endif
-
 $(eval $(autotools-package))
-- 
2.14.1

[Buildroot] [PATCH 18/50] package/busybox: invert dependency with procps-ng

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk     |  1 +
 package/procps-ng/procps-ng.mk | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index d861e3c1ef..981c7b0e03 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \
 	$(if $(BR2_PACKAGE_PSMISC),psmisc) \
 	$(if $(BR2_PACKAGE_RSYSLOGD),rsyslogd) \
 	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
index e1fddea32c..03b74784d2 100644
--- a/package/procps-ng/procps-ng.mk
+++ b/package/procps-ng/procps-ng.mk
@@ -13,12 +13,6 @@ PROCPS_NG_INSTALL_STAGING = YES
 PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS)
 
-# If both procps-ng and busybox are selected, make certain procps-ng
-# wins the fight over who gets to have their utils actually installed.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-PROCPS_NG_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 PROCPS_NG_DEPENDENCIES += systemd
 PROCPS_NG_CONF_OPTS += --with-systemd
@@ -26,8 +20,8 @@ else
 PROCPS_NG_CONF_OPTS += --without-systemd
 endif
 
-# Make sure binaries get installed in /bin, so that they overwrite
-# their busybox counterparts.
+# Make sure binaries get installed in /bin, as busybox does, so that we
+# don't end up with two versions.
 # Make sure libprocps.pc is installed in STAGING_DIR/usr/lib/pkgconfig/
 # otherwise it's installed in STAGING_DIR/lib/pkgconfig/ breaking
 # pkg-config --libs libprocps.
-- 
2.14.1

[Buildroot] [PATCH 19/50] package/busybox: invert dependency with pciutils

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk   | 1 +
 package/pciutils/pciutils.mk | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 981c7b0e03..99baf91a83 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_PCIUTILS),pciutils) \
 	$(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \
 	$(if $(BR2_PACKAGE_PSMISC),psmisc) \
 	$(if $(BR2_PACKAGE_RSYSLOGD),rsyslogd) \
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 2dd5771f21..30d429e75a 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -46,11 +46,6 @@ else
 PCIUTILS_MAKE_OPTS += SHARED=yes
 endif
 
-# Build after busybox since it's got a lightweight lspci
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-PCIUTILS_DEPENDENCIES += busybox
-endif
-
 define PCIUTILS_CONFIGURE_CMDS
 	$(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh
 	$(SED) 's/uname -s/echo Linux/' \
-- 
2.14.1

[Buildroot] [PATCH 20/50] package/busybox: invert dependency with ntp

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/ntp/ntp.mk         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 99baf91a83..7f08d857f8 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_NTP),ntp) \
 	$(if $(BR2_PACKAGE_PCIUTILS),pciutils) \
 	$(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \
 	$(if $(BR2_PACKAGE_PSMISC),psmisc) \
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 77bb33a42f..674c368395 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -7,7 +7,7 @@
 NTP_VERSION_MAJOR = 4.2
 NTP_VERSION = $(NTP_VERSION_MAJOR).8p11
 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)
-NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+NTP_DEPENDENCIES = host-pkgconf libevent
 NTP_LICENSE = NTP
 NTP_LICENSE_FILES = COPYRIGHT
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
-- 
2.14.1

[Buildroot] [PATCH 21/50] package/busybox: invert dependency with nnamp

[Yann E. MORIN]

We only need that dependency whan nmap's ncat is enabled.

For consistency, we add a dependency on nmap, not a suboption of it,
to have a dependency list in busybox that is only about packages, and
directly associates the upper-case package variable to the lower-case
package name, e.g. NMAP <-> nmap.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/nmap/nmap.mk       | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 7f08d857f8..4039d1c9ad 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_NMAP),nmap) \
 	$(if $(BR2_PACKAGE_NTP),ntp) \
 	$(if $(BR2_PACKAGE_PCIUTILS),pciutils) \
 	$(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \
diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
index 1c89b5424e..420aec82d7 100644
--- a/package/nmap/nmap.mk
+++ b/package/nmap/nmap.mk
@@ -76,12 +76,6 @@ else
 NMAP_CONF_OPTS += --without-nping
 endif
 
-# If we are going to install ncat, ensure Busybox gets built/installed
-# before, so that this package overrides Busybox nc.
-ifeq ($(BR2_PACKAGE_NMAP_NCAT)$(BR2_PACKAGE_BUSYBOX),yy)
-NMAP_DEPENDENCIES += busybox
-endif
-
 # Add a symlink to "nc" if none of the competing netcats is selected
 ifeq ($(BR2_PACKAGE_NMAP_NCAT):$(BR2_PACKAGE_NETCAT)$(BR2_PACKAGE_NETCAT_OPENBSD),y:)
 define NMAP_INSTALL_NCAT_SYMLINK
-- 
2.14.1

[Buildroot] [PATCH 22/50] package/busybox: invert dependency with netcat-openbsd

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk               | 1 +
 package/netcat-openbsd/netcat-openbsd.mk | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 4039d1c9ad..47952d42e4 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \
 	$(if $(BR2_PACKAGE_NMAP),nmap) \
 	$(if $(BR2_PACKAGE_NTP),ntp) \
 	$(if $(BR2_PACKAGE_PCIUTILS),pciutils) \
diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk
index 5784e4d68e..e98b479c4f 100644
--- a/package/netcat-openbsd/netcat-openbsd.mk
+++ b/package/netcat-openbsd/netcat-openbsd.mk
@@ -10,12 +10,6 @@ NETCAT_OPENBSD_LICENSE = BSD-3-Clause
 NETCAT_OPENBSD_LICENSE_FILES = debian/copyright
 NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd
 
-# Ensure Busybox gets built/installed before, so that this package
-# overrides Busybox nc.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-NETCAT_OPENBSD_DEPENDENCIES += busybox
-endif
-
 define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
 		$(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.dpatch; \
-- 
2.14.1

[Buildroot] [PATCH 23/50] package/busybox: invert dependency with netcat

[Yann E. MORIN]

Since netcat would be installed before busybox, we don't need to remove
a pre-installed 'nc' anymore.

If another netcat implementation (e.g. netcat-openbsd) is also enabled,
there is no way to tell which would win in the end, especially when we
add TLPB, in which case that will be forbidden.

So, we don't need to remove anything anymore.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk |  1 +
 package/netcat/netcat.mk   | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 47952d42e4..8523271ceb 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_NETCAT),netcat) \
 	$(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \
 	$(if $(BR2_PACKAGE_NMAP),nmap) \
 	$(if $(BR2_PACKAGE_NTP),ntp) \
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index d8b3c930b9..eb7ddcac27 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -9,17 +9,4 @@ NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VE
 NETCAT_LICENSE = GPL-2.0+
 NETCAT_LICENSE_FILES = COPYING
 
-# Ensure Busybox gets built/installed before, so that this package
-# overrides Busybox nc.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-NETCAT_DEPENDENCIES += busybox
-endif
-
-# Netcat doesn't overwrite a pre-existing 'nc' (e.g. from busybox) so
-# force-remove it.
-define NETCAT_RMOVE_NC_LINK
-	rm -f $(TARGET_DIR)/usr/bin/nc
-endef
-NETCAT_PRE_INSTALL_TARGET_HOOKS += NETCAT_RMOVE_NC_LINK
-
 $(eval $(autotools-package))
-- 
2.14.1

[Buildroot] [PATCH 24/50] package/busybox: invert dependency with net-tools

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk     | 1 +
 package/net-tools/net-tools.mk | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 8523271ceb..792a74cfd8 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \
 	$(if $(BR2_PACKAGE_NETCAT),netcat) \
 	$(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \
 	$(if $(BR2_PACKAGE_NMAP),nmap) \
diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk
index adab475b35..fc2546fa6b 100644
--- a/package/net-tools/net-tools.mk
+++ b/package/net-tools/net-tools.mk
@@ -10,11 +10,6 @@ NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 NET_TOOLS_LICENSE = GPL-2.0+
 NET_TOOLS_LICENSE_FILES = COPYING
 
-# Install after busybox for the full-blown versions
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-NET_TOOLS_DEPENDENCIES += busybox
-endif
-
 define NET_TOOLS_CONFIGURE_CMDS
 	(cd $(@D); yes "" | ./configure.sh config.in )
 endef
@@ -40,7 +35,8 @@ define NET_TOOLS_BUILD_CMDS
 endef
 
 # install renames conflicting binaries, update does not
-# ifconfig & route reside in /sbin for busybox
+# ifconfig & route reside in /sbin for busybox, so ennsure we don't end
+# up with two versions of those.
 define NET_TOOLS_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) update
 	mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig
-- 
2.14.1

[Buildroot] [PATCH 25/50] package/busybox: invert dependency with mtd

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/mtd/mtd.mk         | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 792a74cfd8..9d0b19bc03 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_MTD),mtd) \
 	$(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \
 	$(if $(BR2_PACKAGE_NETCAT),netcat) \
 	$(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 83bd6a6ae9..13e501fc33 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -31,10 +31,6 @@ else
 MTD_CONF_OPTS += --disable-tests --disable-install-tests
 endif
 
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-MTD_DEPENDENCIES += busybox
-endif
-
 # If extended attributes are required, the acl package must
 # also be enabled which will also include the attr package.
 ifeq ($(BR2_PACKAGE_ACL),y)
-- 
2.14.1

[Buildroot] [PATCH 26/50] package/busybox: invert dependency with lsof

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/lsof/lsof.mk       | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 9d0b19bc03..bb2c02e000 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_LSOF),lsof) \
 	$(if $(BR2_PACKAGE_MTD),mtd) \
 	$(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \
 	$(if $(BR2_PACKAGE_NETCAT),netcat) \
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 0dc8e2de2f..83a9b6c388 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -13,9 +13,6 @@ LSOF_LICENSE = lsof license
 # It is also defined in 00README, but that contains a lot of other cruft.
 LSOF_LICENSE_FILES = dialects/linux/dproto.h
 
-# Make certain full-blown lsof gets built after the busybox version (1.20+)
-LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-
 ifeq ($(BR2_USE_WCHAR),)
 define LSOF_CONFIGURE_WCHAR_FIXUPS
 	$(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \
-- 
2.14.1

[Buildroot] [PATCH 27/50] package/busybox: invert dependency with less

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/less/less.mk       | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index bb2c02e000..4a7afa2516 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_LESS),less) \
 	$(if $(BR2_PACKAGE_LSOF),lsof) \
 	$(if $(BR2_PACKAGE_MTD),mtd) \
 	$(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \
diff --git a/package/less/less.mk b/package/less/less.mk
index bccc08b89f..ef3643c0aa 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -8,8 +8,7 @@ LESS_VERSION = 487
 LESS_SITE = $(BR2_GNU_MIRROR)/less
 LESS_LICENSE = GPL-3.0+
 LESS_LICENSE_FILES = COPYING
-# Build after busybox, full-blown is better
-LESS_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+LESS_DEPENDENCIES = ncurses
 
 define LESS_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less
-- 
2.14.1

[Buildroot] [PATCH 28/50] package/busybox: invert dependency with kmod

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/kmod/kmod.mk       | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 4a7afa2516..e16ee61053 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_KMOD),kmod) \
 	$(if $(BR2_PACKAGE_LESS),less) \
 	$(if $(BR2_PACKAGE_LSOF),lsof) \
 	$(if $(BR2_PACKAGE_MTD),mtd) \
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index e1149b7b65..7c796ab19f 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -49,9 +49,6 @@ ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y)
 KMOD_LICENSE := $(KMOD_LICENSE), GPL-2.0+ (tools)
 KMOD_LICENSE_FILES += COPYING
 
-# take precedence over busybox implementation
-KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-
 # /sbin is really /usr/sbin with merged /usr, so adjust relative symlink
 ifeq ($(BR2_ROOTFS_MERGED_USR),y)
 KMOD_BIN_PATH = ../bin/kmod
-- 
2.14.1

[Buildroot] [PATCH 29/50] package/busybox: invert dependency with iputils

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/iputils/iputils.mk | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index e16ee61053..3412bcb3d5 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_IPUTILS),iputils) \
 	$(if $(BR2_PACKAGE_KMOD),kmod) \
 	$(if $(BR2_PACKAGE_LESS),less) \
 	$(if $(BR2_PACKAGE_LSOF),lsof) \
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 13e33898d6..713b0e4abf 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -17,12 +17,6 @@ IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4-Clause
 # Only includes a license file for BSD
 IPUTILS_LICENSE_FILES = ninfod/COPYING
 
-# Build after busybox so target ends up with this package's full
-# versions of the applications instead of busybox applets.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-IPUTILS_DEPENDENCIES += busybox
-endif
-
 IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\
 	CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
 
-- 
2.14.1

[Buildroot] [PATCH 30/50] package/busybox: invert dependency with iproute2

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk   | 1 +
 package/iproute2/iproute2.mk | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 3412bcb3d5..50c71af284 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_IPROUTE2),iproute2) \
 	$(if $(BR2_PACKAGE_IPUTILS),iputils) \
 	$(if $(BR2_PACKAGE_KMOD),kmod) \
 	$(if $(BR2_PACKAGE_LESS),less) \
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 1f276ac7ed..48413401cd 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -12,12 +12,6 @@ IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
 IPROUTE2_LICENSE = GPL-2.0+
 IPROUTE2_LICENSE_FILES = COPYING
 
-# If both iproute2 and busybox are selected, make certain we win
-# the fight over who gets to have their utils actually installed.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-IPROUTE2_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_PACKAGE_ELFUTILS),y)
 IPROUTE2_DEPENDENCIES += elfutils
 endif
-- 
2.14.1

[Buildroot] [PATCH 31/50] package/busybox: invert dependency with ifupdown

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk   | 1 +
 package/ifupdown/ifupdown.mk | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 50c71af284..c6834f44a3 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \
 	$(if $(BR2_PACKAGE_IPROUTE2),iproute2) \
 	$(if $(BR2_PACKAGE_IPUTILS),iputils) \
 	$(if $(BR2_PACKAGE_KMOD),kmod) \
diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk
index dfc3f3cc11..84d24aedab 100644
--- a/package/ifupdown/ifupdown.mk
+++ b/package/ifupdown/ifupdown.mk
@@ -7,7 +7,6 @@
 IFUPDOWN_VERSION = 0.8.16
 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz
 IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown
-IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 IFUPDOWN_LICENSE = GPL-2.0+
 IFUPDOWN_LICENSE_FILES = COPYING
 
-- 
2.14.1

[Buildroot] [PATCH 32/50] package/busybox: invert dependency with ifplugd

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/ifplugd/ifplugd.mk | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index c6834f44a3..b4c6c8f0fa 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \
 	$(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \
 	$(if $(BR2_PACKAGE_IPROUTE2),iproute2) \
 	$(if $(BR2_PACKAGE_IPUTILS),iputils) \
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index b569320963..c7874b49e5 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -15,11 +15,6 @@ IFPLUGD_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec
 IFPLUGD_CONF_OPTS = --disable-lynx --with-initdir=/etc/init.d/
 IFPLUGD_DEPENDENCIES = libdaemon
 
-# Prefer big ifplugd
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-IFPLUGD_DEPENDENCIES += busybox
-endif
-
 define IFPLUGD_INSTALL_FIXUP
 	$(INSTALL) -D -m 0644 $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
 	$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
-- 
2.14.1

[Buildroot] [PATCH 33/50] package/busybox: invert dependency with ifenslave

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk     | 1 +
 package/ifenslave/ifenslave.mk | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index b4c6c8f0fa..afd215d78e 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \
 	$(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \
 	$(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \
 	$(if $(BR2_PACKAGE_IPROUTE2),iproute2) \
diff --git a/package/ifenslave/ifenslave.mk b/package/ifenslave/ifenslave.mk
index 4030d22e82..b51aa72051 100644
--- a/package/ifenslave/ifenslave.mk
+++ b/package/ifenslave/ifenslave.mk
@@ -9,7 +9,6 @@ IFENSLAVE_SOURCE = ifenslave_$(IFENSLAVE_VERSION).tar.xz
 IFENSLAVE_SITE = http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave
 IFENSLAVE_LICENSE = GPL-3.0+
 IFENSLAVE_LICENSE_FILES = debian/copyright
-IFENSLAVE_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 
 # shell script, so nothing to build
 
-- 
2.14.1

[Buildroot] [PATCH 34/50] package/busybox: invert dependency with i2c-tools

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk     | 1 +
 package/i2c-tools/i2c-tools.mk | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index afd215d78e..3c8c251015 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \
 	$(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \
 	$(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \
 	$(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index 9ddaa72786..db26647eb5 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -19,10 +19,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y)
 I2C_TOOLS_DEPENDENCIES += python3
 endif
 
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-I2C_TOOLS_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_STATIC_LIBS),y)
 I2C_TOOLS_MAKE_OPTS += BUILD_DYNAMIC_LIB=0 USE_STATIC_LIB=1
 endif
-- 
2.14.1

[Buildroot] [PATCH 35/50] package/busybox: invert dependency with gzip

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/gzip/gzip.mk       | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 3c8c251015..5d28d9ee46 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_GZIP),gzip) \
 	$(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \
 	$(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \
 	$(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index 26fc8ec347..d69215a850 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -9,8 +9,6 @@ GZIP_SOURCE = gzip-$(GZIP_VERSION).tar.xz
 GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 # Some other tools expect it to be in /bin
 GZIP_CONF_OPTS = --exec-prefix=/
-# Prefer full gzip over potentially lightweight/slower from busybox
-GZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 GZIP_LICENSE = GPL-3.0+
 GZIP_LICENSE_FILES = COPYING
 GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes
-- 
2.14.1

[Buildroot] [PATCH 36/50] package/busybox: invert dependency with grep

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/grep/grep.mk       | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 5d28d9ee46..de9498ab64 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_GREP),grep) \
 	$(if $(BR2_PACKAGE_GZIP),gzip) \
 	$(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \
 	$(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 6e44a189f0..730f36a344 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -25,9 +25,4 @@ else
 GREP_CONF_OPTS += --disable-perl-regexp
 endif
 
-# Full grep preferred over busybox grep
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-GREP_DEPENDENCIES += busybox
-endif
-
 $(eval $(autotools-package))
-- 
2.14.1

[Buildroot] [PATCH 37/50] package/busybox: invert dependency with gawk

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/gawk/gawk.mk       | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index de9498ab64..e793c57619 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_GAWK),gawk) \
 	$(if $(BR2_PACKAGE_GREP),grep) \
 	$(if $(BR2_PACKAGE_GZIP),gzip) \
 	$(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 0779736882..1315abb9ee 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -11,11 +11,6 @@ GAWK_DEPENDENCIES = host-gawk
 GAWK_LICENSE = GPL-3.0+
 GAWK_LICENSE_FILES = COPYING
 
-# Prefer full-blown gawk over busybox awk
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-GAWK_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_PACKAGE_LIBSIGSEGV),y)
 GAWK_DEPENDENCIES += libsigsegv
 endif
-- 
2.14.1

[Buildroot] [PATCH 38/50] package/busybox: invert dependency with fbset

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/fbset/fbset.mk     | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index e793c57619..d76e5f9230 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_FBSET),fbset) \
 	$(if $(BR2_PACKAGE_GAWK),gawk) \
 	$(if $(BR2_PACKAGE_GREP),grep) \
 	$(if $(BR2_PACKAGE_GZIP),gzip) \
diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index d6ee104a22..787b4e1dca 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -9,11 +9,6 @@ FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
 FBSET_DEPENDENCIES = host-bison host-flex
 FBSET_LICENSE = GPL-2.0
 
-# Make sure full fbset wins over busybox fbset
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-FBSET_DEPENDENCIES += busybox
-endif
-
 define FBSET_BUILD_CMDS
 	$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
 endef
-- 
2.14.1

[Buildroot] [PATCH 39/50] package/busybox: invert dependency with e2fsprogs

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk     |  1 +
 package/e2fsprogs/e2fsprogs.mk | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index d76e5f9230..4f7cb181c8 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \
 	$(if $(BR2_PACKAGE_FBSET),fbset) \
 	$(if $(BR2_PACKAGE_GAWK),gawk) \
 	$(if $(BR2_PACKAGE_GREP),grep) \
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 316546a8d7..efc10d0e99 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -17,12 +17,6 @@ E2FSPROGS_INSTALL_STAGING = YES
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
 HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
 
-# If both e2fsprogs and busybox are selected, make certain e2fsprogs
-# wins the fight over who gets to have their utils actually installed
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-E2FSPROGS_DEPENDENCIES += busybox
-endif
-
 # e4defrag doesn't build on older systems like RHEL5.x, and we don't
 # need it on the host anyway.
 # Disable fuse2fs as well to avoid carrying over deps, and it's unused
@@ -35,8 +29,8 @@ HOST_E2FSPROGS_CONF_OPTS = \
 	--enable-symlink-install \
 	--disable-testio-debug
 
-# Set the binary directories to "/bin" and "/sbin" to override programs
-# installed by busybox.
+# Set the binary directories to "/bin" and "/sbin", as busybox does,
+# so that we do not end up with two versions of e2fs tools.
 E2FSPROGS_CONF_OPTS = \
 	--bindir=/bin \
 	--sbindir=/sbin \
-- 
2.14.1

[Buildroot] [PATCH 40/50] package/busybox: invert dependency with dos2unix

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk   | 1 +
 package/dos2unix/dos2unix.mk | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 4f7cb181c8..f6aca9468d 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \
 	$(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \
 	$(if $(BR2_PACKAGE_FBSET),fbset) \
 	$(if $(BR2_PACKAGE_GAWK),gawk) \
diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
index 5001397f05..0522ad1671 100644
--- a/package/dos2unix/dos2unix.mk
+++ b/package/dos2unix/dos2unix.mk
@@ -8,9 +8,7 @@ DOS2UNIX_VERSION = 7.4.0
 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
 DOS2UNIX_LICENSE = BSD-2-Clause
 DOS2UNIX_LICENSE_FILES = COPYING.txt
-DOS2UNIX_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_BUSYBOX),busybox) \
-	$(TARGET_NLS_DEPENDENCIES)
+DOS2UNIX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
 DOS2UNIX_MAKE_OPTS += ENABLE_NLS=1
-- 
2.14.1

[Buildroot] [PATCH 41/50] package/busybox: invert dependency with diffutils

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk     | 1 +
 package/diffutils/diffutils.mk | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index f6aca9468d..4f48033a5d 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \
 	$(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \
 	$(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \
 	$(if $(BR2_PACKAGE_FBSET),fbset) \
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 79785d6f01..9a41c985df 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -17,8 +17,4 @@ ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
 DIFFUTILS_CONF_ENV += gl_cv_func_getopt_gnu=yes
 endif
 
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-DIFFUTILS_DEPENDENCIES += busybox
-endif
-
 $(eval $(autotools-package))
-- 
2.14.1

[Buildroot] [PATCH 42/50] package/busybox: invert dependency with debianutils

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk         | 1 +
 package/debianutils/debianutils.mk | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 4f48033a5d..4f507b4de1 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
 	$(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \
 	$(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \
 	$(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \
diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk
index 86f201da1c..189d983732 100644
--- a/package/debianutils/debianutils.mk
+++ b/package/debianutils/debianutils.mk
@@ -8,8 +8,6 @@ DEBIANUTILS_VERSION = 4.8.1
 DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz
 DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20161118T033019Z/pool/main/d/debianutils
 DEBIANUTILS_CONF_OPTS = --exec-prefix=/
-# Make sure we override the busybox tools, such as which
-DEBIANUTILS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 DEBIANUTILS_LICENSE = GPL-2.0+, SMAIL (savelog)
 DEBIANUTILS_LICENSE_FILES = debian/copyright
 
-- 
2.14.1

[Buildroot] [PATCH 43/50] package/busybox: invert dependency with dcron

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/dcron/dcron.mk     | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 4f507b4de1..32377ef7b9 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_DCRON),dcron) \
 	$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
 	$(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \
 	$(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \
diff --git a/package/dcron/dcron.mk b/package/dcron/dcron.mk
index 7e81b63803..2ee0709af5 100644
--- a/package/dcron/dcron.mk
+++ b/package/dcron/dcron.mk
@@ -9,11 +9,6 @@ DCRON_SITE = http://www.jimpryor.net/linux/releases
 # The source code does not specify the version of the GPL that is used.
 DCRON_LICENSE = GPL
 
-# Overwrite cron-related Busybox commands if available
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-DCRON_DEPENDENCIES = busybox
-endif
-
 define DCRON_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
 endef
-- 
2.14.1

[Buildroot] [PATCH 44/50] package/busybox: invert dependency with cpio

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 package/cpio/cpio.mk       | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 32377ef7b9..29134e658d 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_CPIO),cpio) \
 	$(if $(BR2_PACKAGE_DCRON),dcron) \
 	$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
 	$(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \
diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk
index 7e8549dbd8..9a09279572 100644
--- a/package/cpio/cpio.mk
+++ b/package/cpio/cpio.mk
@@ -7,7 +7,6 @@
 CPIO_VERSION = 2.12
 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio
 CPIO_CONF_OPTS = --bindir=/bin
-CPIO_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 CPIO_LICENSE = GPL-3.0+
 CPIO_LICENSE_FILES = COPYING
 
-- 
2.14.1

[Buildroot] [PATCH 45/50] package/busybox: invert dependency with coreutils

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk     | 1 +
 package/coreutils/coreutils.mk | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 29134e658d..0ba8d792fb 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_COREUTILS),coreutils) \
 	$(if $(BR2_PACKAGE_CPIO),cpio) \
 	$(if $(BR2_PACKAGE_DCRON),dcron) \
 	$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 4ef888829f..3cb96589f2 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -59,12 +59,6 @@ COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \
 	kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \
 	vdir sleep stty sync touch true uname join
 
-# If both coreutils and busybox are selected, make certain coreutils
-# wins the fight over who gets to have their utils actually installed.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-COREUTILS_DEPENDENCIES = busybox
-endif
-
 ifeq ($(BR2_PACKAGE_ACL),y)
 COREUTILS_DEPENDENCIES += acl
 else
-- 
2.14.1

[Buildroot] [PATCH 46/50] package/busybox: invert dependency with binutils

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/binutils/binutils.mk | 5 -----
 package/busybox/busybox.mk   | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index cb6022f7fa..090065a3e4 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -72,11 +72,6 @@ ifeq ($(BR2_ARM_CPU_ARMV7M)$(BR2_OPTIMIZE_S),yy)
 BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O2"
 endif
 
-# Install binutils after busybox to prefer full-blown utilities
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-BINUTILS_DEPENDENCIES += busybox
-endif
-
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 BINUTILS_DEPENDENCIES += zlib
 endif
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 0ba8d792fb..d0a49c7495 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_BINUTILS),binutils) \
 	$(if $(BR2_PACKAGE_COREUTILS),coreutils) \
 	$(if $(BR2_PACKAGE_CPIO),cpio) \
 	$(if $(BR2_PACKAGE_DCRON),dcron) \
-- 
2.14.1

[Buildroot] [PATCH 00/50] busybox: invert dependencies

[Yann E. MORIN]

Hello All!

Currently, the issue that busybox may install the same executables as
those from other packages, is handled in all those packages. This is
not very practical.

Furthermore, this means that those packages all overwrite the
busybox-installed applets, which means that this triggers the
no-two-packages-touch-the-same-file rule. So far, this is only a
warning, but when we eventually go with TLPB, we'll have to enforce
that rule.

But busybox can be told to be smart, and not replace existing files
during installation. This is in fact what we do with a hook, which uses
'sed' to force the 'noclobber' install. But now, Busybox upstream has
proper support for doing a noclobber install without artifice. So we
backport those required patches, and get rid of our existing hook.

All other commits are just trivial dependency exchange order between a
package and busybox, except for syslog-ng, for which we must take care
that busybox does not overwrite the init script.

Eventually, we also add a new dependency onto the 'attr' package, to
solve a potential conflict with the setfattr applet.

Inverting a single dependency could introduce a dependency loop, which
would be resolved by a latter inversion. For example, we could have that
initial situation:

    B ---> A ---> busybox
      \_________/

With the first inversion, we'd get to now have a dependency loop:

    B ---> A ---> busybox ---> B

Then with the second inversion, we'd resolve that loop:

                  busybox ---> B ---> A
                          \_________/

Detecting and avoiding those loops is not trivial, because they may
imply multiple intermediate packages between B and A. So, the series
does not attempt to prevent those loops, as they are entirely resolved
by the end of the series anyway.


Regards,
Yann E. MORIN.


The following changes since commit 9086de8e15d98abda64850c52b66756646e0c2f4

  qt5charts: fix license information (2018-07-02 23:02:42 +0200)


are available in the git repository at:

  git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to d5b2e0eebf27fe994337e2c966f8ecf63849f3e1

  support/scripts: don't draw most of busybox' dependencies (2018-07-02 23:07:03 +0200)


----------------------------------------------------------------
Yann E. MORIN (50):
      package/busybox: backport upstream patch to fix install-noclobber
      package/busybox: invert dependency with whois
      package/busybox: invert dependency with wget
      package/busybox: invert dependency with vim
      package/busybox: invert dependency with util-linux
      package/busybox: invert dependency with usbutils
      package/busybox: invert dependency with unzip
      package/busybox: invert dependency with traceroute
      package/busybox: invert dependency with tftpd
      package/busybox: invert dependency with tar
      package/busybox: invert dependency with sysvinit
      package/busybox: invert dependency with systemd
      package/busybox: invert dependency with syslog-ng
      package/busybox: invert dependency with sysklogd
      package/busybox: invert dependency with start-stop-daemon
      package/busybox: invert dependency with rsyslogd
      package/busybox: invert dependency with psmisc
      package/busybox: invert dependency with procps-ng
      package/busybox: invert dependency with pciutils
      package/busybox: invert dependency with ntp
      package/busybox: invert dependency with nnamp
      package/busybox: invert dependency with netcat-openbsd
      package/busybox: invert dependency with netcat
      package/busybox: invert dependency with net-tools
      package/busybox: invert dependency with mtd
      package/busybox: invert dependency with lsof
      package/busybox: invert dependency with less
      package/busybox: invert dependency with kmod
      package/busybox: invert dependency with iputils
      package/busybox: invert dependency with iproute2
      package/busybox: invert dependency with ifupdown
      package/busybox: invert dependency with ifplugd
      package/busybox: invert dependency with ifenslave
      package/busybox: invert dependency with i2c-tools
      package/busybox: invert dependency with gzip
      package/busybox: invert dependency with grep
      package/busybox: invert dependency with gawk
      package/busybox: invert dependency with fbset
      package/busybox: invert dependency with e2fsprogs
      package/busybox: invert dependency with dos2unix
      package/busybox: invert dependency with diffutils
      package/busybox: invert dependency with debianutils
      package/busybox: invert dependency with dcron
      package/busybox: invert dependency with cpio
      package/busybox: invert dependency with coreutils
      package/busybox: invert dependency with binutils
      package/busybox: invert dependency with bc
      package/busybox: invert dependency with bash
      package/busybox: add dependency on attr
      support/scripts: don't draw most of busybox' dependencies

 package/bash/bash.mk                               |  4 +-
 package/bc/bc.mk                                   |  5 --
 package/binutils/binutils.mk                       |  5 --
 ...tall-respect-noclobber-for-script-wrapper.patch | 62 +++++++++++++++++++++
 ...stall-accept-more-than-one-install-option.patch | 63 +++++++++++++++++++++
 ...m-add-rule-to-install-without-cloberring-.patch | 29 ++++++++++
 ...lets-install-don-t-try-to-install-nothing.patch | 65 ++++++++++++++++++++++
 package/busybox/busybox.mk                         | 64 ++++++++++++++++++---
 package/coreutils/coreutils.mk                     |  6 --
 package/cpio/cpio.mk                               |  1 -
 package/dcron/dcron.mk                             |  5 --
 package/debianutils/debianutils.mk                 |  2 -
 package/diffutils/diffutils.mk                     |  4 --
 package/dos2unix/dos2unix.mk                       |  4 +-
 package/e2fsprogs/e2fsprogs.mk                     | 10 +---
 package/fbset/fbset.mk                             |  5 --
 package/gawk/gawk.mk                               |  5 --
 package/grep/grep.mk                               |  5 --
 package/gzip/gzip.mk                               |  2 -
 package/i2c-tools/i2c-tools.mk                     |  4 --
 package/ifenslave/ifenslave.mk                     |  1 -
 package/ifplugd/ifplugd.mk                         |  5 --
 package/ifupdown/ifupdown.mk                       |  1 -
 package/iproute2/iproute2.mk                       |  6 --
 package/iputils/iputils.mk                         |  6 --
 package/kmod/kmod.mk                               |  3 -
 package/less/less.mk                               |  3 +-
 package/lsof/lsof.mk                               |  3 -
 package/mtd/mtd.mk                                 |  4 --
 package/net-tools/net-tools.mk                     |  8 +--
 package/netcat-openbsd/netcat-openbsd.mk           |  6 --
 package/netcat/netcat.mk                           | 13 -----
 package/nmap/nmap.mk                               |  6 --
 package/ntp/ntp.mk                                 |  2 +-
 package/pciutils/pciutils.mk                       |  5 --
 package/procps-ng/procps-ng.mk                     | 10 +---
 package/psmisc/psmisc.mk                           |  5 --
 package/rsyslog/rsyslog.mk                         |  5 --
 package/start-stop-daemon/start-stop-daemon.mk     |  3 +-
 package/sysklogd/sysklogd.mk                       |  5 --
 package/syslog-ng/syslog-ng.mk                     |  5 --
 package/systemd/systemd.mk                         |  6 --
 package/sysvinit/sysvinit.mk                       |  5 --
 package/tar/tar.mk                                 |  7 +--
 package/tftpd/tftpd.mk                             |  5 --
 package/traceroute/traceroute.mk                   |  5 --
 package/unzip/unzip.mk                             |  2 -
 package/usbutils/usbutils.mk                       |  5 --
 package/util-linux/util-linux.mk                   |  6 --
 package/vim/vim.mk                                 |  5 +-
 package/wget/wget.mk                               |  5 --
 package/whois/whois.mk                             |  3 +-
 support/scripts/graph-depends                      | 10 ++++
 53 files changed, 299 insertions(+), 220 deletions(-)
 create mode 100644 package/busybox/0003-applets-install-respect-noclobber-for-script-wrapper.patch
 create mode 100644 package/busybox/0004-applets-install-accept-more-than-one-install-option.patch
 create mode 100644 package/busybox/0005-build-system-add-rule-to-install-without-cloberring-.patch
 create mode 100644 package/busybox/0006-applets-install-don-t-try-to-install-nothing.patch

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 47/50] package/busybox: invert dependency with bc

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/bc/bc.mk           | 5 -----
 package/busybox/busybox.mk | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/bc/bc.mk b/package/bc/bc.mk
index a6446cef66..ee0e43848b 100644
--- a/package/bc/bc.mk
+++ b/package/bc/bc.mk
@@ -11,9 +11,4 @@ BC_DEPENDENCIES = host-flex
 BC_LICENSE = GPL-2.0+, LGPL-2.1+
 BC_LICENSE_FILES = COPYING COPYING.LIB
 
-# Build after busybox so target ends up with bc's "dc" version
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-BC_DEPENDENCIES += busybox
-endif
-
 $(eval $(autotools-package))
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index d0a49c7495..2ff6c94e85 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_BC),bc) \
 	$(if $(BR2_PACKAGE_BINUTILS),binutils) \
 	$(if $(BR2_PACKAGE_COREUTILS),coreutils) \
 	$(if $(BR2_PACKAGE_CPIO),cpio) \
-- 
2.14.1

[Buildroot] [PATCH 48/50] package/busybox: invert dependency with bash

[Yann E. MORIN]

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/bash/bash.mk       | 4 +---
 package/busybox/busybox.mk | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index bb52bf3259..7fb7192e2c 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -6,9 +6,7 @@
 
 BASH_VERSION = 4.4.18
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
-# Build after since bash is better than busybox shells
-BASH_DEPENDENCIES = ncurses readline host-bison \
-	$(if $(BR2_PACKAGE_BUSYBOX),busybox)
+BASH_DEPENDENCIES = ncurses readline host-bison
 BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc
 BASH_LICENSE = GPL-3.0+
 BASH_LICENSE_FILES = COPYING
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 2ff6c94e85..8ff84df715 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_BASH),bash) \
 	$(if $(BR2_PACKAGE_BC),bc) \
 	$(if $(BR2_PACKAGE_BINUTILS),binutils) \
 	$(if $(BR2_PACKAGE_COREUTILS),coreutils) \
-- 
2.14.1

[Buildroot] [PATCH 49/50] package/busybox: add dependency on attr

[Yann E. MORIN]

attr and busybox may each install setfattr, so attr must be installed
before busybox.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/busybox/busybox.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 8ff84df715..3f0b7ca2d0 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_ATTR),attr) \
 	$(if $(BR2_PACKAGE_BASH),bash) \
 	$(if $(BR2_PACKAGE_BC),bc) \
 	$(if $(BR2_PACKAGE_BINUTILS),binutils) \
-- 
2.14.1

[Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox' dependencies

[Yann E. MORIN]

Since most dependencies of busybox' are there to guarantee that busybox'
does not install applets that are already provided by other packages,
they are not really functional dependencies, and mostly clutter the
dependency graph.

Only the dependencies on libraries are interested, so that is all we
keep.

Even though that function is only called with pkg set to 'busybox', we
still pass it as an argument, for symetry with the other functions that
removes the dependencies of a package.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 support/scripts/graph-depends | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 621e603278..909a3d4812 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -181,6 +181,14 @@ def remove_mandatory_deps(pkg, deps):
     return [p for p in deps[pkg] if p not in ['toolchain', 'skeleton']]
 
 
+# This function removes all dependencies of busybox, except its
+# dependencies on libraries (of which linux-pam) and host-pkgconf.
+def remove_busybox_deps(pkg, deps):
+    busybox_dep_whitelist = ['linux-pam', 'host-pkgconf']
+    return [p for p in deps[pkg]
+            if p.startswith('lib') or p in busybox_dep_whitelist]
+
+
 # This function will check that there is no loop in the dependency chain
 # As a side effect, it builds up the dependency cache.
 def check_circular_deps(deps):
@@ -211,6 +219,8 @@ def check_circular_deps(deps):
 # This functions trims down the dependency list of all packages.
 # It applies in sequence all the dependency-elimination methods.
 def remove_extra_deps(deps, transitive):
+    if 'busybox' in list(deps.keys()):
+        deps['busybox'] = remove_busybox_deps('busybox', deps)
     for pkg in list(deps.keys()):
         if not pkg == 'all':
             deps[pkg] = remove_mandatory_deps(pkg, deps)
-- 
2.14.1

[Buildroot] [PATCH 01/50] package/busybox: backport upstream patch to fix install-noclobber

[Matthew Weber]

Yann,

On Mon, Jul 2, 2018 at 4:11 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Currently, we shoehorn the noclobber option with a sed call, but
> upstream has applied a set of 4 patches that adds support to do
> an install without clobbering.
>
> Backport those patches, and use the new install rule.
>
> Note that the 3rd and 6th patches do not seem like they would be usefull
> to backport, but a user may well have a custom config that enables shell
> wrappers, or installs no wrapper (to install then at runtime), so it
> still makes sense to backport them (especially since the 3rd was part of
> the noclobber series upstream, and the 6th, a fix of it).
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

[Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox' dependencies

[Matthew Weber]

Yann,

On Mon, Jul 2, 2018 at 4:12 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Since most dependencies of busybox' are there to guarantee that busybox'
> does not install applets that are already provided by other packages,
> they are not really functional dependencies, and mostly clutter the
> dependency graph.
>
> Only the dependencies on libraries are interested, so that is all we
> keep.
>
> Even though that function is only called with pkg set to 'busybox', we
> still pass it as an argument, for symetry with the other functions that
> removes the dependencies of a package.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

[Buildroot] [PATCH 01/50] package/busybox: backport upstream patch to fix install-noclobber

[Baruch Siach]

Hi Yann,

On Mon, Jul 02, 2018 at 11:11:35PM +0200, Yann E. MORIN wrote:
> Currently, we shoehorn the noclobber option with a sed call, but
> upstream has applied a set of 4 patches that adds support to do
> an install without clobbering.
> 
> Backport those patches, and use the new install rule.

Busybox 1.29.0 is out now. You can bump instead of backport.

baruch

> Note that the 3rd and 6th patches do not seem like they would be usefull
> to backport, but a user may well have a custom config that enables shell
> wrappers, or installs no wrapper (to install then at runtime), so it
> still makes sense to backport them (especially since the 3rd was part of
> the noclobber series upstream, and the 6th, a fix of it).
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [PATCH 10/50] package/busybox: invert dependency with tar

[Baruch Siach]

Hi Yann,

On Mon, Jul 02, 2018 at 11:11:44PM +0200, Yann E. MORIN wrote:
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
>  package/busybox/busybox.mk | 1 +
>  package/tar/tar.mk         | 7 +------
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 4f43fe1e78..76a195d1f5 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
>  
>  # Packages that provide commands that may also be busybox applets:
>  BUSYBOX_DEPENDENCIES = \
> +	$(if $(BR2_PACKAGE_TAR),tar) \
>  	$(if $(BR2_PACKAGE_TFTPD),tftpd) \
>  	$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
>  	$(if $(BR2_PACKAGE_UNZIP),unzip) \
> diff --git a/package/tar/tar.mk b/package/tar/tar.mk
> index 9942e77737..5e15ca7dfd 100644
> --- a/package/tar/tar.mk
> +++ b/package/tar/tar.mk
> @@ -8,16 +8,11 @@ TAR_VERSION = 1.29
>  TAR_SOURCE = tar-$(TAR_VERSION).tar.xz
>  TAR_SITE = $(BR2_GNU_MIRROR)/tar
>  # busybox installs in /bin, so we need tar to install as well in /bin
> -# so that it overrides the Busybox symlinks.
> +# so that it we don't end up with two different tar

Redundant 'it'.

baruch

>  TAR_CONF_OPTS = --exec-prefix=/
>  TAR_LICENSE = GPL-3.0+
>  TAR_LICENSE_FILES = COPYING
>  
> -# Prefer full-blown tar over buybox's version
> -ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> -TAR_DEPENDENCIES += busybox
> -endif
> -
>  ifeq ($(BR2_PACKAGE_ACL),y)
>  TAR_DEPENDENCIES += acl
>  TAR_CONF_OPTS += --with-posix-acls

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [PATCH 24/50] package/busybox: invert dependency with net-tools

[Baruch Siach]

Hi Yann,

On Mon, Jul 02, 2018 at 11:11:58PM +0200, Yann E. MORIN wrote:
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
>  package/busybox/busybox.mk     | 1 +
>  package/net-tools/net-tools.mk | 8 ++------
>  2 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 8523271ceb..792a74cfd8 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
>  
>  # Packages that provide commands that may also be busybox applets:
>  BUSYBOX_DEPENDENCIES = \
> +	$(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \
>  	$(if $(BR2_PACKAGE_NETCAT),netcat) \
>  	$(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \
>  	$(if $(BR2_PACKAGE_NMAP),nmap) \
> diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk
> index adab475b35..fc2546fa6b 100644
> --- a/package/net-tools/net-tools.mk
> +++ b/package/net-tools/net-tools.mk
> @@ -10,11 +10,6 @@ NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
>  NET_TOOLS_LICENSE = GPL-2.0+
>  NET_TOOLS_LICENSE_FILES = COPYING
>  
> -# Install after busybox for the full-blown versions
> -ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> -NET_TOOLS_DEPENDENCIES += busybox
> -endif
> -
>  define NET_TOOLS_CONFIGURE_CMDS
>  	(cd $(@D); yes "" | ./configure.sh config.in )
>  endef
> @@ -40,7 +35,8 @@ define NET_TOOLS_BUILD_CMDS
>  endef
>  
>  # install renames conflicting binaries, update does not
> -# ifconfig & route reside in /sbin for busybox
> +# ifconfig & route reside in /sbin for busybox, so ennsure we don't end

s/ennsure/ensure/

> +# up with two versions of those.
>  define NET_TOOLS_INSTALL_TARGET_CMDS
>  	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) update
>  	mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [PATCH 05/50] package/busybox: invert dependency with util-linux

[Carlos Santos]

> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998@free.fr>
> Sent: Monday, July 2, 2018 6:11:39 PM
> Subject: [Buildroot] [PATCH 05/50] package/busybox: invert dependency with util-linux

> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> package/busybox/busybox.mk       | 1 +
> package/util-linux/util-linux.mk | 6 ------
> 2 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index eb3c848bac..5d212e66e4 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
> 
> # Packages that provide commands that may also be busybox applets:
> BUSYBOX_DEPENDENCIES = \
> +	$(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \
> 	$(if $(BR2_PACKAGE_VIM),vim) \
> 	$(if $(BR2_PACKAGE_WGET),wget) \
> 	$(if $(BR2_PACKAGE_WHOIS),whois)
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> index 80a8a08051..76f4b97f5f 100644
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -31,12 +31,6 @@ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
> # We also don't want the host-python dependency
> HOST_UTIL_LINUX_CONF_OPTS = --without-python
> 
> -# If both util-linux and busybox are selected, make certain util-linux
> -# wins the fight over who gets to have their utils actually installed
> -ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> -UTIL_LINUX_DEPENDENCIES += busybox
> -endif
> -
> # Prevent the installation from attempting to move shared libraries from
> # ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are
> # the same when merged usr is in use.
> --
> 2.14.1

Reviewed-by: Carlos Santos <casantos@datacom.com.br>

-- 
Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer

[Buildroot] [PATCH 11/50] package/busybox: invert dependency with sysvinit

[Carlos Santos]

> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998@free.fr>
> Sent: Monday, July 2, 2018 6:11:45 PM
> Subject: [Buildroot] [PATCH 11/50] package/busybox: invert dependency with sysvinit

> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> package/busybox/busybox.mk   | 1 +
> package/sysvinit/sysvinit.mk | 5 -----
> 2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 76a195d1f5..2e80c5fa14 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
> 
> # Packages that provide commands that may also be busybox applets:
> BUSYBOX_DEPENDENCIES = \
> +	$(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \
> 	$(if $(BR2_PACKAGE_TAR),tar) \
> 	$(if $(BR2_PACKAGE_TFTPD),tftpd) \
> 	$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
> diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
> index a606ddabf0..993e399e73 100644
> --- a/package/sysvinit/sysvinit.mk
> +++ b/package/sysvinit/sysvinit.mk
> @@ -13,11 +13,6 @@ SYSVINIT_LICENSE_FILES = COPYING
> 
> SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR)
> 
> -# Override BusyBox implementations if BusyBox is enabled.
> -ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> -SYSVINIT_DEPENDENCIES = busybox
> -endif
> -
> ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
> SYSVINIT_DEPENDENCIES += libselinux
> SYSVINIT_MAKE_OPTS += WITH_SELINUX="yes"
> --
> 2.14.1

Reviewed-by: Carlos Santos <casantos@datacom.com.br>

-- 
Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer

[Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox' dependencies

[Carlos Santos]

> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998@free.fr>
> Sent: Monday, July 2, 2018 6:12:24 PM
> Subject: [Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox' dependencies

> Since most dependencies of busybox' are there to guarantee that busybox'
> does not install applets that are already provided by other packages,
> they are not really functional dependencies, and mostly clutter the
> dependency graph.
> 
> Only the dependencies on libraries are interested, so that is all we
> keep.
> 
> Even though that function is only called with pkg set to 'busybox', we
> still pass it as an argument, for symetry with the other functions that
> removes the dependencies of a package.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> support/scripts/graph-depends | 10 ++++++++++
> 1 file changed, 10 insertions(+)
> 
> diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
> index 621e603278..909a3d4812 100755
> --- a/support/scripts/graph-depends
> +++ b/support/scripts/graph-depends
> @@ -181,6 +181,14 @@ def remove_mandatory_deps(pkg, deps):
>     return [p for p in deps[pkg] if p not in ['toolchain', 'skeleton']]
> 
> 
> +# This function removes all dependencies of busybox, except its
> +# dependencies on libraries (of which linux-pam) and host-pkgconf.
                                ^^^^^^^^^^^^^^^^^^
                                   missing text?
[...]

-- 
Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer

[Buildroot] [PATCH 21/50] package/busybox: invert dependency with nnamp

[Carlos Santos]

> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998@free.fr>
> Sent: Monday, July 2, 2018 6:11:55 PM
> Subject: [Buildroot] [PATCH 21/50] package/busybox: invert dependency with nnamp

nnamp -> nmap

> We only need that dependency whan nmap's ncat is enabled.
> 
> For consistency, we add a dependency on nmap, not a suboption of it,
> to have a dependency list in busybox that is only about packages, and
> directly associates the upper-case package variable to the lower-case
> package name, e.g. NMAP <-> nmap.
> 
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> package/busybox/busybox.mk | 1 +
> package/nmap/nmap.mk       | 6 ------
> 2 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 7f08d857f8..4039d1c9ad 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
> 
> # Packages that provide commands that may also be busybox applets:
> BUSYBOX_DEPENDENCIES = \
> +	$(if $(BR2_PACKAGE_NMAP),nmap) \
> 	$(if $(BR2_PACKAGE_NTP),ntp) \
> 	$(if $(BR2_PACKAGE_PCIUTILS),pciutils) \
> 	$(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \
> diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
> index 1c89b5424e..420aec82d7 100644
> --- a/package/nmap/nmap.mk
> +++ b/package/nmap/nmap.mk
> @@ -76,12 +76,6 @@ else
> NMAP_CONF_OPTS += --without-nping
> endif
> 
> -# If we are going to install ncat, ensure Busybox gets built/installed
> -# before, so that this package overrides Busybox nc.
> -ifeq ($(BR2_PACKAGE_NMAP_NCAT)$(BR2_PACKAGE_BUSYBOX),yy)
> -NMAP_DEPENDENCIES += busybox
> -endif
> -
> # Add a symlink to "nc" if none of the competing netcats is selected
> ifeq
> ($(BR2_PACKAGE_NMAP_NCAT):$(BR2_PACKAGE_NETCAT)$(BR2_PACKAGE_NETCAT_OPENBSD),y:)
> define NMAP_INSTALL_NCAT_SYMLINK
> --
> 2.14.1

Reviewed-by: Carlos Santos <casantos@datacom.com.br>

-- 
Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer

[Buildroot] [PATCH 15/50] package/busybox: invert dependency with start-stop-daemon

[Carlos Santos]

> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998@free.fr>
> Sent: Monday, July 2, 2018 6:11:49 PM
> Subject: [Buildroot] [PATCH 15/50] package/busybox: invert dependency with start-stop-daemon

> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> package/busybox/busybox.mk                     | 1 +
> package/start-stop-daemon/start-stop-daemon.mk | 3 +--
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 74629eb698..7686667884 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
> 
> # Packages that provide commands that may also be busybox applets:
> BUSYBOX_DEPENDENCIES = \
> +	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
> 	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
> 	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
> 	$(if $(BR2_PACKAGE_SYSTEMD),systemd) \
> diff --git a/package/start-stop-daemon/start-stop-daemon.mk
> b/package/start-stop-daemon/start-stop-daemon.mk
> index 7071f5617e..01a6719762 100644
> --- a/package/start-stop-daemon/start-stop-daemon.mk
> +++ b/package/start-stop-daemon/start-stop-daemon.mk
> @@ -19,8 +19,7 @@ START_STOP_DAEMON_CONF_ENV = \
> 	dpkg_cv_va_copy=yes \
> 	dpkg_cv_c99_snprintf=yes \
> 	DPKG_DEVEL_MODE=1
> -START_STOP_DAEMON_DEPENDENCIES = host-pkgconf \
> -	$(if $(BR2_PACKAGE_BUSYBOX),busybox)
> +START_STOP_DAEMON_DEPENDENCIES = host-pkgconf
> # Patching m4/dpkg-arch.m4
> START_STOP_DAEMON_AUTORECONF = YES
> START_STOP_DAEMON_LICENSE = GPL-2.0+
> --
> 2.14.1

Reviewed-by: Carlos Santos <casantos@datacom.com.br>

-- 
Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer

[Buildroot] [PATCH 01/50] package/busybox: backport upstream patch to fix install-noclobber

[Yann E. MORIN]

Baruch, All,

On 2018-07-03 08:25 +0300, Baruch Siach spake thusly:
> On Mon, Jul 02, 2018 at 11:11:35PM +0200, Yann E. MORIN wrote:
> > Currently, we shoehorn the noclobber option with a sed call, but
> > upstream has applied a set of 4 patches that adds support to do
> > an install without clobbering.
> > 
> > Backport those patches, and use the new install rule.
> 
> Busybox 1.29.0 is out now. You can bump instead of backport.

OK, so it has been ~3 months I have been sitting ion this series waiting
for upstream to cut out a release. Seeing they were not, I decided to
refresh the series and send it.

And now, they reelases a new version right before I sent the series.
Dang... Muahaha! :-)

Thanks for the review, I'll update the series starting with a bump.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox' dependencies

[Yann E. MORIN]

Carlos, All,

On 2018-07-03 08:20 -0300, Carlos Santos spake thusly:
> > From: "Yann Morin" <yann.morin.1998@free.fr>
> > To: "buildroot" <buildroot@buildroot.org>
> > Cc: "Yann Morin" <yann.morin.1998@free.fr>
> > Sent: Monday, July 2, 2018 6:12:24 PM
> > Subject: [Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox' dependencies
> 
> > Since most dependencies of busybox' are there to guarantee that busybox'
> > does not install applets that are already provided by other packages,
> > they are not really functional dependencies, and mostly clutter the
> > dependency graph.
> > 
> > Only the dependencies on libraries are interested, so that is all we
> > keep.
> > 
> > Even though that function is only called with pkg set to 'busybox', we
> > still pass it as an argument, for symetry with the other functions that
> > removes the dependencies of a package.
> > 
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > ---
> > support/scripts/graph-depends | 10 ++++++++++
> > 1 file changed, 10 insertions(+)
> > 
> > diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
> > index 621e603278..909a3d4812 100755
> > --- a/support/scripts/graph-depends
> > +++ b/support/scripts/graph-depends
> > @@ -181,6 +181,14 @@ def remove_mandatory_deps(pkg, deps):
> >     return [p for p in deps[pkg] if p not in ['toolchain', 'skeleton']]
> > 
> > 
> > +# This function removes all dependencies of busybox, except its
> > +# dependencies on libraries (of which linux-pam) and host-pkgconf.
>                                 ^^^^^^^^^^^^^^^^^^
>                                    missing text?

No: linux-pam is a library too, But it belongs to the "libraries" ensemble, so I
really meant to write what I wrote. :-)

It only gets a special mention because it does not start with 'lib'.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox' dependencies

[Carlos Santos]

> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "DATACOM" <casantos@datacom.com.br>
> Cc: "buildroot" <buildroot@buildroot.org>
> Sent: Tuesday, July 3, 2018 8:41:57 AM
> Subject: Re: [Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox' dependencies

> Carlos, All,
> 
> On 2018-07-03 08:20 -0300, Carlos Santos spake thusly:
>> > From: "Yann Morin" <yann.morin.1998@free.fr>
>> > To: "buildroot" <buildroot@buildroot.org>
>> > Cc: "Yann Morin" <yann.morin.1998@free.fr>
>> > Sent: Monday, July 2, 2018 6:12:24 PM
>> > Subject: [Buildroot] [PATCH 50/50] support/scripts: don't draw most of busybox'
>> > dependencies
>> 
>> > Since most dependencies of busybox' are there to guarantee that busybox'
>> > does not install applets that are already provided by other packages,
>> > they are not really functional dependencies, and mostly clutter the
>> > dependency graph.
>> > 
>> > Only the dependencies on libraries are interested, so that is all we
>> > keep.
>> > 
>> > Even though that function is only called with pkg set to 'busybox', we
>> > still pass it as an argument, for symetry with the other functions that
>> > removes the dependencies of a package.
>> > 
>> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> > ---
>> > support/scripts/graph-depends | 10 ++++++++++
>> > 1 file changed, 10 insertions(+)
>> > 
>> > diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
>> > index 621e603278..909a3d4812 100755
>> > --- a/support/scripts/graph-depends
>> > +++ b/support/scripts/graph-depends
>> > @@ -181,6 +181,14 @@ def remove_mandatory_deps(pkg, deps):
>> >     return [p for p in deps[pkg] if p not in ['toolchain', 'skeleton']]
>> > 
>> > 
>> > +# This function removes all dependencies of busybox, except its
>> > +# dependencies on libraries (of which linux-pam) and host-pkgconf.
>>                                 ^^^^^^^^^^^^^^^^^^
>>                                    missing text?
> 
> No: linux-pam is a library too, But it belongs to the "libraries" ensemble, so I
> really meant to write what I wrote. :-)
> 
> It only gets a special mention because it does not start with 'lib'.

Ok, but the text looks a bit strange to me. What about something like
"dependencies on libraries (e.g. libpam, from linux-pam) ..."?

-- 
Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer

[Buildroot] [PATCH 00/50] busybox: invert dependencies

[Arnout Vandecappelle]

On 07/02/18 23:12, Yann E. MORIN wrote:
> Hello All!
> 
> Currently, the issue that busybox may install the same executables as
> those from other packages, is handled in all those packages. This is
> not very practical.

 The reverse is also not very practical...

> Furthermore, this means that those packages all overwrite the
> busybox-installed applets, which means that this triggers the
> no-two-packages-touch-the-same-file rule. So far, this is only a
> warning, but when we eventually go with TLPB, we'll have to enforce
> that rule.

 Although we've already discussed this a couple of times in BR meetings, we
never found a solution that is really satisfactory.

 However, I have a new idea now...

 IIUC, with PPS, there is no real problem with two packages touching the same
file, as long as the dependency is explicitly tracked in Buildroot, right?
Because when it is explicitly tracked, the file created by package A will always
be present in package B's PPS when package B is built, so it's perfectly
reproducible.

 For the case of two packages *writing* the same file (without looking at the
previous contents, i.e. not appending or anything like that), the constraint is
even lighter: there doesn't really need to be an explicit dependency, we just
have to make sure that when the rsync is done, the order is predictable. That's
just a matter of sorting. But also, we want it not just to be predictable, but
also in the "correct" order, e.g. if busybox is a dependency, it should be
rsync'd before another package that creates the same executable. The rsync will
then overwrite it (because the rsyncs are not done in parallel).

 For that particular ordering, I think there could be a simpler solution than
enumerating all those dependencies in busybox.mk. We could give each package a
priority, and use that priority to order the rsync's. The default priority would
be e.g. 5, and busybox would get e.g. 3. That way, we only need BUSYBOX_PRIORITY
= 3 in busybox.mk, and everything is solved.

 Obviously, it would make the infra more complicated :-)

 We would then also need to change the "two packages touching same file" check
to be error out only if they have the same priority.

 For the other packages that install the same file (e.g ntp <> openntpd, the
different nmaps, ...), we can then use the same simple resolution rather than
explicitly encoding the dependency. We would still need to choose the priority
(which is a bit arbitrary), we would still need to detect the conflict, and we
would still need to verify that this conflict really is of the "overwrite" type
and not the "append" type. So it's not a silver bullet, but it might make
maintenance a little bit simpler.

 What do you think?

 Regards,
 Arnout



-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 00/50] busybox: invert dependencies

[Yann E. MORIN]

Arnout, all,

On 2018-07-04 00:56 +0200, Arnout Vandecappelle spake thusly:
> On 07/02/18 23:12, Yann E. MORIN wrote:
> > Hello All!
> > 
> > Currently, the issue that busybox may install the same executables as
> > those from other packages, is handled in all those packages. This is
> > not very practical.
> 
>  The reverse is also not very practical...

The reverse means that the dependencies are sprinkled in all those
packages, while now they are all nicely gathered in a single location.
At least, I believe this is a maintenance improvment; not an enormous
gain, but still.

> > Furthermore, this means that those packages all overwrite the
> > busybox-installed applets, which means that this triggers the
> > no-two-packages-touch-the-same-file rule. So far, this is only a
> > warning, but when we eventually go with TLPB, we'll have to enforce
> > that rule.
> 
>  Although we've already discussed this a couple of times in BR meetings, we
> never found a solution that is really satisfactory.

I'm not sure what you mean by "satisfactory". If speakign about busybox,
I think this solution is technically better than the alternative,
current situation, at least becasue we know that busybox will enforce a
noclobber install (heck, this was already the case with our hook), while
we can not easily audit all packages to be sure they properly install
their executalbes.

For example, the attr package we current have will forcibly overwrite
any destination file without unlinking it, thus effectively replacing
/usr/bin/setfattr withits own code, and if that fiel happens to be a
hardlink or a symlink to busybox, we lose busybox. See
    https://bugs.busybox.net/show_bug.cgi?id=10986

So, I think it is better to rely on a single package we know behaves
correctly.

>  However, I have a new idea now...
> 
>  IIUC, with PPS, there is no real problem with two packages touching the same
> file, as long as the dependency is explicitly tracked in Buildroot, right?
> Because when it is explicitly tracked, the file created by package A will always
> be present in package B's PPS when package B is built, so it's perfectly
> reproducible.

Yes.

>  For the case of two packages *writing* the same file (without looking at the
> previous contents, i.e. not appending or anything like that), the constraint is
> even lighter: there doesn't really need to be an explicit dependency, we just
> have to make sure that when the rsync is done, the order is predictable. That's
> just a matter of sorting. But also, we want it not just to be predictable, but
> also in the "correct" order, e.g. if busybox is a dependency, it should be
> rsync'd before another package that creates the same executable. The rsync will
> then overwrite it (because the rsyncs are not done in parallel).

Should be, yes.

>  For that particular ordering, I think there could be a simpler solution than
> enumerating all those dependencies in busybox.mk. We could give each package a
> priority, and use that priority to order the rsync's. The default priority would
> be e.g. 5, and busybox would get e.g. 3. That way, we only need BUSYBOX_PRIORITY
> = 3 in busybox.mk, and everything is solved.

Please, no, do not introduce a notion of 'priority'. That is ugly, and
it does not work in the long term, because it is hard to maintain. One
pain point of priorities is detecting how a change in A's priority will
play against the priorities of all other A-related packages, especially
since there will no longer be a mean to find those relations (as the
FOO_DEPENDENCIES would get dropped in all A-related packages).

If I go even further, we have ntp and openntp and busybox that can
provide an ntp implementation, so we'd have to have non-conflicting
priorities for all those three.  And then (just an example) what about
apache, lighttpd, nginx, and busybox, which may all install an httpd
executable?

So we'd have to also find a priority for that set, and now that new
priority for busybox may come conflicting with the priority we found for
the ntp implementations...

Then factor in all other busybox-related packages that will in turn need
a priority.

So, this is a pain...

So, priorities are just re-inventing a kind of dependencies, except it
is not a build dependency, but an install dependency... Let's call a cat
a cat. We may introduce a FOO_INSTALL_DEPENDENCIES variable, where foo
would list the packages that must be installed before it, but which may
be built in any order witho itself.

But this is still an explicit list, and this does not get us much
further than what we already have...

>  Obviously, it would make the infra more complicated :-)

Yes, and the gain is so minimal, without even considering the risk of
incorrectness, that I don't believe this is a good idea...

>  We would then also need to change the "two packages touching same file" check
> to be error out only if they have the same priority.
> 
>  For the other packages that install the same file (e.g ntp <> openntpd, the
> different nmaps, ...), we can then use the same simple resolution rather than
> explicitly encoding the dependency. We would still need to choose the priority
> (which is a bit arbitrary), we would still need to detect the conflict, and we
> would still need to verify that this conflict really is of the "overwrite" type
> and not the "append" type. So it's not a silver bullet, but it might make
> maintenance a little bit simpler.
> 
>  What do you think?

Besides the arguments I explained above, I'm afraid my gut-feeling is
really bad about that... :-/

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 00/50] busybox: invert dependencies

[Arnout Vandecappelle]

On 04-07-18 18:39, Yann E. MORIN wrote:
> Arnout, all,
> 
> On 2018-07-04 00:56 +0200, Arnout Vandecappelle spake thusly:
>> On 07/02/18 23:12, Yann E. MORIN wrote:
>>> Hello All!
>>>
>>> Currently, the issue that busybox may install the same executables as
>>> those from other packages, is handled in all those packages. This is
>>> not very practical.
>>
>>  The reverse is also not very practical...
> 
> The reverse means that the dependencies are sprinkled in all those
> packages, while now they are all nicely gathered in a single location.
> At least, I believe this is a maintenance improvment; not an enormous
> gain, but still.

 It certainly is!


>>> Furthermore, this means that those packages all overwrite the
>>> busybox-installed applets, which means that this triggers the
>>> no-two-packages-touch-the-same-file rule. So far, this is only a
>>> warning, but when we eventually go with TLPB, we'll have to enforce
>>> that rule.
>>
>>  Although we've already discussed this a couple of times in BR meetings, we
>> never found a solution that is really satisfactory.
> 
> I'm not sure what you mean by "satisfactory". If speakign about busybox,
> I think this solution is technically better than the alternative,
> current situation, at least becasue we know that busybox will enforce a
> noclobber install (heck, this was already the case with our hook), while
> we can not easily audit all packages to be sure they properly install
> their executalbes.

 Well, normally the proper way to install is to overwrite what was previously there.

 So the solution is not entirely satisfactory because it only really applies to
busybox. Which means that for other packages, we either have to perform manual
install commands to prevent overwriting, or we have to revert the dependency
(i.e., for busybox, the first package wins, while for other packages, the last
package wins...).

 Also note that in the latter case, we should allow two packages to touch the
same file, at least as long as there is a dependency between them. Indeed, if
there is a dependency, then the build result is reproducible, so there is no
need to disallow it. Checking for that will get hairy though...


> For example, the attr package we current have will forcibly overwrite
> any destination file without unlinking it, thus effectively replacing
> /usr/bin/setfattr withits own code, and if that fiel happens to be a
> hardlink or a symlink to busybox, we lose busybox. See
>     https://bugs.busybox.net/show_bug.cgi?id=10986

 *That* is really a bug in the attr package. If it would use install, like the
rest of the world does, it wouldn't have this problem.


> So, I think it is better to rely on a single package we know behaves
> correctly.
> 
>>  However, I have a new idea now...
>>
>>  IIUC, with PPS, there is no real problem with two packages touching the same
>> file, as long as the dependency is explicitly tracked in Buildroot, right?
>> Because when it is explicitly tracked, the file created by package A will always
>> be present in package B's PPS when package B is built, so it's perfectly
>> reproducible.

 Huh weird, I thought this was a new idea I had tonight, but apparently I
already thought of it yesterday :-)

> 
> Yes.
> 
>>  For the case of two packages *writing* the same file (without looking at the
>> previous contents, i.e. not appending or anything like that), the constraint is
>> even lighter: there doesn't really need to be an explicit dependency, we just
>> have to make sure that when the rsync is done, the order is predictable. That's
>> just a matter of sorting. But also, we want it not just to be predictable, but
>> also in the "correct" order, e.g. if busybox is a dependency, it should be
>> rsync'd before another package that creates the same executable. The rsync will
>> then overwrite it (because the rsyncs are not done in parallel).
> 
> Should be, yes.
> 
>>  For that particular ordering, I think there could be a simpler solution than
>> enumerating all those dependencies in busybox.mk. We could give each package a
>> priority, and use that priority to order the rsync's. The default priority would
>> be e.g. 5, and busybox would get e.g. 3. That way, we only need BUSYBOX_PRIORITY
>> = 3 in busybox.mk, and everything is solved.
> 
> Please, no, do not introduce a notion of 'priority'. That is ugly, and
> it does not work in the long term, because it is hard to maintain. One
> pain point of priorities is detecting how a change in A's priority will
> play against the priorities of all other A-related packages, especially
> since there will no longer be a mean to find those relations (as the
> FOO_DEPENDENCIES would get dropped in all A-related packages).

 Hm, good point.


> If I go even further, we have ntp and openntp and busybox that can
> provide an ntp implementation, so we'd have to have non-conflicting
> priorities for all those three.  And then (just an example) what about
> apache, lighttpd, nginx, and busybox, which may all install an httpd
> executable?
> 
> So we'd have to also find a priority for that set, and now that new
> priority for busybox may come conflicting with the priority we found for
> the ntp implementations...
> 
> Then factor in all other busybox-related packages that will in turn need
> a priority.
> 
> So, this is a pain...
> 
> So, priorities are just re-inventing a kind of dependencies, except it
> is not a build dependency, but an install dependency... Let's call a cat
> a cat. We may introduce a FOO_INSTALL_DEPENDENCIES variable, where foo
> would list the packages that must be installed before it, but which may
> be built in any order witho itself.
> 
> But this is still an explicit list, and this does not get us much
> further than what we already have...
> 
>>  Obviously, it would make the infra more complicated :-)
> 
> Yes, and the gain is so minimal, without even considering the risk of
> incorrectness, that I don't believe this is a good idea...

 OK. Just thought I'd shoot the idea.

 Regards,
 Arnout

> 
>>  We would then also need to change the "two packages touching same file" check
>> to be error out only if they have the same priority.
>>
>>  For the other packages that install the same file (e.g ntp <> openntpd, the
>> different nmaps, ...), we can then use the same simple resolution rather than
>> explicitly encoding the dependency. We would still need to choose the priority
>> (which is a bit arbitrary), we would still need to detect the conflict, and we
>> would still need to verify that this conflict really is of the "overwrite" type
>> and not the "append" type. So it's not a silver bullet, but it might make
>> maintenance a little bit simpler.
>>
>>  What do you think?
> 
> Besides the arguments I explained above, I'm afraid my gut-feeling is
> really bad about that... :-/
> 
> Regards,
> Yann E. MORIN.
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 16/50] package/busybox: invert dependency with rsyslogd

[Carlos Santos]

> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998@free.fr>
> Sent: Monday, July 2, 2018 6:11:50 PM
> Subject: [Buildroot] [PATCH 16/50] package/busybox: invert dependency with rsyslogd

Should be "rsyslog", not "rsyslogd", in the commit title.

> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> package/busybox/busybox.mk | 1 +
> package/rsyslog/rsyslog.mk | 5 -----
> 2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 7686667884..3a19500ad3 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
> 
> # Packages that provide commands that may also be busybox applets:
> BUSYBOX_DEPENDENCIES = \
> +	$(if $(BR2_PACKAGE_RSYSLOGD),rsyslogd) \
> 	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
> 	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
> 	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
> diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
> index e32505be22..61e08ba765 100644
> --- a/package/rsyslog/rsyslog.mk
> +++ b/package/rsyslog/rsyslog.mk
> @@ -17,11 +17,6 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
> RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
> 	$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
> 
> -# Build after BusyBox
> -ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> -RSYSLOG_DEPENDENCIES += busybox
> -endif
> -
> ifeq ($(BR2_PACKAGE_GNUTLS),y)
> RSYSLOG_DEPENDENCIES += gnutls
> RSYSLOG_CONF_OPTS += --enable-gnutls
> --
> 2.14.1

-- 
Carlos Santos (Casantos) - DATACOM, P&D

[Buildroot] [PATCH 00/50] busybox: invert dependencies

[Yann E. MORIN]

Arnout, All,

On 2018-07-06 00:54 +0200, Arnout Vandecappelle spake thusly:
> On 04-07-18 18:39, Yann E. MORIN wrote:
> > Arnout, all,
> > 
> > On 2018-07-04 00:56 +0200, Arnout Vandecappelle spake thusly:
> >> On 07/02/18 23:12, Yann E. MORIN wrote:
> >>> Hello All!
> >>>
> >>> Currently, the issue that busybox may install the same executables as
> >>> those from other packages, is handled in all those packages. This is
> >>> not very practical.
> >>
> >>  The reverse is also not very practical...
> > 
> > The reverse means that the dependencies are sprinkled in all those
> > packages, while now they are all nicely gathered in a single location.
> > At least, I believe this is a maintenance improvment; not an enormous
> > gain, but still.
> 
>  It certainly is!

Is that an ACK of the patch? ;-p

> 
> >>> Furthermore, this means that those packages all overwrite the
> >>> busybox-installed applets, which means that this triggers the
> >>> no-two-packages-touch-the-same-file rule. So far, this is only a
> >>> warning, but when we eventually go with TLPB, we'll have to enforce
> >>> that rule.
> >>
> >>  Although we've already discussed this a couple of times in BR meetings, we
> >> never found a solution that is really satisfactory.
> > 
> > I'm not sure what you mean by "satisfactory". If speakign about busybox,
> > I think this solution is technically better than the alternative,
> > current situation, at least becasue we know that busybox will enforce a
> > noclobber install (heck, this was already the case with our hook), while
> > we can not easily audit all packages to be sure they properly install
> > their executalbes.
> 
>  Well, normally the proper way to install is to overwrite what was previously there.
> 
>  So the solution is not entirely satisfactory because it only really applies to
> busybox. Which means that for other packages, we either have to perform manual
> install commands to prevent overwriting, or we have to revert the dependency
> (i.e., for busybox, the first package wins, while for other packages, the last
> package wins...).

OK, I see what you meant. Right.

>  Also note that in the latter case, we should allow two packages to touch the
> same file, at least as long as there is a dependency between them. Indeed, if
> there is a dependency, then the build result is reproducible, so there is no
> need to disallow it. Checking for that will get hairy though...
> 
> 
> > For example, the attr package we current have will forcibly overwrite
> > any destination file without unlinking it, thus effectively replacing
> > /usr/bin/setfattr withits own code, and if that fiel happens to be a
> > hardlink or a symlink to busybox, we lose busybox. See
> >     https://bugs.busybox.net/show_bug.cgi?id=10986
> 
>  *That* is really a bug in the attr package. If it would use install, like the
> rest of the world does, it wouldn't have this problem.

And I fixed it, and upstream also fixed it by switching to automake.

My point was that we can't audit all such packages, because it is a pita.

> > So, I think it is better to rely on a single package we know behaves
> > correctly.
> > 
> >>  However, I have a new idea now...
> >>
> >>  IIUC, with PPS, there is no real problem with two packages touching the same
> >> file, as long as the dependency is explicitly tracked in Buildroot, right?
> >> Because when it is explicitly tracked, the file created by package A will always
> >> be present in package B's PPS when package B is built, so it's perfectly
> >> reproducible.
> 
>  Huh weird, I thought this was a new idea I had tonight, but apparently I
> already thought of it yesterday :-)

Eh! I'm more of the other kind of people, going lke "hmm, what was I
thinking minutes ago? It was super important and so exceptional, too
bad I can't remember..." ;-)

Yes, we could relax the rule, to say that a package can only modify
files in {,/usr}/{,s}bin, but modifing (replacing/appending) to a file
in any other location is forbidden.

But that is still not very nice either. Say, two packages install
/sbin/httpd, and the two want to install its config file /etc/httpd.conf
The first replacement is OK, the second is not.

But as you say, hat causes issues is appending, not replacing. So, we
could further relax, saying "replacing is OK, not appending", but then
how do we differentiate an append from a replace?

[--SNIP--]
>  OK. Just thought I'd shoot the idea.

Yes, but we already have a lot of trouble even landing TLPB at all.
Making the implementation even more complex can only postpone TLPB.

And ultimately, we can refine the implentation later, and then relax the
restrictions. It is easier for user to upgrade to a more laxist implem,
rather than going to a more restrictive one...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 16/50] package/busybox: invert dependency with rsyslogd

[Yann E. MORIN]

Carlos, All,

On 2018-07-05 22:58 -0300, Carlos Santos spake thusly:
> > From: "Yann Morin" <yann.morin.1998@free.fr>
> > To: "buildroot" <buildroot@buildroot.org>
> > Cc: "Yann Morin" <yann.morin.1998@free.fr>
> > Sent: Monday, July 2, 2018 6:11:50 PM
> > Subject: [Buildroot] [PATCH 16/50] package/busybox: invert dependency with rsyslogd
> Should be "rsyslog", not "rsyslogd", in the commit title.

Yip!...

Thanks! :-)

Regards,
Yann E. MORIN.

> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> > ---
> > package/busybox/busybox.mk | 1 +
> > package/rsyslog/rsyslog.mk | 5 -----
> > 2 files changed, 1 insertion(+), 5 deletions(-)
> > 
> > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> > index 7686667884..3a19500ad3 100644
> > --- a/package/busybox/busybox.mk
> > +++ b/package/busybox/busybox.mk
> > @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
> > 
> > # Packages that provide commands that may also be busybox applets:
> > BUSYBOX_DEPENDENCIES = \
> > +	$(if $(BR2_PACKAGE_RSYSLOGD),rsyslogd) \
> > 	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
> > 	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
> > 	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
> > diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
> > index e32505be22..61e08ba765 100644
> > --- a/package/rsyslog/rsyslog.mk
> > +++ b/package/rsyslog/rsyslog.mk
> > @@ -17,11 +17,6 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
> > RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
> > 	$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
> > 
> > -# Build after BusyBox
> > -ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> > -RSYSLOG_DEPENDENCIES += busybox
> > -endif
> > -
> > ifeq ($(BR2_PACKAGE_GNUTLS),y)
> > RSYSLOG_DEPENDENCIES += gnutls
> > RSYSLOG_CONF_OPTS += --enable-gnutls
> > --
> > 2.14.1
> 
> -- 
> Carlos Santos (Casantos) - DATACOM, P&D

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'