From 264a9add8d77f24f9a50f47d407261620ff4a2d7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 15 Oct 2007 15:45:14 +0000 Subject: update-alternatives: Set PROVIDES/RPROVIDES/DEPENDS correctly git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2880 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../update-alternatives-cworth-native_0.99.154.bb | 1 + meta/packages/update-alternatives/update-alternatives-cworth.inc | 1 + .../update-alternatives/update-alternatives-cworth_0.99.154.bb | 3 ++- .../update-alternatives/update-alternatives-dpkg-native_1.13.22.bb | 1 + meta/packages/update-alternatives/update-alternatives-dpkg.inc | 1 + .../packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb | 5 +++-- 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb b/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb index 36f023ec3a..5c7b7289ab 100644 --- a/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb +++ b/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb @@ -2,6 +2,7 @@ require update-alternatives-cworth.inc inherit native PROVIDES += "virtual/update-alternatives-native" +RPROVIDES += "update-alternatives-native" do_stage () { install -d ${sbindir} \ diff --git a/meta/packages/update-alternatives/update-alternatives-cworth.inc b/meta/packages/update-alternatives/update-alternatives-cworth.inc index d2d78c9a00..5a1cf3e7ed 100644 --- a/meta/packages/update-alternatives/update-alternatives-cworth.inc +++ b/meta/packages/update-alternatives/update-alternatives-cworth.inc @@ -3,3 +3,4 @@ SECTION = "base" SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')}" S = "${WORKDIR}/ipkg/C" PACKAGE_ARCH = "all" +PR = "r1" diff --git a/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb b/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb index 18dab4e65f..cf3c8fbc2b 100644 --- a/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb +++ b/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb @@ -1,6 +1,7 @@ require update-alternatives-cworth.inc -RPROVIDES_${PN} = "update-alternatives" +PROVIDES += "virtual/update-alternatives" +RPROVIDES_${PN} += "update-alternatives" do_install () { install -d ${D}${sbindir} \ 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 index 6c193f9603..0cbdc5ac77 100644 --- 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 @@ -2,6 +2,7 @@ require update-alternatives-dpkg.inc inherit native PROVIDES += "virtual/update-alternatives-native" +RPROVIDES += "update-alternatives-native" DEPENDS += "perl-native dpkg-native" DEFAULT_PREFERENCE = "-1" diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg.inc b/meta/packages/update-alternatives/update-alternatives-dpkg.inc index cffcf836bf..66232139d4 100644 --- a/meta/packages/update-alternatives/update-alternatives-dpkg.inc +++ b/meta/packages/update-alternatives/update-alternatives-dpkg.inc @@ -3,6 +3,7 @@ SECTION = "base" SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz" S = "${WORKDIR}/dpkg-${PV}" PACKAGE_ARCH = "all" +PR = "r1" do_patch () { cat ${S}/scripts/update-alternatives.pl | \ 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 a07d5e36d4..ea759fc202 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 @@ -1,7 +1,8 @@ require update-alternatives-dpkg.inc -RPROVIDES_${PN} = "update-alternatives" -RDEPENDS_${PN} = "perl dpkg" +PROVIDES += "virtual/update-alternatives" +RPROVIDES_${PN} += "update-alternatives" +RDEPENDS_${PN} += "perl dpkg" do_install () { install -d ${D}${sbindir} \ -- cgit v1.2.3