update-alternatives-dpkg: Adding support to relative paths.

update-alternatives-cworth accept both: full and relative paths, but update-alternatives-dpkg accept only full paths.
The best solution for that would be using only full paths but it would require change lots of bb files. 
By now consider to use only full paths on your bb files.

1 files changed, 8 insertions, 13 deletions

diff --git a/packages/update-alternatives/update-alternatives-dpkg.inc b/packages/update-alternatives/update-alternatives-dpkg.inc
index cffcf836bf..e3cdb53257 100644
--- a/packages/update-alternatives/update-alternatives-dpkg.inc
+++ b/packages/update-alternatives/update-alternatives-dpkg.inc
@@ -1,19 +1,14 @@
 LICENSE = "GPL"
 SECTION = "base"
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
+SRC_URI += "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
 S = "${WORKDIR}/dpkg-${PV}"
 PACKAGE_ARCH = "all"
 
-do_patch () {
-    cat ${S}/scripts/update-alternatives.pl | \
-        sed -n -e '
-    /^\$admindir=.*staging/{
-        x
-        s/^.*$/$D=$ENV{"D"} || ""\;/;
-        p;
-        x;
-        s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/dpkg"\;,;
-    };
-    s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,;
-    p;' > ${S}/scripts/update-alternatives
+SRC_URI += "file://paths.patch;patch=1"
+
+do_patch_append () {
+	import shutil
+	update_alternatives_src = bb.data.getVar('S', d, 1)
+	shutil.move("%s/scripts/update-alternatives.pl" % (update_alternatives_src,),
+	            "%s/scripts/update-alternatives" % (update_alternatives_src,))
 }