8 files changed, 8 insertions, 16 deletions

diff --git a/meta/packages/dpkg/dpkg-native_1.14.19.bb b/meta/packages/dpkg/dpkg-native_1.14.19.bb
deleted file mode 100644
index bf947b5054..0000000000
--- a/meta/packages/dpkg/dpkg-native_1.14.19.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require dpkg.inc
-DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
-SRC_URI += "file://noman.patch;patch=1"
-
-inherit native
-
-EXTRA_OECONF = "--without-static-progs \
-                --without-dselect \
-                --with-start-stop-daemon \
-                --with-zlib \
-                --with-bz2lib \
-                --without-selinux \
-                --without-sgml-doc"
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index 67c0781ce8..d002b3ec8a 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -7,7 +7,11 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
            file://ignore_extra_fields.patch;patch=1 \
            file://noupdalt.patch;patch=1"
 
-S = "${WORKDIR}/dpkg-${PV}"
+DEPENDS = "zlib bzip2"
+DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native"
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
+
+S = "${WORKDIR}/${BPN}-${PV}"
 
 PARALLEL_MAKE = ""
 
diff --git a/meta/packages/dpkg/files/autofoo.patch b/meta/packages/dpkg/dpkg/autofoo.patch
index 691121e418..691121e418 100644
--- a/meta/packages/dpkg/files/autofoo.patch
+++ b/meta/packages/dpkg/dpkg/autofoo.patch
diff --git a/meta/packages/dpkg/files/ignore_extra_fields.patch b/meta/packages/dpkg/dpkg/ignore_extra_fields.patch
index d09343c6e5..d09343c6e5 100644
--- a/meta/packages/dpkg/files/ignore_extra_fields.patch
+++ b/meta/packages/dpkg/dpkg/ignore_extra_fields.patch
diff --git a/meta/packages/dpkg/files/nochroot.patch b/meta/packages/dpkg/dpkg/nochroot.patch
index 3a8beaebbf..3a8beaebbf 100644
--- a/meta/packages/dpkg/files/nochroot.patch
+++ b/meta/packages/dpkg/dpkg/nochroot.patch
diff --git a/meta/packages/dpkg/files/noman.patch b/meta/packages/dpkg/dpkg/noman.patch
index f5984fe14a..f5984fe14a 100644
--- a/meta/packages/dpkg/files/noman.patch
+++ b/meta/packages/dpkg/dpkg/noman.patch
diff --git a/meta/packages/dpkg/files/noupdalt.patch b/meta/packages/dpkg/dpkg/noupdalt.patch
index 023e99ae8d..023e99ae8d 100644
--- a/meta/packages/dpkg/files/noupdalt.patch
+++ b/meta/packages/dpkg/dpkg/noupdalt.patch
diff --git a/meta/packages/dpkg/dpkg_1.14.19.bb b/meta/packages/dpkg/dpkg_1.14.19.bb
index 1a7991d40e..1e54306c93 100644
--- a/meta/packages/dpkg/dpkg_1.14.19.bb
+++ b/meta/packages/dpkg/dpkg_1.14.19.bb
@@ -1,6 +1,4 @@
 require dpkg.inc
-DEPENDS += "zlib bzip2"
-RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
 
 SRC_URI += "file://noman.patch;patch=1"
 
@@ -9,4 +7,7 @@ EXTRA_OECONF = "--without-static-progs \
                 --with-start-stop-daemon \
                 --with-zlib \
                 --with-bz2lib \
+                --without-selinux \
                 --without-sgml-doc"
+
+BBCLASSEXTEND = "native"