From: Andreas Oberritter <obi@opendreambox.org>
Date: Mon, 23 Mar 2015 19:09:25 +0000 (+0100)
Subject: dpkg: Don't move update-alternatives to sbindir
X-Git-Tag: 2015-4~54
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5f6faeb24ba80cdb6c9f62b185e40adc15f0fd6e;p=openembedded-core.git

dpkg: Don't move update-alternatives to sbindir

Debian, Ubuntu and opkg all have it in bindir.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 7df8efa050..bbbd881e47 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -46,7 +46,6 @@ do_install_append () {
 		rm ${D}${bindir}/update-alternatives
 		sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-*
 	else
-		mv ${D}${bindir}/update-alternatives ${D}${sbindir}
 		sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-*
 	fi
 
@@ -67,7 +66,7 @@ PROV_class-native = ""
 PROVIDES += "${PROV}"
 
 PACKAGES =+ "update-alternatives-dpkg"
-FILES_update-alternatives-dpkg = "${sbindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
+FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
 RPROVIDES_update-alternatives-dpkg += "update-alternatives"
 
 PACKAGES += "${PN}-perl"