summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2015-03-23 20:09:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-25 12:39:38 +0000
commit8b8d8431a91533c44a0d24b2df3b919caeefca95 (patch)
treeea4ab3914702e1a378cebf7282387f1278fdf15b /meta
parentce9226f97c7955d7c1b795ca490b8c54a371b552 (diff)
downloadpoky-8b8d8431a91533c44a0d24b2df3b919caeefca95.tar.gz
dpkg: Don't move update-alternatives to sbindir
Debian, Ubuntu and opkg all have it in bindir. (From OE-Core rev: 5f6faeb24ba80cdb6c9f62b185e40adc15f0fd6e) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 7df8efa050..bbbd881e47 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -46,7 +46,6 @@ do_install_append () {
46 rm ${D}${bindir}/update-alternatives 46 rm ${D}${bindir}/update-alternatives
47 sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* 47 sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-*
48 else 48 else
49 mv ${D}${bindir}/update-alternatives ${D}${sbindir}
50 sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* 49 sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-*
51 fi 50 fi
52 51
@@ -67,7 +66,7 @@ PROV_class-native = ""
67PROVIDES += "${PROV}" 66PROVIDES += "${PROV}"
68 67
69PACKAGES =+ "update-alternatives-dpkg" 68PACKAGES =+ "update-alternatives-dpkg"
70FILES_update-alternatives-dpkg = "${sbindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" 69FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
71RPROVIDES_update-alternatives-dpkg += "update-alternatives" 70RPROVIDES_update-alternatives-dpkg += "update-alternatives"
72 71
73PACKAGES += "${PN}-perl" 72PACKAGES += "${PN}-perl"