From: Andreas Oberritter <obi@opendreambox.org>
Date: Mon, 11 Mar 2019 21:13:33 +0000 (+0100)
Subject: dpkg: Don't abort if unused tools are missing, e.g. ldconfig and start-stop-daemon
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1904d9de40c635862e3b30ebcbcfa8194ad6ff6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

dpkg: Don't abort if unused tools are missing, e.g. ldconfig and start-stop-daemon

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---

diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-help-make-sure-dpkg-continues-to-work-if-unused-tool.patch b/meta/recipes-devtools/dpkg/dpkg/0001-help-make-sure-dpkg-continues-to-work-if-unused-tool.patch
new file mode 100644
index 00000000000..9d183363662
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-help-make-sure-dpkg-continues-to-work-if-unused-tool.patch
@@ -0,0 +1,37 @@
+From b37f2e17f0558455a601b6cee99d07ee9dfc0181 Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <obi@opendreambox.org>
+Date: Thu, 7 Mar 2019 13:42:25 +0100
+Subject: [PATCH] help: make sure dpkg continues to work if unused tools are
+ not in PATH
+
+Dpkg looks for some tools it doesn't use. They might get used by scripts,
+but it's perfectly valid to build a rootfs not containing ldconfig or
+start-stop-daemon, even if start-stop-daemon was built.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+---
+ src/help.c | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/src/help.c b/src/help.c
+index f168e8374..83a4050a1 100644
+--- a/src/help.c
++++ b/src/help.c
+@@ -118,17 +118,6 @@ void checkpath(void) {
+     TAR,
+     DIFF,
+     BACKEND,
+-    /* Mac OS X uses dyld (Mach-O) instead of ld.so (ELF), and does not have
+-     * an ldconfig. */
+-#if defined(__APPLE__) && defined(__MACH__)
+-    "update_dyld_shared_cache",
+-#elif defined(__GLIBC__) || defined(__UCLIBC__) || \
+-      defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+-    "ldconfig",
+-#endif
+-#if BUILD_START_STOP_DAEMON
+-    "start-stop-daemon",
+-#endif
+     NULL
+   };
+ 
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb
index 971d36cdb57..80fe5ad2c79 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb
@@ -14,6 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \
            file://0001-dpkg-Support-muslx32-build.patch \
            file://0007-update-alternatives-disable-logging.patch \
            file://0001-update-alternatives-Allow-to-override-altdir-from-en.patch \
+           file://0001-help-make-sure-dpkg-continues-to-work-if-unused-tool.patch \
            file://pager.patch \
            "
 SRC_URI_append_class-native = " \