From 0e8f0f0a033c79611a15914fde5826876502af2e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 23 Dec 2010 20:23:33 +0100 Subject: RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN} For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN} Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/recipes-devtools/apt/apt_0.7.14.bb | 4 ++-- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 4 ++-- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb | 2 +- meta/recipes-devtools/intltool/intltool.inc | 4 ++-- meta/recipes-devtools/intltool/intltool_0.40.6.bb | 2 +- meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb | 6 +++--- meta/recipes-devtools/python/python-dbus_0.83.1.bb | 4 ++-- meta/recipes-devtools/python/python-gst_0.10.19.bb | 4 ++-- meta/recipes-devtools/python/python-imaging_1.1.7.bb | 4 ++-- meta/recipes-devtools/python/python-pycurl_7.19.0.bb | 4 ++-- meta/recipes-devtools/python/python-pygtk_2.17.0.bb | 4 ++-- meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb | 4 ++-- meta/recipes-devtools/python/python-scons-native_2.0.1.bb | 4 ++-- meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb | 4 ++-- meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb | 4 ++-- meta/recipes-devtools/subversion/subversion_1.6.13.bb | 4 ++-- meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 4 ++-- meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb | 8 ++++---- 18 files changed, 37 insertions(+), 37 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb index 54096ef6a0..d2bcde5a22 100644 --- a/meta/recipes-devtools/apt/apt_0.7.14.bb +++ b/meta/recipes-devtools/apt/apt_0.7.14.bb @@ -1,9 +1,9 @@ DEPENDS = "curl db" -RDEPENDS = "dpkg" +RDEPENDS_${PN} = "dpkg" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" require apt.inc -PR = "r3" +PR = "r4" SRC_URI += "file://nodoc.patch \ file://includes-fix.patch" diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb index 1b14a6b119..b6b7b7878a 100644 --- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb +++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb @@ -4,10 +4,10 @@ compilation of C/C++/ObjC code across machines on a network." SECTION = "devel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r5" +PR = "r6" DEPENDS = "avahi gtk+" -RRECOMMENDS = "avahi-daemon" +RRECOMMENDS_${PN} = "avahi-daemon" # Upstream change this patch periodically so store locally # http://0pointer.de/public/distcc-avahi.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb index 3f9195a4c4..3681ab3f2c 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb @@ -34,7 +34,7 @@ do_install () { } # blkid used to be part of e2fsprogs but is useful outside, add it -# as an RDEPENDS so that anything relying on it being in e2fsprogs +# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs # still works RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks" diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc index f9bdf93b7b..9df79f580b 100644 --- a/meta/recipes-devtools/intltool/intltool.inc +++ b/meta/recipes-devtools/intltool/intltool.inc @@ -8,8 +8,8 @@ SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" S = "${WORKDIR}/intltool-${PV}" DEPENDS = "libxml-parser-perl-native" -#RDEPENDS = "libxml-parser-perl" -RRECOMMENDS = "perl-modules" +#RDEPENDS_${PN} = "libxml-parser-perl" +RRECOMMENDS_${PN} = "perl-modules" inherit autotools pkgconfig diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb index 4b5fe820e8..88d441cb93 100644 --- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb @@ -1,7 +1,7 @@ require intltool.inc LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r0" +PR = "r1" SRC_URI_append = " file://intltool-nowarn-0.40.0.patch" diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb index 087d25498f..ce039e5aa1 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb @@ -5,10 +5,10 @@ PRIORITY = "optional" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" -RDEPENDS = "python" -RDEPENDS_virtclass-native = "" +RDEPENDS_${PN} = "python" +RDEPENDS_${PN}_virtclass-native = "" PV = "0.1.8+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ file://index-ignore-filenotfound.patch" diff --git a/meta/recipes-devtools/python/python-dbus_0.83.1.bb b/meta/recipes-devtools/python/python-dbus_0.83.1.bb index d405ffa8c1..fcf638d441 100644 --- a/meta/recipes-devtools/python/python-dbus_0.83.1.bb +++ b/meta/recipes-devtools/python/python-dbus_0.83.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f5612614133e9a2f2dad527d97554670" DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" -PR = "ml0" +PR = "ml1" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" @@ -20,6 +20,6 @@ export HOST_SYS export STAGING_LIBDIR export STAGING_INCDIR -RDEPENDS = "python-io python-logging python-stringold python-threading python-xml" +RDEPENDS_${PN} = "python-io python-logging python-stringold python-threading python-xml" FILES_${PN}-dev += "${libdir}/pkgconfig diff --git a/meta/recipes-devtools/python/python-gst_0.10.19.bb b/meta/recipes-devtools/python/python-gst_0.10.19.bb index 16852d1a15..22d63393b4 100644 --- a/meta/recipes-devtools/python/python-gst_0.10.19.bb +++ b/meta/recipes-devtools/python/python-gst_0.10.19.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Python Gstreamer bindings" SECTION = "devel/python" LICENSE = "LGPLv2.1" DEPENDS = "gstreamer gst-plugins-base python-pygobject" -RDEPENDS += "python-pygtk" -PR = "r0" +RDEPENDS_${PN} += "python-pygtk" +PR = "r1" SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ file://python-path.patch" diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb index bd6fe1d227..ce3b977114 100644 --- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb +++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb @@ -4,9 +4,9 @@ PRIORITY = "optional" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec" DEPENDS = "freetype jpeg tiff" -RDEPENDS = "python-lang python-stringold" +RDEPENDS_${PN} = "python-lang python-stringold" SRCNAME = "Imaging" -PR = "ml0" +PR = "ml1" SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ file://path.patch" diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb b/meta/recipes-devtools/python/python-pycurl_7.19.0.bb index c8841f4405..b868ad8cde 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.19.0.bb @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://README;endline=13;md5=fbfe545b1869617123a08c0983ef17b file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518" DEPENDS = "curl python" -RDEPENDS = "python-core curl" +RDEPENDS_${PN} = "python-core curl" SRCNAME = "pycurl" -PR = "r0" +PR = "r1" SRC_URI = "\ http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ diff --git a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb index c32d9987ac..f56e1fec84 100644 --- a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb +++ b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Python GTK+ 2.17.x Bindings" SECTION = "devel/python" # needs gtk+ 2.17.x DEPENDS = "gtk+ libglade python-pycairo python-pygobject" -RDEPENDS = "python-shell python-pycairo python-pygobject" +RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -PR = "ml8.3" +PR = "ml9" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.17/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch \ diff --git a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb index 90b6b16836..827635425d 100644 --- a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb +++ b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb @@ -1,5 +1,5 @@ require python-pyrex_${PV}.bb inherit native DEPENDS = "python-native" -RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1" diff --git a/meta/recipes-devtools/python/python-scons-native_2.0.1.bb b/meta/recipes-devtools/python/python-scons-native_2.0.1.bb index a4bcd4258a..f7646a2587 100644 --- a/meta/recipes-devtools/python/python-scons-native_2.0.1.bb +++ b/meta/recipes-devtools/python/python-scons-native_2.0.1.bb @@ -1,6 +1,6 @@ require python-scons_${PV}.bb inherit native DEPENDS = "python-native" -RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1" diff --git a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb index 87e96f3443..23771acf2b 100644 --- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Qemu helper utilities from Poky" LICENSE = "GPLv2" -RDEPENDS = "qemu-native" -PR = "r0" +RDEPENDS_${PN} = "qemu-native" +PR = "r1" LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999" diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb index f7f416193b..18d278db7a 100644 --- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Qemu helper scripts from Poky" LICENSE = "GPLv2" -RDEPENDS = "qemu-nativesdk" -PR = "r8" +RDEPENDS_${PN} = "qemu-nativesdk" +PR = "r9" FILESPATH = "${FILE_DIRNAME}/qemu-helper" diff --git a/meta/recipes-devtools/subversion/subversion_1.6.13.bb b/meta/recipes-devtools/subversion/subversion_1.6.13.bb index bcdb6c22ea..b535f06a61 100644 --- a/meta/recipes-devtools/subversion/subversion_1.6.13.bb +++ b/meta/recipes-devtools/subversion/subversion_1.6.13.bb @@ -1,11 +1,11 @@ DESCRIPTION = "The Subversion (svn) client" SECTION = "console/network" DEPENDS = "apr-util neon" -RDEPENDS = "neon" +RDEPENDS_${PN} = "neon" LICENSE = "Apache BSD" HOMEPAGE = "http://subversion.tigris.org" -PR = "r0" +PR = "r1" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ diff --git a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb index 6897f18153..28a9e6f680 100644 --- a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb +++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb @@ -3,9 +3,9 @@ HOMEPAGE = "http://code.google.com/p/ubootchart/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" PV = "0.0+r${SRCREV}" -PR = "r4" +PR = "r5" -#RRECOMMENDS = "acct" +#RRECOMMENDS_${PN} = "acct" SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \ file://sysvinit.patch;patch=1;pnum=0 \ diff --git a/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb index 89313d6972..86ef300b09 100644 --- a/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +++ b/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb @@ -3,10 +3,10 @@ SECTION = "console/network" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -RDEPENDS = "pseudo" -RDEPENDS_virtclass-native = "pseudo-native" -RDEPENDS_virtclass-nativesdk = "pseudo-nativesdk" -PR = "r1" +RDEPENDS_${PN} = "pseudo" +RDEPENDS_${PN}_virtclass-native = "pseudo-native" +RDEPENDS_${PN}_virtclass-nativesdk = "pseudo-nativesdk" +PR = "r2" SRC_URI = "ftp://linux.mathematik.tu-darmstadt.de/pub/linux/oldstuff/people/okir/nfs-server-${PV}.tar.gz \ file://001-2.2b47-2.2b51.patch \ -- cgit v1.2.3-54-g00ecf