From 072d455056c8f6a9c178e69bc6410b199bdc9d27 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@embeddedalley.com>
Date: Mon, 23 Feb 2009 20:14:07 -0500
Subject: [PATCH] dpkg-native: Add dpkg-native.inc, set PERL_LIBDIR, fixup
 dpkg-architecture, bump PRs. 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.

---
 packages/dpkg/dpkg-native.inc        | 24 ++++++++++++++++++++++++
 packages/dpkg/dpkg-native_1.13.22.bb | 15 ++-------------
 packages/dpkg/dpkg-native_1.13.25.bb | 15 ++-------------
 packages/dpkg/dpkg-native_1.14.19.bb | 16 ++--------------
 packages/dpkg/dpkg-native_1.14.23.bb | 16 ++--------------
 packages/dpkg/dpkg-native_1.14.25.bb | 16 ++--------------
 6 files changed, 34 insertions(+), 68 deletions(-)
 create mode 100644 packages/dpkg/dpkg-native.inc

diff --git a/packages/dpkg/dpkg-native.inc b/packages/dpkg/dpkg-native.inc
new file mode 100644
index 0000000000..5d14527341
--- /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 5dcf53c164..5a1f6abc50 100644
--- 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 0d60e0bddb..47c03424be 100644
--- 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 f8d6705bb7..47c03424be 100644
--- 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 f8d6705bb7..47c03424be 100644
--- 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 f8d6705bb7..47c03424be 100644
--- 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"
-- 
2.39.5