dpkg-native: Add dpkg-native.inc, set PERL_LIBDIR, fixup dpkg-architecture, bump...

Setting PERL_LIBDIR means that Dpkg.pm, etc, get put into the searchpath of
perl-native now.  Force dpkg-architecture to call our perl not host.  We also
didn't have a consistent set of DEPENDS but we should have.

diff --git a/packages/dpkg/dpkg-native.inc b/packages/dpkg/dpkg-native.inc
new file mode 100644 (file)
index 0000000..5d14527
--- /dev/null
+++ b/packages/dpkg/dpkg-native.inc
@@ -0,0 +1,24 @@
+require dpkg.inc
+
+inherit native
+
+DEPENDS = "bzip2-native zlib-native virtual/update-alternatives-native"
+
+SRC_URI += "file://noman.patch;patch=1"
+FILESPATH += "dpkg-${PV}"
+
+PERL_LIBDIR = "${STAGING_LIBDIR}/perl"
+
+EXTRA_OECONF = "--without-static-progs \
+               --without-dselect \
+               --with-start-stop-daemon \
+               --with-zlib \
+               --with-bz2lib \
+               --without-selinux \
+               --without-sgml-doc"
+
+do_stage_append() {
+       for BIN in dpkg-architecture; do
+               sed -i -e '1s,^#.*usr/bin,#!${STAGING_BINDIR},' ${STAGING_BINDIR}/$BIN
+       done
+}

diff --git a/packages/dpkg/dpkg-native_1.13.22.bb b/packages/dpkg/dpkg-native_1.13.22.bb
index 5dcf53c..5a1f6ab 100644 (file)
--- a/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,14 +1,3 @@
-require dpkg.inc
-PR = "r4"
-DEPENDS += "zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-               --without-dselect \
-               --with-start-stop-daemon \
-               --with-zlib \
-               --with-bz2lib \
-               --without-selinux \
-               --without-sgml-doc"
+PR = "r5"

diff --git a/packages/dpkg/dpkg-native_1.13.25.bb b/packages/dpkg/dpkg-native_1.13.25.bb
index 0d60e0b..47c0342 100644 (file)
--- a/packages/dpkg/dpkg-native_1.13.25.bb
+++ b/packages/dpkg/dpkg-native_1.13.25.bb
@@ -1,14 +1,3 @@
-require dpkg.inc
-PR = "r0"
-DEPENDS += "zlib-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-               --without-dselect \
-               --with-start-stop-daemon \
-               --with-zlib \
-               --with-bz2lib \
-                --without-selinux \
-               --without-sgml-doc"
+PR = "r1"

diff --git a/packages/dpkg/dpkg-native_1.14.19.bb b/packages/dpkg/dpkg-native_1.14.19.bb
index f8d6705..47c0342 100644 (file)
--- a/packages/dpkg/dpkg-native_1.14.19.bb
+++ b/packages/dpkg/dpkg-native_1.14.19.bb
@@ -1,15 +1,3 @@
-require dpkg.inc
-DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-FILESPATH += "dpkg-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-               --without-dselect \
-               --with-start-stop-daemon \
-               --with-zlib \
-               --with-bz2lib \
-                --without-selinux \
-               --without-sgml-doc"
+PR = "r1"

diff --git a/packages/dpkg/dpkg-native_1.14.23.bb b/packages/dpkg/dpkg-native_1.14.23.bb
index f8d6705..47c0342 100644 (file)
--- a/packages/dpkg/dpkg-native_1.14.23.bb
+++ b/packages/dpkg/dpkg-native_1.14.23.bb
@@ -1,15 +1,3 @@
-require dpkg.inc
-DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-FILESPATH += "dpkg-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-               --without-dselect \
-               --with-start-stop-daemon \
-               --with-zlib \
-               --with-bz2lib \
-                --without-selinux \
-               --without-sgml-doc"
+PR = "r1"

diff --git a/packages/dpkg/dpkg-native_1.14.25.bb b/packages/dpkg/dpkg-native_1.14.25.bb
index f8d6705..47c0342 100644 (file)
--- a/packages/dpkg/dpkg-native_1.14.25.bb
+++ b/packages/dpkg/dpkg-native_1.14.25.bb
@@ -1,15 +1,3 @@
-require dpkg.inc
-DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
+require dpkg-native.inc
 
-FILESPATH += "dpkg-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-               --without-dselect \
-               --with-start-stop-daemon \
-               --with-zlib \
-               --with-bz2lib \
-                --without-selinux \
-               --without-sgml-doc"
+PR = "r1"