summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-17 21:44:17 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-17 21:44:17 +0000
commitd71502666689f3c725850e52b71684ea9bcc1306 (patch)
tree26dd4d8ba0db5c09f163ed3865d41868f1dfc475 /meta/packages
parenta00293790bb46812e63f3a2a7e1bce627873eb77 (diff)
downloadopenembedded-core-d71502666689f3c725850e52b71684ea9bcc1306.tar.gz
openembedded-core-d71502666689f3c725850e52b71684ea9bcc1306.tar.bz2
openembedded-core-d71502666689f3c725850e52b71684ea9bcc1306.tar.xz
openembedded-core-d71502666689f3c725850e52b71684ea9bcc1306.zip
update-alternatives-dpkg: Convert to BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb15
-rw-r--r--meta/packages/update-alternatives/update-alternatives-dpkg.inc13
-rw-r--r--meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb12
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 0cbdc5ac7..000000000
--- 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 66232139d..91f9883ff 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 ea759fc20..5d38d5d36 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}"