From 8b8d8431a91533c44a0d24b2df3b919caeefca95 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 23 Mar 2015 20:09:25 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/dpkg/dpkg.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/recipes-devtools/dpkg/dpkg.inc') diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 7df8efa..bbbd881 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" -- cgit v1.1