[OE-core] [oe-core][PATCH 1/1] dpkg: put start-stop-daemon in its own package

[Joe Slater]

Also make it update-alternatives compatible and move
it to where busybox puts its version.

Make dpkg RDEPEND on dpkg-start-stop.

Signed-off-by: Joe Slater <jslater at windriver.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 6eec2cd..2d7cad0 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -11,7 +11,7 @@ DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alte
 RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl"
 RDEPENDS_${PN}_class-native = "xz-native"
 
-inherit autotools gettext perlnative pkgconfig systemd
+inherit autotools gettext perlnative pkgconfig systemd update-alternatives
 
 python () {
     if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
@@ -43,6 +43,12 @@ do_configure () {
 }
 
 do_install_append () {
+	if [ -e ${D}${sbindir}/start-stop-daemon ]; then
+		mkdir -p ${D}${base_sbindir}
+		mv ${D}${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon
+		rmdir --ignore-fail-on-non-empty ${D}${sbindir}
+	fi
+
 	if [ "${PN}" = "dpkg-native" ]; then
 		# update-alternatives doesn't have an offline mode
 		rm ${D}${bindir}/update-alternatives
@@ -67,6 +73,18 @@ PROV_class-native = ""
 
 PROVIDES += "${PROV}"
 
+# split out start-stop-daemon to its own package
+#
+PACKAGES =+ "${PN}-start-stop"
+FILES_${PN}-start-stop = "${base_sbindir}/start-stop-daemon.dpkg"
+
+ALTERNATIVE_PRIORITY="100"
+ALTERNATIVE_${PN}-start-stop = "start-stop-daemon"
+ALTERNATIVE_LINK_NAME[start-stop-daemon]="${base_sbindir}/start-stop-daemon"
+
+RDEPENDS_${PN} += "${PN}-start-stop"
+#
+
 PACKAGES =+ "update-alternatives-dpkg"
 FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
 RPROVIDES_update-alternatives-dpkg += "update-alternatives"
-- 
1.7.9.5