update-alternatives-dpkg: Convert to BBCLASSEXTEND

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

3 files changed, 15 insertions, 25 deletions

diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb b/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb
deleted file mode 100644
index 0cbdc5ac77..0000000000
--- a/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require update-alternatives-dpkg.inc
-inherit native
-
-PROVIDES += "virtual/update-alternatives-native"
-RPROVIDES += "update-alternatives-native"
-DEPENDS += "perl-native dpkg-native"
-DEFAULT_PREFERENCE = "-1"
-
-do_stage () {
-    install -d ${sbindir} \
-               ${localstatedir}/dpkg/alternatives \
-               ${sysconfdir}/alternatives
-
-    install -m 0755 scripts/update-alternatives ${sbindir}/update-alternatives
-}
diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg.inc b/meta/packages/update-alternatives/update-alternatives-dpkg.inc
index 66232139d4..91f9883ff3 100644
--- a/meta/packages/update-alternatives/update-alternatives-dpkg.inc
+++ b/meta/packages/update-alternatives/update-alternatives-dpkg.inc
@@ -3,7 +3,7 @@ SECTION = "base"
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
 S = "${WORKDIR}/dpkg-${PV}"
 PACKAGE_ARCH = "all"
-PR = "r1"
+PR = "r2"
 
 do_patch () {
     cat ${S}/scripts/update-alternatives.pl | \
@@ -18,3 +18,14 @@ do_patch () {
     s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,;
     p;' > ${S}/scripts/update-alternatives
 }
+
+NATIVE_INSTALL_WORKS = "1"
+do_install () {
+    install -d ${D}${sbindir} \
+               ${D}${localstatedir}/dpkg/alternatives \
+               ${D}${sysconfdir}/alternatives
+
+    install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives
+}
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb
index ea759fc202..5d38d5d36f 100644
--- a/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb
+++ b/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb
@@ -2,12 +2,6 @@ require update-alternatives-dpkg.inc
 
 PROVIDES += "virtual/update-alternatives"
 RPROVIDES_${PN} += "update-alternatives"
-RDEPENDS_${PN} += "perl dpkg"
-
-do_install () {
-    install -d ${D}${sbindir} \
-               ${D}${localstatedir}/dpkg/alternatives \
-               ${D}${sysconfdir}/alternatives
-
-    install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives
-}
+EXTRA_RDEPENDS = "perl dpkg"
+EXTRA_RDEPENDS_virtclass-native = ""
+RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"