aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2014-08-13 00:46:57 +0200
committerAndreas Oberritter <obi@opendreambox.org>2015-02-23 17:15:49 +0100
commit0593be4daa31278ce88dd1d08e3606b7b2f14348 (patch)
treecd97e28dc5916710e60741e3f312c7ba21b2bda4
parent239ecfde679f64d80367f5c1239a5b23c5fc3eea (diff)
downloadopenembedded-core-contrib-0593be4daa31278ce88dd1d08e3606b7b2f14348.tar.gz
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>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index c292927d9f..d66e51bd80 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -49,7 +49,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
@@ -70,7 +69,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"