RDEPENDS = "foo" in core layer
Hi,
The core layer has tons of RDEPENDS = "foo", which should actually be RDEPENDS_${PN}. What's the policy on those?
regards,
Koen
Quoted 2 lines · Koen Kooi
The core layer has tons of RDEPENDS = "foo", which should actually be RDEPENDS_${PN}. What's the policy on those?
They should be fixed. Patches very welcome...
Cheers,
Richard
Op 22 dec 2010, om 15:49 heeft Richard Purdie het volgende geschreven:
Quoted 5 lines · Koen Kooi
Quoted 2 lines
The core layer has tons of RDEPENDS = "foo", which should actually be RDEPENDS_${PN}. What's the policy on those?
They should be fixed. Patches very welcome...
A quick sed gives me:
76 files changed, 77 insertions(+), 77 deletions(-)
Do you want that as a single patch and if not, how do you want to have it split and are PR bumps needed?
regards,
Koen
complete diffstat:
meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb | 2 +- meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc | 2 +- meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb | 2 +- meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb | 2 +- meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb | 2 +- meta/recipes-bsp/grub/grub_0.97.bb | 2 +- meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 2 +- meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb | 2 +- meta/recipes-bsp/qemu-config/qemu-config.bb | 2 +- meta/recipes-bsp/zaurusd/zaurusd_svn.bb | 2 +- meta/recipes-connectivity/gsm/gsmd.inc | 2 +- meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb | 2 +- meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb | 2 +- meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | 2 +- meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb | 2 +- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- meta/recipes-core/meta/external-python-tarball.bb | 2 +- meta/recipes-core/meta/meta-toolchain.bb | 2 +- meta/recipes-core/tasks/task-base.bb | 2 +- meta/recipes-core/tasks/task-poky-boot.bb | 2 +- meta/recipes-devtools/apt/apt_0.7.14.bb | 2 +- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb | 2 +- meta/recipes-devtools/intltool/intltool.inc | 2 +- meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb | 2 +- meta/recipes-devtools/python/python-dbus_0.83.1.bb | 2 +- meta/recipes-devtools/python/python-gst_0.10.19.bb | 2 +- meta/recipes-devtools/python/python-imaging_1.1.7.bb | 2 +- meta/recipes-devtools/python/python-pycurl_7.19.0.bb | 2 +- meta/recipes-devtools/python/python-pygtk_2.17.0.bb | 2 +- meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb | 2 +- meta/recipes-devtools/python/python-scons-native_2.0.1.bb | 2 +- meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb | 2 +- meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb | 2 +- meta/recipes-devtools/subversion/subversion_1.6.13.bb | 2 +- meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb | 2 +- meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb | 2 +- meta/recipes-extended/libzypp/libzypp_git.bb | 2 +- meta/recipes-extended/man-pages/man-pages_3.25.bb | 2 +- meta/recipes-extended/mc/mc_4.7.3.bb | 2 +- meta/recipes-extended/polkit/polkit_0.99.bb | 2 +- meta/recipes-extended/shadow/shadow.inc | 2 +- meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 2 +- meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 2 +- meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | 2 +- meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb | 2 +- meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb | 2 +- meta/recipes-graphics/cairo/cairo_1.10.0.bb | 2 +- meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb | 2 +- meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | 2 +- meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb | 2 +- meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 2 +- meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb | 2 +- meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 2 +- meta/recipes-graphics/xorg-font/font-util_1.2.0.bb | 2 +- meta/recipes-graphics/xorg-font/xorg-font-common.inc | 2 +- meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb | 2 +- meta/recipes-graphics/xorg-util/imake_1.0.4.bb | 2 +- meta/recipes-kernel/oprofile/oprofile_0.9.6.bb | 2 +- meta/recipes-kernel/oprofile/oprofile_cvs.bb | 2 +- meta/recipes-kernel/update-modules/update-modules_1.0.bb | 4 ++-- meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb | 2 +- meta/recipes-qt/qt-apps/fotowall_0.9.bb | 2 +- meta/recipes-qt/qt-apps/qmmp_0.4.1.bb | 2 +- meta/recipes-qt/qt-apps/quicky_0.4.bb | 2 +- meta/recipes-sato/eds/eds-tools_bzr.bb | 2 +- meta/recipes-sato/gaku/gaku_svn.bb | 2 +- meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb | 2 +- meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb | 2 +- meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb | 2 +- meta/recipes-sato/owl-video-widget/libowl-av_svn.bb | 2 +- meta/recipes-sato/pimlico/contacts.inc | 2 +- meta/recipes-sato/pimlico/dates.inc | 2 +- meta/recipes-support/enchant/enchant_1.6.0.bb | 2 +- meta/recipes-support/hal/hal.inc | 2 +- 76 files changed, 77 insertions(+), 77 deletions(-)
Quoted 6 lines · Koen Kooi
Op 22 dec 2010, om 15:49 heeft Richard Purdie het volgende geschreven:
Quoted 4 lines · Koen Kooi
Quoted 2 lines
The core layer has tons of RDEPENDS = "foo", which should actually be RDEPENDS_${PN}. What's the policy on those?
Quoted 8 lines
Quoted 1 line
They should be fixed. Patches very welcome...
A quick sed gives me:
76 files changed, 77 insertions(+), 77 deletions(-)Do you want that as a single patch and if not, how do you want to have it split and are PR bumps needed?
One patch is fine. One tricky part is that this is a change in behaviour as an RDEPENDS is applied to every RDEPENDS_XXX, not just XXX=${PN} and that means we really should bump PR :/.
Is there also a similar problem with RRECOMMENDS?
Cheers,
Richard
2010/12/22 Richard Purdie <[email protected]>:
Quoted 20 lines · Koen Kooi
Quoted 6 lines
Op 22 dec 2010, om 15:49 heeft Richard Purdie het volgende geschreven:
Quoted 4 lines · Koen Kooi
Quoted 2 lines
The core layer has tons of RDEPENDS = "foo", which should actually be RDEPENDS_${PN}. What's the policy on those?
Quoted 8 lines
Quoted 1 line
They should be fixed. Patches very welcome...
A quick sed gives me:
76 files changed, 77 insertions(+), 77 deletions(-)Do you want that as a single patch and if not, how do you want to have it split and are PR bumps needed?
One patch is fine. One tricky part is that this is a change in behaviour as an RDEPENDS is applied to every
RDEPENDS_XXX, not just XXX=${PN} and that means we really should bump PR :/.
Quoted 6 lines
Is there also a similar problem with RRECOMMENDS?
Cheers,
Richard
Yes.
This was discussed on the oe mailing list in oct
See http://thread.gmane.org/gmane.comp.handhelds.openembedded/37858/focus=37903
Martin Jansa did a lot of work on this.
If you read the thread you'll see that there is a case in which the _${PN} should not be added.
Not checked if this specific exception is also present in poky.
Frans
RFC PATCH 1/1 RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
In reply to Richard PurdieFrom: Koen Kooi <[email protected]>
For these recipes the depencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
--- .../openswan/openswan_2.4.7.bb | 4 ++-- .../recipes-connectivity/opensync/libsync_svn.bb | 3 ++- .../telepathy/empathy_2.26.1.bb | 6 +++--- .../recipes-gnome/abiword/abiword-2.5.inc | 2 +- .../abiword/abiword-embedded_2.5.2.bb | 2 ++ meta-demoapps/recipes-gnome/abiword/abiword.inc | 2 +- .../recipes-gnome/abiword/abiword_2.5.2.bb | 2 +- meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 2 +- .../recipes-gnome/libgsf/libgsf_1.14.5.bb | 4 ++-- .../matchbox-themes-gtk/matchbox-themes-gtk.bb | 4 ++-- .../eee-acpi-scripts/eee-acpi-scripts_git.bb | 4 ++-- meta/recipes-bsp/grub/grub_0.97.bb | 4 ++-- meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 4 ++-- meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb | 4 ++-- meta/recipes-bsp/qemu-config/qemu-config.bb | 4 ++-- meta/recipes-bsp/zaurusd/zaurusd_svn.bb | 3 ++- meta/recipes-connectivity/avahi/avahi.inc | 2 +- meta/recipes-connectivity/avahi/avahi_0.6.28.bb | 2 +- meta/recipes-connectivity/gsm/gsmd.inc | 4 ++-- .../libnss-mdns/libnss-mdns_0.10.bb | 4 ++-- .../nfs-utils/nfs-utils_1.2.3.bb | 6 +++--- .../ppp-dialin/ppp-dialin_0.1.bb | 4 ++-- .../resolvconf/resolvconf_1.43.bb | 4 ++-- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/glibc/glibc_2.10.1.bb | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 4 ++-- meta/recipes-core/meta/external-python-tarball.bb | 4 +++- meta/recipes-core/meta/meta-toolchain.bb | 2 +- meta/recipes-core/tasks/task-base.bb | 6 +++--- meta/recipes-core/tasks/task-poky-boot.bb | 6 +++--- meta/recipes-devtools/apt/apt_0.7.14.bb | 4 ++-- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 4 ++-- .../e2fsprogs/e2fsprogs_1.41.12.bb | 4 ++-- 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 | 4 ++-- meta/recipes-devtools/python/python-dbus_0.83.1.bb | 4 ++-- meta/recipes-devtools/python/python-gst_0.10.19.bb | 4 ++-- .../python/python-imaging_1.1.7.bb | 4 ++-- .../python/python-pycurl_7.19.0.bb | 4 ++-- .../recipes-devtools/python/python-pygtk_2.17.0.bb | 4 ++-- .../python/python-pyrex-native_0.9.9.bb | 4 ++-- .../python/python-scons-native_2.0.1.bb | 4 ++-- .../qemu/qemu-helper-native_1.0.bb | 4 ++-- .../qemu/qemu-helper-nativesdk_1.0.bb | 4 ++-- .../subversion/subversion_1.6.13.bb | 4 ++-- meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 4 ++-- .../unfs-server/unfs-server_2.2beta47.bb | 4 ++-- .../update-alternatives-dpkg_1.13.22.bb | 4 +++- meta/recipes-extended/libzypp/libzypp_git.bb | 4 ++-- meta/recipes-extended/man-pages/man-pages_3.25.bb | 4 ++-- meta/recipes-extended/mc/mc_4.7.3.bb | 4 +++- meta/recipes-extended/polkit/polkit_0.99.bb | 4 ++-- meta/recipes-extended/shadow/shadow.inc | 2 +- meta/recipes-extended/shadow/shadow_4.1.4.2.bb | 2 +- meta/recipes-extended/zypper/zypper_git.bb | 4 ++-- .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 6 +++--- meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 4 ++-- meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | 4 ++-- .../gtk+/gdk-pixbuf-csource-native_2.12.7.bb | 4 ++-- meta/recipes-gnome/gtk+/gtk+.inc | 2 +- meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.20.1.bb | 2 +- meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb | 4 ++-- .../tasks/task-poky-standalone-gmae-sdk-target.bb | 4 ++-- meta/recipes-graphics/cairo/cairo_1.10.0.bb | 4 ++-- .../libsdl/libsdl-nativesdk_1.2.11.bb | 4 ++-- meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb | 3 ++- .../recipes-graphics/xorg-font/font-alias_1.0.3.bb | 4 ++-- meta/recipes-graphics/xorg-font/font-util_1.2.0.bb | 4 ++-- .../xorg-font/xorg-font-common.inc | 4 ++-- .../recipes-graphics/xorg-util/gccmakedep_1.0.2.bb | 4 ++-- meta/recipes-graphics/xorg-util/imake_1.0.4.bb | 4 ++-- meta/recipes-kernel/oprofile/oprofile_0.9.6.bb | 6 +++--- meta/recipes-kernel/oprofile/oprofile_cvs.bb | 6 +++--- .../update-modules/update-modules_1.0.bb | 6 +++--- .../gstreamer/gst-openmax_0.10.1.bb | 4 ++-- .../gstreamer/gst-plugins-base_0.10.30.bb | 4 ++-- meta/recipes-qt/qt-apps/fotowall_0.9.bb | 4 +++- meta/recipes-qt/qt-apps/qmmp_0.4.1.bb | 4 ++-- meta/recipes-qt/qt-apps/quicky_0.4.bb | 4 +++- meta/recipes-sato/eds/eds-tools_bzr.bb | 4 ++-- meta/recipes-sato/gaku/gaku_svn.bb | 6 +++--- .../matchbox-config-gtk/matchbox-config-gtk_svn.bb | 3 ++- .../matchbox-keyboard/matchbox-keyboard_svn.bb | 4 ++-- .../matchbox-sato/matchbox-session-sato_0.1.bb | 4 ++-- .../recipes-sato/owl-video-widget/libowl-av_svn.bb | 6 +++--- meta/recipes-sato/pimlico/contacts.inc | 2 +- meta/recipes-sato/pimlico/contacts_0.9.bb | 2 +- meta/recipes-sato/pimlico/contacts_git.bb | 2 +- meta/recipes-sato/pimlico/dates.inc | 2 +- meta/recipes-sato/pimlico/dates_0.4.8.bb | 2 +- meta/recipes-sato/pimlico/dates_git.bb | 2 +- meta/recipes-support/enchant/enchant_1.6.0.bb | 4 ++-- meta/recipes-support/hal/hal.inc | 2 +- meta/recipes-support/hal/hal_0.5.14.bb | 2 +- meta/recipes-support/hal/hal_git.bb | 2 +- 98 files changed, 186 insertions(+), 170 deletions(-)
meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +2 -2
@@ -5,9 +5,9 @@ Linux operating system." HOMEPAGE = "http://www.openswan.org" LICENSE = "GPLv2" DEPENDS = "gmp flex-native" -RRECOMMENDS = "kernel-module-ipsec" +RRECOMMENDS_${PN} = "kernel-module-ipsec" RDEPENDS_nylon = "perl" -PR = "r0" +PR = "r1" SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ file://openswan-2.4.7-gentoo.patch;patch=1 \
meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb +2 -1
@@ -4,10 +4,11 @@ OpenSync in GLib applications." LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi" -RRECOMMENDS = "\ +RRECOMMENDS_${PN} = "\ libopensync-plugin-file \ " PV = "0.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/sync/trunk;module=sync;proto=http"
meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb +3 -3
@@ -6,9 +6,9 @@ Gadu-Gadu, Groupwise, ICQ and QQ." HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" LICENSE = "GPL" DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" -RDEPENDS = "telepathy-mission-control" -RRECOMMENDS = "telepathy-gabble" -PR = "r2" +RDEPENDS_${PN} = "telepathy-mission-control" +RRECOMMENDS_${PN} = "telepathy-gabble" +PR = "r3" inherit gnome
meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc +1 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.abiword.org" SECTION = "x11/office" LICENSE = "GPLv2" DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2" -RDEPENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb +2 -0
@@ -1,5 +1,7 @@ require abiword-2.5.inc +PR = "r1" + EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}"
meta-demoapps/recipes-gnome/abiword/abiword.inc +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.abiword.org"" LICENSE = "GPLv2" DEPENDS = "libgsf libglade libfribidi libxml2 wv" -RRECOMMENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" # Share this file between recipes that use cvs and that pull tarballs
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +1 -1
@@ -1,5 +1,5 @@ require abiword-2.5.inc -PR = "r1" +PR = "r2" RCONFLICTS = "abiword-embedded"
meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb +1 -1
@@ -1,7 +1,7 @@ require abiword.inc PV="2.5.0+cvs${SRCDATE}" -PR = "r3" +PR = "r4" SRC_URI = "${CVSURI}"
meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +2 -2
@@ -1,10 +1,10 @@ DESCRIPTION = "GNOME Structured File Library" LICENSE = "GPL" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS= "libxml2 bzip2 glib-2.0 zlib" -RDEPENDS = "gconf gnome-vfs" +RDEPENDS_${PN} = "gconf gnome-vfs" PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb +2 -2
@@ -1,9 +1,9 @@ DESCRIPTION = "Gtk2 theme files to accompany default Matchbox themes" LICENSE = "GPL" DEPENDS = "gtk-engines" -RDEPENDS = "matchbox-wm gtk-engine-clearlooks" +RDEPENDS_${PN} = "matchbox-wm gtk-engine-clearlooks" SECTION = "x11/base" -PR = "r2" +PR = "r3" SRC_URI = "file://gtkrc"
meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +2 -2
@@ -6,9 +6,9 @@ LICENSE="GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c" PV = "1.1.11+git${SRCREV}" -PR = "r3" +PR = "r4" -RDEPENDS = "pm-utils" +RDEPENDS_${PN} = "pm-utils" SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git;protocol=git \ file://remove-doc-check.patch;patch=1 \
meta/recipes-bsp/grub/grub_0.97.bb +2 -2
@@ -10,8 +10,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6" -RDEPENDS = "diffutils" -PR = "r2" +RDEPENDS_${PN} = "diffutils" +PR = "r3" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ file://autohell.patch;apply=yes "
meta/recipes-bsp/hostap/hostap-conf_1.0.bb +2 -2
@@ -3,9 +3,9 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -RDEPENDS = "update-modules" +RDEPENDS_${PN} = "update-modules" PACKAGE_ARCH = "all" -PR = "r11" +PR = "r12" SRC_URI = "file://hostap_cs.modalias \ file://COPYING.patch"
meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb +2 -2
@@ -3,9 +3,9 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -RDEPENDS = "update-modules" +RDEPENDS_${PN} = "update-modules" PACKAGE_ARCH = "all" -PR = "r5" +PR = "r6" SRC_URI = "file://orinoco_cs.conf \ file://COPYING.patch"
meta/recipes-bsp/qemu-config/qemu-config.bb +2 -2
@@ -3,8 +3,8 @@ DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" LICENSE = "GPL" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -RDEPENDS = "distcc task-poky-nfs-server oprofileui-server rsync bash" -PR = "r18" +RDEPENDS_${PN} = "distcc task-poky-nfs-server oprofileui-server rsync bash" +PR = "r19" SRC_URI = "file://distcc.sh \ file://anjuta-remote-run \
meta/recipes-bsp/zaurusd/zaurusd_svn.bb +2 -1
@@ -3,8 +3,9 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "tslib" -RDEPENDS = "xrandr" +RDEPENDS_${PN} = "xrandr" PV = "0.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"
meta/recipes-connectivity/avahi/avahi.inc +1 -1
@@ -16,7 +16,7 @@ PRIORITY = "optional" LICENSE = "GPLv2+ & LGPLv2.1+" DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade" -RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_${PN} = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
meta/recipes-connectivity/avahi/avahi_0.6.28.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" RDEPENDS_avahi-daemon = "sysvinit-pidof" -PR = "r0" +PR = "r1" EXTRA_OECONF += "--disable-gtk3"
meta/recipes-connectivity/gsm/gsmd.inc +2 -2
@@ -10,7 +10,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://fix_machine_init.patch;patch=1 \
@@ -19,7 +19,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ S = "${WORKDIR}/gsm" inherit autotools pkgconfig update-rc.d -# handle update-rc.d RDEPENDS manually, we don't need it on +# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on # anything but gsmd RDEPENDS_append = ""
meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +2 -2
@@ -7,8 +7,8 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "avahi" -RDEPENDS = "avahi-daemon" -PR = "r1" +RDEPENDS_${PN} = "avahi-daemon" +PR = "r2" SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +3 -3
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" # util-linux for libblkid DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers" -RDEPENDS = "portmap" -RRECOMMENDS = "kernel-module-nfsd" +RDEPENDS_${PN} = "portmap" +RRECOMMENDS_${PN} = "kernel-module-nfsd" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ file://nfs-utils-1.0.6-uclibc.patch \
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +2 -2
@@ -1,8 +1,8 @@ SECTION = "console/network" DESCRIPTION = "Enables PPP dial-in through a serial connection" DEPENDS = "ppp" -RDEPENDS = "ppp" -PR = "r5" +RDEPENDS_${PN} = "ppp" +PR = "r6" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb +2 -2
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" DEPENDS = "bash" -RDEPENDS = "bash" -PR = "r1" +RDEPENDS_${PN} = "bash" +PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
meta/recipes-core/glibc/glibc.inc +1 -1
@@ -13,7 +13,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" -#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" +#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv"
meta/recipes-core/glibc/glibc_2.10.1.bb +1 -1
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r6" +PR = "r7" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
meta/recipes-core/initscripts/initscripts_1.0.bb +2 -2
@@ -3,10 +3,10 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip SECTION = "base" PRIORITY = "required" DEPENDS = "makedevs" -RDEPENDS = "makedevs" +RDEPENDS_${PN} = "makedevs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r122" +PR = "r123" SRC_URI = "file://functions \ file://halt \
meta/recipes-core/meta/external-python-tarball.bb +3 -1
@@ -4,6 +4,8 @@ DEPENDS = "opkg-native opkg-utils-native virtual/fakeroot-native sed-native" inherit meta +PR = "r1" + SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
@@ -33,7 +35,7 @@ TOOLCHAIN_HOST_TASK ?= "\ TOOLCHAIN_OUTPUTNAME ?= "python-nativesdk-standalone-${SDKMACHINE}" -RDEPENDS = "${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_HOST_TASK}" EXCLUDE_FROM_WORLD = "1"
meta/recipes-core/meta/meta-toolchain.bb +1 -1
@@ -17,7 +17,7 @@ TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_AR TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" -RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" EXCLUDE_FROM_WORLD = "1"
meta/recipes-core/tasks/task-base.bb +3 -3
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r69" +PR = "r70" inherit task
@@ -72,8 +72,8 @@ PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils' # # those ones can be set in machine config to supply packages needed to get machine booting # -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_${PN} ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_${PN} ?= "" # # task-base contain stuff needed for base system (machine related)
meta/recipes-core/tasks/task-poky-boot.bb +3 -3
@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" ALLOW_EMPTY = "1" -PR = "r7" +PR = "r8" # # Set by the machine configuration with packages essential for device bootup # -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_${PN} ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_${PN} ?= "" RDEPENDS_task-poky-boot = "\ base-files \
meta/recipes-devtools/apt/apt_0.7.14.bb +2 -2
@@ -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"
meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
@@ -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
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +2 -2
@@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r19" +PR = "r20" SRC_URI += "file://quotefix.patch;patch=1 \ file://acinclude.m4"
@@ -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"
meta/recipes-devtools/intltool/intltool.inc +2 -2
@@ -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
meta/recipes-devtools/intltool/intltool_0.40.6.bb +1 -1
@@ -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"
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +2 -2
@@ -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_${PN} = "python" RDEPENDS_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"
meta/recipes-devtools/python/python-dbus_0.83.1.bb +2 -2
@@ -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
meta/recipes-devtools/python/python-gst_0.10.19.bb +2 -2
@@ -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"
meta/recipes-devtools/python/python-imaging_1.1.7.bb +2 -2
@@ -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"
meta/recipes-devtools/python/python-pycurl_7.19.0.bb +2 -2
@@ -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 \
meta/recipes-devtools/python/python-pygtk_2.17.0.bb +2 -2
@@ -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 \
meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb +2 -2
@@ -1,5 +1,5 @@ require python-pyrex_${PV}.bb inherit native DEPENDS = "python-native" -RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1"
meta/recipes-devtools/python/python-scons-native_2.0.1.bb +2 -2
@@ -1,6 +1,6 @@ require python-scons_${PV}.bb inherit native DEPENDS = "python-native" -RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1"
meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +2 -2
@@ -1,7 +1,7 @@ DESCRIPTION = "Qemu helper utilities from Poky" LICENSE = "GPLv2" -RDEPENDS = "qemu-native" -PR = "r0" +RDEPENDS_${PN} = "qemu-native" +PR = "r1" FILESPATH = "${FILE_DIRNAME}/qemu-helper"
meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb +2 -2
@@ -1,7 +1,7 @@ DESCRIPTION = "Qemu helper scripts from Poky" LICENSE = "GPL" -RDEPENDS = "qemu-nativesdk" -PR = "r8" +RDEPENDS_${PN} = "qemu-nativesdk" +PR = "r9" FILESPATH = "${FILE_DIRNAME}/qemu-helper"
meta/recipes-devtools/subversion/subversion_1.6.13.bb +2 -2
@@ -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 \
meta/recipes-devtools/ubootchart/ubootchart_svn.bb +2 -2
@@ -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 \
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +2 -2
@@ -3,10 +3,10 @@ SECTION = "console/network" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -RDEPENDS = "pseudo" +RDEPENDS_${PN} = "pseudo" RDEPENDS_virtclass-native = "pseudo-native" RDEPENDS_virtclass-nativesdk = "pseudo-nativesdk" -PR = "r1" +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 \
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +3 -1
@@ -1,7 +1,9 @@ require update-alternatives-dpkg.inc +PR = "r1" + PROVIDES += "virtual/update-alternatives" RPROVIDES_${PN} += "update-alternatives" -EXTRA_RDEPENDS = "perl dpkg" +EXTRA_RDEPENDS_${PN} = "perl dpkg" EXTRA_RDEPENDS_virtclass-native = "" RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
meta/recipes-extended/libzypp/libzypp_git.bb +2 -2
@@ -9,11 +9,11 @@ inherit cmake DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev" # rpmdb2solv from sat-solver is run from libzypp -RDEPENDS = "sat-solver" +RDEPENDS_${PN} = "sat-solver" S = "${WORKDIR}/git" PV = "0.0-git${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \
meta/recipes-extended/man-pages/man-pages_3.25.bb +2 -2
@@ -4,7 +4,7 @@ SECTION = "console/utils" PRIORITY = "required" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPL" -PR = "r0" +PR = "r1" LIC_FILES_CHKSUM = "file://README;md5=9dab010c5baa416669e5d17381799dd5" SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.tar.gz"
@@ -12,7 +12,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.ta SRC_URI[md5sum] = "98ec2324abea77d7a992470dd44d140c" SRC_URI[sha256sum] = "474242842a78dc2121687b7db6c32b6c78af5458f2bd809e23563dd185e2b169" -RDEPENDS = "man" +RDEPENDS_${PN} = "man" do_configure_prepend() { rm -rf not_installed
meta/recipes-extended/mc/mc_4.7.3.bb +3 -1
@@ -4,7 +4,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "console/utils" DEPENDS = "ncurses glib-2.0" -RDEPENDS = "ncurses-terminfo" +RDEPENDS_${PN} = "ncurses-terminfo" + +PR = "r1" SRC_URI = "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2"
meta/recipes-extended/polkit/polkit_0.99.bb +2 -2
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99" SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz" -PR = "r0" +PR = "r1" DEPENDS = "libpam expat dbus-glib eggdbus intltool" -RDEPENDS = "libpam" +RDEPENDS_${PN} = "libpam" EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection" inherit autotools pkgconfig
meta/recipes-extended/shadow/shadow.inc +1 -1
@@ -20,7 +20,7 @@ PAM_PLUGINS = " libpam-runtime \ pam-plugin-rootok" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" # since we deduce from ${SERIAL_CONSOLE} PACKAGE_ARCH = "${MACHINE_ARCH}"
meta/recipes-extended/shadow/shadow_4.1.4.2.bb +1 -1
@@ -1,6 +1,6 @@ require shadow.inc -PR = "r0" +PR = "r1" SRC_URI += "file://shadow.automake-1.11.patch \ file://shadow-4.1.3-dots-in-usernames.patch \
meta/recipes-extended/zypper/zypper_git.bb +2 -2
@@ -5,8 +5,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" DEPENDS = "libzypp augeas" -RRECOMMENDS = "procps" -PR = "r1" +RRECOMMENDS_${PN} = "procps" +PR = "r2" inherit cmake
meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +3 -3
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e" SECTION = "x11/gnome" DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" -PR = "r0" +RDEPENDS_${PN} = "hicolor-icon-theme" +RRECOMMENDS_${PN} = "librsvg-gtk" +PR = "r1" FILES_${PN} += "${datadir}/*"
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +2 -2
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "x11/gnome" -PR = "r0" +PR = "r1" inherit autotools gnome pkgconfig DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf" -RDEPENDS = "libgnome-keyring" +RDEPENDS_${PN} = "libgnome-keyring" EXTRA_OECONF = "--disable-gtk-doc"
meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +2 -2
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ inherit gnome inherit autotools -PR = "r3" +PR = "r4" SRC_URI += "file://pkgconfig.patch;patch=1"
@@ -16,4 +16,4 @@ SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c" SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" DEPENDS += "shared-mime-info intltool-native" -RDEPENDS = "shared-mime-info" +RDEPENDS_${PN} = "shared-mime-info"
meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb +2 -2
@@ -4,10 +4,10 @@ DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-nativ S = "${WORKDIR}/gtk+-${PV}" FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" SRC_URI += "file://reduce-dependencies.patch;patch=1" -PR = "r11" +PR = "r13" #clear recommends for uclibc builds -RRECOMMENDS = " " +RRECOMMENDS_${PN} = " " RRECOMMENDS_${PN}_linux = " " RRECOMMENDS_${PN}_linux-gnueabi = " "
meta/recipes-gnome/gtk+/gtk+.inc +1 -1
@@ -35,7 +35,7 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" -BASE_RRECOMMENDS = "ttf-dejavu-sans" +BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans" BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" BASE_RRECOMMENDS_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +1 -1
@@ -1,6 +1,6 @@ require gtk+.inc -PR = "r9" +PR = "r10" SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +1 -1
@@ -1,6 +1,6 @@ require gtk+.inc -PR = "r5" +PR = "r6" SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/gtk+/gtk+_2.20.1.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" -PR = "r1" +PR = "r2" SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +2 -2
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r9" +PR = "r10" ALLOW_EMPTY = "1"
@@ -14,7 +14,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-sdk \ libglade-dev \ ${SDK-GMAE} \
meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +2 -2
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r11" +PR = "r12" ALLOW_EMPTY = "1"
@@ -14,7 +14,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN} ${PN}-dbg" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-standalone-sdk-target \ libglade-dev \ ${SDK-GMAE} \
meta/recipes-graphics/cairo/cairo_1.10.0.bb +2 -2
@@ -2,14 +2,14 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -PR = "r0" +PR = "r1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" SRC_URI[md5sum] = "70a2ece66cf473d976e2db0f75bf199e" SRC_URI[sha256sum] = "0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2" -RDEPENDS += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ +RDEPENDS_${PN} += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ cairo-perf-utils" ALLOW_EMPTY = "1"
meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -2
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.libsdl.org" SECTION = "libs" LICENSE = "LGPL" DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk" -RDEPENDS = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" -PR = "r4" +RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" +PR = "r5" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \
meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb +2 -1
@@ -3,8 +3,9 @@ require xorg-app-common.inc DESCRIPTION = "a program to create an index of X font files in a directory" PE = "1" +PR = "r1" -RDEPENDS += "mkfontscale" +RDEPENDS_${PN} += "mkfontscale" BBCLASSEXTEND = "native"
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +2 -2
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" DEPENDS = "virtual/xserver font-util" -RDEPENDS = "encodings font-util" +RDEPENDS_${PN} = "encodings font-util" RDEPENDS_virtclass-native = "font-util" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"
meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +2 -2
@@ -12,10 +12,10 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" DEPENDS = "encodings util-macros" DEPENDS_virtclass-native = "util-macros-native" -RDEPENDS = "mkfontdir mkfontscale encodings" +RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" RDEPENDS_virtclass-native = "mkfontdir-native mkfontscale-native" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" do_configure_prepend() { sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
meta/recipes-graphics/xorg-font/xorg-font-common.inc +2 -2
@@ -5,10 +5,10 @@ SECTION = "x11/fonts" LICENSE = "MIT-X" DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native" -RDEPENDS = "encodings font-util font-alias" +RDEPENDS_${PN} = "encodings font-util font-alias" XORG_PN = "${BPN}" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}"
meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb +2 -2
@@ -2,9 +2,9 @@ require xorg-util-common.inc LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" DEPENDS = "util-macros" -RDEPENDS = "gcc" +RDEPENDS_${PN} = "gcc" -PR = "r2" +PR = "r3" PE = "1" SRC_URI[md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd"
meta/recipes-graphics/xorg-util/imake_1.0.4.bb +2 -2
@@ -2,11 +2,11 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" DEPENDS = "util-macros" -RDEPENDS = "perl xproto" +RDEPENDS_${PN} = "perl xproto" LIC_FILES_CHKSUM = "file://COPYING;md5=b9c6cfb044c6d0ff899eaafe4c729367" -PR = "r0" +PR = "r1" PE = "1" SRC_URI[md5sum] = "0fd1e53d94142ddee5340f87de0b9561"
meta/recipes-kernel/oprofile/oprofile_0.9.6.bb +3 -3
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "devel" DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" +RDEPENDS_${PN} = "binutils-symlinks" +RRECOMMENDS_${PN} = "kernel-vmlinux" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://opstart.patch \
meta/recipes-kernel/oprofile/oprofile_cvs.bb +3 -3
@@ -1,13 +1,13 @@ PV = "0.9.4+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SECTION = "devel" SUMMARY = "System-Wide Profiler" DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ of profiling all running code at low overhead." LICENSE = "GPL" DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" +RDEPENDS_${PN} = "binutils-symlinks" +RRECOMMENDS_${PN} = "kernel-vmlinux" DEFAULT_PREFERENCE = "-1"
meta/recipes-kernel/update-modules/update-modules_1.0.bb +3 -3
@@ -4,8 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" PACKAGE_ARCH = "all" -RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r7" +RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " +PR = "r8" SRC_URI = "file://update-modules \ file://COPYING.GPL"
@@ -25,7 +25,7 @@ do_install() { # The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which # supports both 2.4 and 2.6 kernels. Rather than forcing OE to have # to deal with that unique legacy corner case, we just nullify the -# RDEPENDS here and handle it in the Unslung image recipe. I know this +# RDEPENDS_${PN} here and handle it in the Unslung image recipe. I know this # is ugly. Please don't remove it unless you first make the RDEPENDS # line at the top of this file understand that a machine can be used # in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb +2 -2
@@ -1,5 +1,5 @@ DEPENDS = "gstreamer" -RDEPENDS = "libomxil" +RDEPENDS_${PN} = "libomxil" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"
@@ -10,7 +10,7 @@ inherit autotools EXTRA_OECONF += "--disable-valgrind" -PR = "r0" +PR = "r1" FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so" FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.*a"
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +2 -2
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi" -RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ +RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ gnome-vfs-plugin-sftp" SRC_URI += " file://gst-plugins-base-tremor.patch \
@@ -16,7 +16,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch \ SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" -PR = "r2" +PR = "r3" inherit gettext
meta/recipes-qt/qt-apps/fotowall_0.9.bb +3 -1
@@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \ file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc" SECTION = "x11/apps" +PR = "r1" + DEPENDS = "qt4-x11-free" -RDEPENDS = "qt4-x11-free" +RDEPENDS_${PN} = "qt4-x11-free" SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"
meta/recipes-qt/qt-apps/qmmp_0.4.1.bb +2 -2
@@ -4,10 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "multimedia" -PR = "r1" +PR = "r2" DEPENDS = "qt4-x11-free taglib" -RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" +RDEPENDS_${PN} = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2"
meta/recipes-qt/qt-apps/quicky_0.4.bb +3 -1
@@ -4,8 +4,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14" SECTION = "x11/apps" +PR = "r1" + DEPENDS = "qt4-x11-free" -RDEPENDS = "qt4-x11-free" +RDEPENDS_${PN} = "qt4-x11-free" SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
meta/recipes-sato/eds/eds-tools_bzr.bb +2 -2
@@ -1,10 +1,10 @@ LICENSE = "GPLv2" SECTION = "x11" DEPENDS = "dbus-glib eds-dbus" -RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book" DESCRIPTION = "Test applications for EDS" -PR = "r0" +PR = "r1" SRC_URI = "bzr://burtonini.com/bzr/eds-tools;proto=http"
meta/recipes-sato/gaku/gaku_svn.bb +3 -3
@@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a" DEPENDS = "gtk+ gstreamer libowl-av" -RDEPENDS = "gst-plugins-base-audioconvert \ +RDEPENDS_${PN} = "gst-plugins-base-audioconvert \ gst-plugins-base-audioresample \ gst-plugins-base-typefindfunctions \ gst-plugins-base-playbin" -RRECOMMENDS = "gst-plugins-good-id3demux \ +RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ gst-plugins-base-vorbis \ gst-plugins-base-alsa \ gst-plugins-base-ogg \
@@ -17,7 +17,7 @@ RRECOMMENDS = "gst-plugins-good-id3demux \ PV = "0.0+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb +2 -1
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" DEPENDS = "gconf gtk+" -RDEPENDS = "settings-daemon" +RDEPENDS_${PN} = "settings-daemon" PV = "0.0+svnr${SRCREV}" +PR = "r1" S = "${WORKDIR}/${PN}"
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb +2 -2
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" -RDEPENDS = "formfactor dbus-wait" +RDEPENDS_${PN} = "formfactor dbus-wait" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://configure_fix.patch;patch=1;maxrev=1819 \
meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +2 -2
@@ -6,8 +6,8 @@ LICENSE = "GPL" LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" SECTION = "x11" -RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" -PR = "r27" +RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" +PR = "r28" # This package is architecture specific because the session script is modified # based on the machine architecture.
meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +3 -3
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ SECTION = "x11" DEPENDS = "gtk+ gstreamer gst-plugins-base" -RDEPENDS = "gst-meta-base" -RRECOMMENDS = "gst-meta-audio gst-meta-video" +RDEPENDS_${PN} = "gst-meta-base" +RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" PV = "0.0+svnr${SRCREV}" -PR = "r5" +PR = "r6" S = "${WORKDIR}/${PN}"
meta/recipes-sato/pimlico/contacts.inc +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " SECTION = "x11" DEPENDS = "glib-2.0 gtk+ eds-dbus" DEPENDS_append_poky = " libowl" -RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book" inherit autotools pkgconfig
meta/recipes-sato/pimlico/contacts_0.9.bb +1 -1
@@ -1,5 +1,5 @@ require contacts.inc -PR = "r2" +PR = "r3" SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
meta/recipes-sato/pimlico/contacts_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" PV = "0.12+git${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/git"
meta/recipes-sato/pimlico/dates.inc +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & LGPLv2+" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" -RDEPENDS = "libedata-cal" +RDEPENDS_${PN} = "libedata-cal" inherit autotools pkgconfig gtk-icon-cache
meta/recipes-sato/pimlico/dates_0.4.8.bb +1 -1
@@ -1,5 +1,5 @@ require dates.inc -PR = "r3" +PR = "r4" SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
meta/recipes-sato/pimlico/dates_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa" PV = "0.4.11+git${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/git"
meta/recipes-support/enchant/enchant_1.6.0.bb +2 -2
@@ -6,11 +6,11 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \ file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18" DEPENDS = "aspell glib-2.0" -RDEPENDS = "aspell" +RDEPENDS_${PN} = "aspell" inherit autotools pkgconfig -PR = "r0" +PR = "r1" SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
meta/recipes-support/hal/hal.inc +1 -1
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+ | AFL" LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31" DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native" -RDEPENDS += "udev hal-info" +RDEPENDS_${PN} += "udev hal-info" SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ file://20hal"
meta/recipes-support/hal/hal_0.5.14.bb +1 -1
@@ -1,6 +1,6 @@ require hal.inc -PR = "r2" +PR = "r3" EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
meta/recipes-support/hal/hal_git.bb +1 -1
@@ -1,7 +1,7 @@ require hal.inc PV = "0.5.9.1+git${SRCDATE}" -PR = "r7" +PR = "r8" SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ file://20hal \
Signature · 1 line
1.6.6.1
Re: [RFC][PATCH] RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
This breaks task-base and task-poky boot, but other comments are welcome while I work on v2!
Op 23 dec 2010, om 14:45 heeft Koen Kooi het volgende geschreven:
Quoted 1,696 lines
From: Koen Kooi <[email protected]>
For these recipes the depencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
Signed-off-by Koen Kooi <[email protected]>---
.../openswan/openswan_2.4.7.bb | 4 ++-- .../recipes-connectivity/opensync/libsync_svn.bb | 3 ++- .../telepathy/empathy_2.26.1.bb | 6 +++--- .../recipes-gnome/abiword/abiword-2.5.inc | 2 +- .../abiword/abiword-embedded_2.5.2.bb | 2 ++ meta-demoapps/recipes-gnome/abiword/abiword.inc | 2 +- .../recipes-gnome/abiword/abiword_2.5.2.bb | 2 +- meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 2 +- .../recipes-gnome/libgsf/libgsf_1.14.5.bb | 4 ++-- .../matchbox-themes-gtk/matchbox-themes-gtk.bb | 4 ++-- .../eee-acpi-scripts/eee-acpi-scripts_git.bb | 4 ++-- meta/recipes-bsp/grub/grub_0.97.bb | 4 ++-- meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 4 ++-- meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb | 4 ++-- meta/recipes-bsp/qemu-config/qemu-config.bb | 4 ++-- meta/recipes-bsp/zaurusd/zaurusd_svn.bb | 3 ++- meta/recipes-connectivity/avahi/avahi.inc | 2 +- meta/recipes-connectivity/avahi/avahi_0.6.28.bb | 2 +- meta/recipes-connectivity/gsm/gsmd.inc | 4 ++-- .../libnss-mdns/libnss-mdns_0.10.bb | 4 ++-- .../nfs-utils/nfs-utils_1.2.3.bb | 6 +++--- .../ppp-dialin/ppp-dialin_0.1.bb | 4 ++-- .../resolvconf/resolvconf_1.43.bb | 4 ++-- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/glibc/glibc_2.10.1.bb | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 4 ++-- meta/recipes-core/meta/external-python-tarball.bb | 4 +++- meta/recipes-core/meta/meta-toolchain.bb | 2 +- meta/recipes-core/tasks/task-base.bb | 6 +++--- meta/recipes-core/tasks/task-poky-boot.bb | 6 +++--- meta/recipes-devtools/apt/apt_0.7.14.bb | 4 ++-- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 4 ++-- .../e2fsprogs/e2fsprogs_1.41.12.bb | 4 ++-- 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 | 4 ++-- meta/recipes-devtools/python/python-dbus_0.83.1.bb | 4 ++-- meta/recipes-devtools/python/python-gst_0.10.19.bb | 4 ++-- .../python/python-imaging_1.1.7.bb | 4 ++-- .../python/python-pycurl_7.19.0.bb | 4 ++-- .../recipes-devtools/python/python-pygtk_2.17.0.bb | 4 ++-- .../python/python-pyrex-native_0.9.9.bb | 4 ++-- .../python/python-scons-native_2.0.1.bb | 4 ++-- .../qemu/qemu-helper-native_1.0.bb | 4 ++-- .../qemu/qemu-helper-nativesdk_1.0.bb | 4 ++-- .../subversion/subversion_1.6.13.bb | 4 ++-- meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 4 ++-- .../unfs-server/unfs-server_2.2beta47.bb | 4 ++-- .../update-alternatives-dpkg_1.13.22.bb | 4 +++- meta/recipes-extended/libzypp/libzypp_git.bb | 4 ++-- meta/recipes-extended/man-pages/man-pages_3.25.bb | 4 ++-- meta/recipes-extended/mc/mc_4.7.3.bb | 4 +++- meta/recipes-extended/polkit/polkit_0.99.bb | 4 ++-- meta/recipes-extended/shadow/shadow.inc | 2 +- meta/recipes-extended/shadow/shadow_4.1.4.2.bb | 2 +- meta/recipes-extended/zypper/zypper_git.bb | 4 ++-- .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 6 +++--- meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 4 ++-- meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | 4 ++-- .../gtk+/gdk-pixbuf-csource-native_2.12.7.bb | 4 ++-- meta/recipes-gnome/gtk+/gtk+.inc | 2 +- meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.20.1.bb | 2 +- meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb | 4 ++-- .../tasks/task-poky-standalone-gmae-sdk-target.bb | 4 ++-- meta/recipes-graphics/cairo/cairo_1.10.0.bb | 4 ++-- .../libsdl/libsdl-nativesdk_1.2.11.bb | 4 ++-- meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb | 3 ++- .../recipes-graphics/xorg-font/font-alias_1.0.3.bb | 4 ++-- meta/recipes-graphics/xorg-font/font-util_1.2.0.bb | 4 ++-- .../xorg-font/xorg-font-common.inc | 4 ++-- .../recipes-graphics/xorg-util/gccmakedep_1.0.2.bb | 4 ++-- meta/recipes-graphics/xorg-util/imake_1.0.4.bb | 4 ++-- meta/recipes-kernel/oprofile/oprofile_0.9.6.bb | 6 +++--- meta/recipes-kernel/oprofile/oprofile_cvs.bb | 6 +++--- .../update-modules/update-modules_1.0.bb | 6 +++--- .../gstreamer/gst-openmax_0.10.1.bb | 4 ++-- .../gstreamer/gst-plugins-base_0.10.30.bb | 4 ++-- meta/recipes-qt/qt-apps/fotowall_0.9.bb | 4 +++- meta/recipes-qt/qt-apps/qmmp_0.4.1.bb | 4 ++-- meta/recipes-qt/qt-apps/quicky_0.4.bb | 4 +++- meta/recipes-sato/eds/eds-tools_bzr.bb | 4 ++-- meta/recipes-sato/gaku/gaku_svn.bb | 6 +++--- .../matchbox-config-gtk/matchbox-config-gtk_svn.bb | 3 ++- .../matchbox-keyboard/matchbox-keyboard_svn.bb | 4 ++-- .../matchbox-sato/matchbox-session-sato_0.1.bb | 4 ++-- .../recipes-sato/owl-video-widget/libowl-av_svn.bb | 6 +++--- meta/recipes-sato/pimlico/contacts.inc | 2 +- meta/recipes-sato/pimlico/contacts_0.9.bb | 2 +- meta/recipes-sato/pimlico/contacts_git.bb | 2 +- meta/recipes-sato/pimlico/dates.inc | 2 +- meta/recipes-sato/pimlico/dates_0.4.8.bb | 2 +- meta/recipes-sato/pimlico/dates_git.bb | 2 +- meta/recipes-support/enchant/enchant_1.6.0.bb | 4 ++-- meta/recipes-support/hal/hal.inc | 2 +- meta/recipes-support/hal/hal_0.5.14.bb | 2 +- meta/recipes-support/hal/hal_git.bb | 2 +- 98 files changed, 186 insertions(+), 170 deletions(-)meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +0
-0@@ -5,9 +5,9 @@ Linux operating system."HOMEPAGE = "http://www.openswan.org"
LICENSE = "GPLv2"
DEPENDS = "gmp flex-native"meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +1
-1-RRECOMMENDS = "kernel-module-ipsec" +RRECOMMENDS_${PN} = "kernel-module-ipsec"
RDEPENDS_nylon= "perl"meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +1
-1-PR = "r0" +PR = "r1"SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ file://openswan-2.4.7-gentoo.patch;patch=1 \meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb +0
-0@@ -4,10 +4,11 @@ OpenSync in GLib applications."LICENSE = "LGPL"
SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi"meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb +1
-1-RRECOMMENDS = "\ +RRECOMMENDS_${PN} = "\libopensync-plugin-file \ "PV = "0.0+svnr${SRCREV}"
+PR = "r1"
SRC_URI= "svn://svn.o-hand.com/repos/sync/trunk;module=sync;proto=http"meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb +0
-0@@ -6,9 +6,9 @@ Gadu-Gadu, Groupwise, ICQ and QQ."HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
LICENSE = "GPL"
DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb +3
-3-RDEPENDS = "telepathy-mission-control" -RRECOMMENDS = "telepathy-gabble" -PR = "r2" +RDEPENDS_${PN} = "telepathy-mission-control" +RRECOMMENDS_${PN} = "telepathy-gabble" +PR = "r3"inherit gnome
meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc +0
-0@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.abiword.org"SECTION = "x11/office"
LICENSE = "GPLv2"
DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc +1
-1-RDEPENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
SRC_URI= "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb +0
-0@@ -1,5 +1,7 @@require abiword-2.5.inc
meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb +2
-0+PR = "r1" +
EXTRA_OECONF+= "--enable-embedded"S = "${WORKDIR}/abiword-${PV}"
meta-demoapps/recipes-gnome/abiword/abiword.inc +0
-0@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.abiword.org""LICENSE = "GPLv2"
DEPENDS = "libgsf libglade libfribidi libxml2 wv"
meta-demoapps/recipes-gnome/abiword/abiword.inc +1
-1-RRECOMMENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"# Share this file between recipes that use cvs and that pull tarballs
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +0
-0@@ -1,5 +1,5 @@require abiword-2.5.inc
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +1
-1-PR = "r1" +PR = "r2"RCONFLICTS = "abiword-embedded"
meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb +0
-0@@ -1,7 +1,7 @@require abiword.inc
PV="2.5.0+cvs${SRCDATE}"
meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb +1
-1-PR = "r3" +PR = "r4"
SRC_URI= "${CVSURI}"meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +0
-0@@ -1,10 +1,10 @@DESCRIPTION = "GNOME Structured File Library"
LICENSE = "GPL"
SECTION = "libs"meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +1
-1-PR = "r0" +PR = "r1"DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +1
-1-RDEPENDS = "gconf gnome-vfs" +RDEPENDS_${PN} = "gconf gnome-vfs"PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb +0
-0@@ -1,9 +1,9 @@DESCRIPTION = "Gtk2 theme files to accompany default Matchbox themes" LICENSE = "GPL"
DEPENDS = "gtk-engines"meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb +1
-1-RDEPENDS = "matchbox-wm gtk-engine-clearlooks" +RDEPENDS_${PN} = "matchbox-wm gtk-engine-clearlooks"SECTION = "x11/base"
meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb +1
-1-PR = "r2" +PR = "r3"
SRC_URI= "file://gtkrc"meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +0
-0@@ -6,9 +6,9 @@ LICENSE="GPL"
LIC_FILES_CHKSUM= "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c"PV = "1.1.11+git${SRCREV}"
meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +2
-2-PR = "r3" +PR = "r4" -RDEPENDS = "pm-utils" +RDEPENDS_${PN} = "pm-utils"SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git;protocol=git \ file://remove-doc-check.patch;patch=1 \meta/recipes-bsp/grub/grub_0.97.bb +2
-2@@ -10,8 +10,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6" -RDEPENDS = "diffutils" -PR = "r2" +RDEPENDS_${PN} = "diffutils" +PR = "r3" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ file://autohell.patch;apply=yes "meta/recipes-bsp/hostap/hostap-conf_1.0.bb +0
-0@@ -3,9 +3,9 @@ SECTION = "kernel/modules"PRIORITY = "optional"
LICENSE = "GPLv2"LIC_FILES_CHKSUM= "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"meta/recipes-bsp/hostap/hostap-conf_1.0.bb +1
-1-RDEPENDS = "update-modules" +RDEPENDS_${PN} = "update-modules"
PACKAGE_ARCH= "all"meta/recipes-bsp/hostap/hostap-conf_1.0.bb +1
-1-PR = "r11" +PR = "r12"
SRC_URI= "file://hostap_cs.modalias \
file://COPYING.patch"meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb +0
-0@@ -3,9 +3,9 @@ SECTION = "kernel/modules"PRIORITY = "optional"
LICENSE = "GPLv2"LIC_FILES_CHKSUM= "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb +1
-1-RDEPENDS = "update-modules" +RDEPENDS_${PN} = "update-modules"
PACKAGE_ARCH= "all"meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb +1
-1-PR = "r5" +PR = "r6"
SRC_URI= "file://orinoco_cs.conf \
file://COPYING.patch"meta/recipes-bsp/qemu-config/qemu-config.bb +0
-0@@ -3,8 +3,8 @@ DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"LICENSE = "GPL"
LIC_FILES_CHKSUM= "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"meta/recipes-bsp/qemu-config/qemu-config.bb +2
-2-RDEPENDS = "distcc task-poky-nfs-server oprofileui-server rsync bash" -PR = "r18" +RDEPENDS_${PN} = "distcc task-poky-nfs-server oprofileui-server rsync bash" +PR = "r19"SRC_URI = "file://distcc.sh \ file://anjuta-remote-run \meta/recipes-bsp/zaurusd/zaurusd_svn.bb +0
-0@@ -3,8 +3,9 @@ SECTION = "base"LICENSE = "GPLv2"
LIC_FILES_CHKSUM= "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "tslib"meta/recipes-bsp/zaurusd/zaurusd_svn.bb +1
-1-RDEPENDS = "xrandr" +RDEPENDS_${PN} = "xrandr"PV = "0.0+svnr${SRCREV}"
+PR = "r1"
SRC_URI= "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"meta/recipes-connectivity/avahi/avahi.inc +0
-0@@ -16,7 +16,7 @@ PRIORITY = "optional"LICENSE = "GPLv2+ & LGPLv2.1+"
DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
meta/recipes-connectivity/avahi/avahi.inc +1
-1-RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_${PN} = "libnss-mdns"RRECOMMENDS_avahi-daemon = "libnss-mdns"
SRC_URI= "http://avahi.org/download/avahi-${PV}.tar.gz \meta/recipes-connectivity/avahi/avahi_0.6.28.bb +0
-0@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"RDEPENDS_avahi-daemon = "sysvinit-pidof"
meta/recipes-connectivity/avahi/avahi_0.6.28.bb +1
-1-PR = "r0" +PR = "r1"
EXTRA_OECONF+= "--disable-gtk3"meta/recipes-connectivity/gsm/gsmd.inc +0
-0@@ -10,7 +10,7 @@ SECTION = "libs/gsm"PROVIDES += "gsmd"
RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}"meta/recipes-connectivity/gsm/gsmd.inc +1
-1-PR = "r0" +PR = "r1"SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://fix_machine_init.patch;patch=1 \meta/recipes-connectivity/gsm/gsmd.inc +0
-0@@ -19,7 +19,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \S = "${WORKDIR}/gsm"
inherit autotools pkgconfig update-rc.d
meta/recipes-connectivity/gsm/gsmd.inc +1
-1-# handle update-rc.d RDEPENDS manually, we don't need it on +# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on# anything but gsmd RDEPENDS_append = ""meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +0
-0@@ -7,8 +7,8 @@ LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM= "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"DEPENDS = "avahi"
meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +2
-2-RDEPENDS = "avahi-daemon" -PR = "r1" +RDEPENDS_${PN} = "avahi-daemon" +PR = "r2"
SRC_URI= "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +0
-0@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" # util-linux for libblkidDEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +3
-3-RDEPENDS = "portmap" -RRECOMMENDS = "kernel-module-nfsd" +RDEPENDS_${PN} = "portmap" +RRECOMMENDS_${PN} = "kernel-module-nfsd" -PR = "r0" +PR = "r1"SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ file://nfs-utils-1.0.6-uclibc.patch \meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +0
-0@@ -1,8 +1,8 @@SECTION = "console/network"
DESCRIPTION = "Enables PPP dial-in through a serial connection" DEPENDS = "ppp"meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +2
-2-RDEPENDS = "ppp" -PR = "r5" +RDEPENDS_${PN} = "ppp" +PR = "r6"LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb +0
-0@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"AUTHOR = "Thomas Hood"
HOMEPAGE = "http://packages.debian.org/resolvconf" DEPENDS = "bash"meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb +2
-2-RDEPENDS = "bash" -PR = "r1" +RDEPENDS_${PN} = "bash" +PR = "r2"
SRC_URI= "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"meta/recipes-core/glibc/glibc.inc +0
-0@@ -13,7 +13,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"RDEPENDS_${PN}-dev = "linux-libc-headers-dev" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash"
meta/recipes-core/glibc/glibc.inc +1
-1-#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" +#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv"
meta/recipes-core/glibc/glibc_2.10.1.bb +0
-0@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC= "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"meta/recipes-core/glibc/glibc_2.10.1.bb +1
-1-PR = "r6" +PR = "r7"# the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"meta/recipes-core/initscripts/initscripts_1.0.bb +0
-0@@ -3,10 +3,10 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scripSECTION = "base"
PRIORITY = "required"
DEPENDS = "makedevs"meta/recipes-core/initscripts/initscripts_1.0.bb +1
-1-RDEPENDS = "makedevs" +RDEPENDS_${PN} = "makedevs"LICENSE = "GPLv2"
LIC_FILES_CHKSUM= "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"meta/recipes-core/initscripts/initscripts_1.0.bb +1
-1-PR = "r122" +PR = "r123"SRC_URI = "file://functions \ file://halt \meta/recipes-core/meta/external-python-tarball.bb +0
-0@@ -4,6 +4,8 @@ DEPENDS = "opkg-native opkg-utils-native virtual/fakeroot-native sed-native"inherit meta
meta/recipes-core/meta/external-python-tarball.bb +2
-0+PR = "r1" +
SDK_DIR= "${WORKDIR}/sdk"SDK_OUTPUT= "${SDK_DIR}/image"SDK_DEPLOY= "${TMPDIR}/deploy/sdk"meta/recipes-core/meta/external-python-tarball.bb +0
-0@@ -33,7 +35,7 @@ TOOLCHAIN_HOST_TASK ?= "\
TOOLCHAIN_OUTPUTNAME?= "python-nativesdk-standalone-${SDKMACHINE}"meta/recipes-core/meta/external-python-tarball.bb +1
-1-RDEPENDS = "${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_HOST_TASK}"
EXCLUDE_FROM_WORLD= "1"meta/recipes-core/meta/meta-toolchain.bb +0
-0@@ -17,7 +17,7 @@ TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_AR
TOOLCHAIN_TARGET_TASK?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg"TOOLCHAIN_OUTPUTNAME?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"meta/recipes-core/meta/meta-toolchain.bb +1
-1-RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
EXCLUDE_FROM_WORLD= "1"meta/recipes-core/tasks/task-base.bb +0
-0@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/pLICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"meta/recipes-core/tasks/task-base.bb +1
-1-PR = "r69" +PR = "r70"inherit task
meta/recipes-core/tasks/task-base.bb +2
-2@@ -72,8 +72,8 @@ PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils' # # those ones can be set in machine config to supply packages needed to get machine booting # -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_${PN} ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_${PN} ?= "" # # task-base contain stuff needed for base system (machine related)meta/recipes-core/tasks/task-poky-boot.bb +0
-0@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PACKAGE_ARCH= "${MACHINE_ARCH}"
DEPENDS = "virtual/kernel"ALLOW_EMPTY= "1"meta/recipes-core/tasks/task-poky-boot.bb +1
-1-PR = "r7" +PR = "r8"#
# Set by the machine configuration with packages essential for device bootup #meta/recipes-core/tasks/task-poky-boot.bb +2
-2-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_${PN} ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_${PN} ?= ""RDEPENDS_task-poky-boot = "\ base-files \meta/recipes-devtools/apt/apt_0.7.14.bb +0
-0@@ -1,9 +1,9 @@DEPENDS = "curl db"
meta/recipes-devtools/apt/apt_0.7.14.bb +1
-1-RDEPENDS = "dpkg" +RDEPENDS_${PN} = "dpkg"
LIC_FILES_CHKSUM= "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" require apt.incmeta/recipes-devtools/apt/apt_0.7.14.bb +1
-1-PR = "r3" +PR = "r4"
SRC_URI+= "file://nodoc.patch \
file://includes-fix.patch"meta/recipes-devtools/distcc/distcc_2.18.3.bb +0
-0@@ -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"meta/recipes-devtools/distcc/distcc_2.18.3.bb +1
-1-PR = "r5" +PR = "r6"DEPENDS = "avahi gtk+"
meta/recipes-devtools/distcc/distcc_2.18.3.bb +1
-1-RRECOMMENDS = "avahi-daemon" +RRECOMMENDS_${PN} = "avahi-daemon"# Upstream change this patch periodically so store locally # http://0pointer.de/public/distcc-avahi.patch
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +0
-0@@ -1,6 +1,6 @@require e2fsprogs.inc
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +1
-1-PR = "r19" +PR = "r20"SRC_URI += "file://quotefix.patch;patch=1 \ file://acinclude.m4"meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +1
-1@@ -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"meta/recipes-devtools/intltool/intltool.inc +0
-0@@ -8,8 +8,8 @@ SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"S = "${WORKDIR}/intltool-${PV}"
DEPENDS = "libxml-parser-perl-native"
meta/recipes-devtools/intltool/intltool.inc +2
-2-#RDEPENDS = "libxml-parser-perl" -RRECOMMENDS = "perl-modules" +#RDEPENDS_${PN} = "libxml-parser-perl" +RRECOMMENDS_${PN} = "perl-modules"inherit autotools pkgconfig
meta/recipes-devtools/intltool/intltool_0.40.6.bb +0
-0@@ -1,7 +1,7 @@require intltool.inc
LICENSE="GPLv2"LIC_FILES_CHKSUM= "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"meta/recipes-devtools/intltool/intltool_0.40.6.bb +1
-1-PR = "r0" +PR = "r1"
SRC_URI_append= " file://intltool-nowarn-0.40.0.patch"meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +0
-0@@ -5,10 +5,10 @@ PRIORITY = "optional"LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +1
-1-RDEPENDS = "python" +RDEPENDS_${PN} = "python"RDEPENDS_virtclass-native = ""
PV = "0.1.8+svnr${SRCREV}"meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +1
-1-PR = "r1" +PR = "r2"
SRC_URI= "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
file://index-ignore-filenotfound.patch"meta/recipes-devtools/python/python-dbus_0.83.1.bb +0
-0@@ -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"meta/recipes-devtools/python/python-dbus_0.83.1.bb +1
-1-PR = "ml0" +PR = "ml1"
SRC_URI= "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"meta/recipes-devtools/python/python-dbus_0.83.1.bb +0
-0@@ -20,6 +20,6 @@ export HOST_SYSexport
STAGING_LIBDIR
exportSTAGING_INCDIRmeta/recipes-devtools/python/python-dbus_0.83.1.bb +1
-1-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
meta/recipes-devtools/python/python-gst_0.10.19.bb +0
-0@@ -2,8 +2,8 @@ DESCRIPTION = "Python Gstreamer bindings"SECTION = "devel/python"
LICENSE = "LGPLv2.1"
DEPENDS = "gstreamer gst-plugins-base python-pygobject"meta/recipes-devtools/python/python-gst_0.10.19.bb +2
-2-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"meta/recipes-devtools/python/python-imaging_1.1.7.bb +0
-0@@ -4,9 +4,9 @@ PRIORITY = "optional"LICENSE = "MIT"
LIC_FILES_CHKSUM= "file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec" DEPENDS = "freetype jpeg tiff"meta/recipes-devtools/python/python-imaging_1.1.7.bb +1
-1-RDEPENDS = "python-lang python-stringold" +RDEPENDS_${PN} = "python-lang python-stringold"SRCNAME = "Imaging"
meta/recipes-devtools/python/python-imaging_1.1.7.bb +1
-1-PR = "ml0" +PR = "ml1"SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ file://path.patch"meta/recipes-devtools/python/python-pycurl_7.19.0.bb +0
-0@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://README;endline=13;md5=fbfe545b1869617123a08c0983ef17b file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518"DEPENDS = "curl python"
meta/recipes-devtools/python/python-pycurl_7.19.0.bb +1
-1-RDEPENDS = "python-core curl" +RDEPENDS_${PN} = "python-core curl"SRCNAME = "pycurl"
meta/recipes-devtools/python/python-pycurl_7.19.0.bb +1
-1-PR = "r0" +PR = "r1"
SRC_URI= "\
http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \meta/recipes-devtools/python/python-pygtk_2.17.0.bb +0
-0@@ -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"meta/recipes-devtools/python/python-pygtk_2.17.0.bb +1
-1-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"meta/recipes-devtools/python/python-pygtk_2.17.0.bb +1
-1-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 \meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb +0
-0@@ -1,5 +1,5 @@require python-pyrex_${PV}.bb
inherit native
DEPENDS = "python-native"meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb +2
-2-RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1"meta/recipes-devtools/python/python-scons-native_2.0.1.bb +0
-0@@ -1,6 +1,6 @@require python-scons_${PV}.bb
inherit native
DEPENDS = "python-native"meta/recipes-devtools/python/python-scons-native_2.0.1.bb +2
-2-RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1"meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +0
-0@@ -1,7 +1,7 @@DESCRIPTION = "Qemu helper utilities from Poky"
LICENSE = "GPLv2"meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +2
-2-RDEPENDS = "qemu-native" -PR = "r0" +RDEPENDS_${PN} = "qemu-native" +PR = "r1"FILESPATH = "${FILE_DIRNAME}/qemu-helper"
meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb +0
-0@@ -1,7 +1,7 @@DESCRIPTION = "Qemu helper scripts from Poky"
LICENSE = "GPL"meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb +2
-2-RDEPENDS = "qemu-nativesdk" -PR = "r8" +RDEPENDS_${PN} = "qemu-nativesdk" +PR = "r9"FILESPATH = "${FILE_DIRNAME}/qemu-helper"
meta/recipes-devtools/subversion/subversion_1.6.13.bb +0
-0@@ -1,11 +1,11 @@DESCRIPTION = "The Subversion (svn) client"
SECTION = "console/network"
DEPENDS = "apr-util neon"meta/recipes-devtools/subversion/subversion_1.6.13.bb +1
-1-RDEPENDS = "neon" +RDEPENDS_${PN} = "neon"LICENSE = "Apache BSD"
HOMEPAGE = "http://subversion.tigris.org"meta/recipes-devtools/subversion/subversion_1.6.13.bb +1
-1-PR = "r0" +PR = "r1"SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \meta/recipes-devtools/ubootchart/ubootchart_svn.bb +0
-0@@ -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}"meta/recipes-devtools/ubootchart/ubootchart_svn.bb +2
-2-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 \meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +0
-0@@ -3,10 +3,10 @@ SECTION = "console/network"LICENSE = "GPLv2+"
LIC_FILES_CHKSUM= "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +1
-1-RDEPENDS = "pseudo" +RDEPENDS_${PN} = "pseudo"RDEPENDS_virtclass-native = "pseudo-native"
RDEPENDS_virtclass-nativesdk = "pseudo-nativesdk"meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +1
-1-PR = "r1" +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 \meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +0
-0@@ -1,7 +1,9 @@require update-alternatives-dpkg.inc
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +2
-0+PR = "r1" +PROVIDES += "virtual/update-alternatives"
RPROVIDES_${PN} += "update-alternatives"meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +1
-1-EXTRA_RDEPENDS = "perl dpkg" +EXTRA_RDEPENDS_${PN} = "perl dpkg"EXTRA_RDEPENDS_virtclass-native = ""
RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"meta/recipes-extended/libzypp/libzypp_git.bb +0
-0@@ -9,11 +9,11 @@ inherit cmakeDEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev"
# rpmdb2solv from sat-solver is run from libzyppmeta/recipes-extended/libzypp/libzypp_git.bb +1
-1-RDEPENDS = "sat-solver" +RDEPENDS_${PN} = "sat-solver"S = "${WORKDIR}/git"
PV = "0.0-git${SRCPV}"meta/recipes-extended/libzypp/libzypp_git.bb +1
-1-PR = "r3" +PR = "r4"SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \meta/recipes-extended/man-pages/man-pages_3.25.bb +0
-0@@ -4,7 +4,7 @@ SECTION = "console/utils"PRIORITY = "required"
HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPL"meta/recipes-extended/man-pages/man-pages_3.25.bb +1
-1-PR = "r0" +PR = "r1"
LIC_FILES_CHKSUM= "file://README;md5=9dab010c5baa416669e5d17381799dd5"SRC_URI= "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.tar.gz"meta/recipes-extended/man-pages/man-pages_3.25.bb +0
-0@@ -12,7 +12,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.taSRC_URI[md5sum] = "
98ec2324abea77d7a992470dd44d140c"
SRC_URI[sha256sum] = "474242842a78dc2121687b7db6c32b6c78af5458f2bd809e23563dd185e2b169"meta/recipes-extended/man-pages/man-pages_3.25.bb +1
-1-RDEPENDS = "man" +RDEPENDS_${PN} = "man"
do_configure_prepend(){
rm -rfnot_installedmeta/recipes-extended/mc/mc_4.7.3.bb +0
-0@@ -4,7 +4,9 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM= "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "console/utils"
DEPENDS = "ncurses glib-2.0"meta/recipes-extended/mc/mc_4.7.3.bb +3
-1-RDEPENDS = "ncurses-terminfo" +RDEPENDS_${PN} = "ncurses-terminfo" + +PR = "r1"
SRC_URI= "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2"meta/recipes-extended/polkit/polkit_0.99.bb +0
-0@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99"
SRC_URI= "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz"meta/recipes-extended/polkit/polkit_0.99.bb +1
-1-PR = "r0" +PR = "r1"DEPENDS = "libpam expat dbus-glib eggdbus intltool"
meta/recipes-extended/polkit/polkit_0.99.bb +1
-1-RDEPENDS = "libpam" +RDEPENDS_${PN} = "libpam"
EXTRA_OECONF= "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"inherit autotools pkgconfig
meta/recipes-extended/shadow/shadow.inc +0
-0@@ -20,7 +20,7 @@ PAM_PLUGINS = " libpam-runtime \ pam-plugin-rootok"DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
meta/recipes-extended/shadow/shadow.inc +1
-1-RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"# since we deduce from ${SERIAL_CONSOLE} PACKAGE_ARCH = "${MACHINE_ARCH}"meta/recipes-extended/shadow/shadow_4.1.4.2.bb +0
-0@@ -1,6 +1,6 @@require shadow.inc
meta/recipes-extended/shadow/shadow_4.1.4.2.bb +1
-1-PR = "r0" +PR = "r1"SRC_URI += "file://shadow.automake-1.11.patch \ file://shadow-4.1.3-dots-in-usernames.patch \meta/recipes-extended/zypper/zypper_git.bb +0
-0@@ -5,8 +5,8 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM= "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"DEPENDS = "libzypp augeas"
meta/recipes-extended/zypper/zypper_git.bb +2
-2-RRECOMMENDS = "procps" -PR = "r1" +RRECOMMENDS_${PN} = "procps" +PR = "r2"inherit cmake
meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +0
-0@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e"SECTION = "x11/gnome"
DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +3
-3-RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" -PR = "r0" +RDEPENDS_${PN} = "hicolor-icon-theme" +RRECOMMENDS_${PN} = "librsvg-gtk" +PR = "r1"FILES_${PN} += "${datadir}/*"
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +0
-0@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \SECTION = "x11/gnome"
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +1
-1-PR = "r0" +PR = "r1"inherit autotools gnome pkgconfig
DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf"
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +1
-1-RDEPENDS = "libgnome-keyring" +RDEPENDS_${PN} = "libgnome-keyring"
EXTRA_OECONF= "--disable-gtk-doc"meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +0
-0@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \inherit gnome
inherit autotoolsmeta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +1
-1-PR = "r3" +PR = "r4"
SRC_URI+= "file://pkgconfig.patch;patch=1"meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +0
-0@@ -16,4 +16,4 @@ SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c"SRC_URI[archive.sha256sum] = "
37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7"DEPENDS += "shared-mime-info intltool-native"
meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +1
-1-RDEPENDS = "shared-mime-info" +RDEPENDS_${PN} = "shared-mime-info"meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb +0
-0@@ -4,10 +4,10 @@ DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-nativS = "${WORKDIR}/gtk+-${PV}"
FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"SRC_URI+= "file://reduce-dependencies.patch;patch=1"meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb +1
-1-PR = "r11" +PR = "r13"#clear recommends for uclibc builds
meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb +1
-1-RRECOMMENDS = " " +RRECOMMENDS_${PN} = " "RRECOMMENDS_${PN}_linux = " "
RRECOMMENDS_${PN}_linux-gnueabi = " "meta/recipes-gnome/gtk+/gtk+.inc +1
-1@@ -35,7 +35,7 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" -BASE_RRECOMMENDS = "ttf-dejavu-sans" +BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans"
BASE_RRECOMMENDS_angstrom= "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"BASE_RRECOMMENDS_poky= "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"BASE_RRECOMMENDS_moblin= "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +0
-0@@ -1,6 +1,6 @@require gtk+.inc
meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +1
-1-PR = "r9" +PR = "r10"SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +0
-0@@ -1,6 +1,6 @@require gtk+.inc
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +1
-1-PR = "r5" +PR = "r6"SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \meta/recipes-gnome/gtk+/gtk+_2.20.1.bb +1
-1@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" -PR = "r1" +PR = "r2" SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +0
-0@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHandLICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +1
-1-PR = "r9" +PR = "r10"
ALLOW_EMPTY= "1"meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +0
-0@@ -14,7 +14,7 @@ require task-sdk-gmae.incPACKAGES = "${PN}"
meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +1
-1-RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-sdk \ libglade-dev \ ${SDK-GMAE} \meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +0
-0@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHandLICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +1
-1-PR = "r11" +PR = "r12"
ALLOW_EMPTY= "1"meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +0
-0@@ -14,7 +14,7 @@ require task-sdk-gmae.incPACKAGES = "${PN} ${PN}-dbg"
meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +1
-1-RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-standalone-sdk-target \ libglade-dev \ ${SDK-GMAE} \meta/recipes-graphics/cairo/cairo_1.10.0.bb +0
-0@@ -2,14 +2,14 @@ require cairo.inc
LIC_FILES_CHKSUM= "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"meta/recipes-graphics/cairo/cairo_1.10.0.bb +1
-1-PR = "r0" +PR = "r1"
SRC_URI= "http://cairographics.org/releases/cairo-${PV}.tar.gz"SRC_URI[md5sum] = "
70a2ece66cf473d976e2db0f75bf199e"
SRC_URI[sha256sum] = "0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2"meta/recipes-graphics/cairo/cairo_1.10.0.bb +1
-1-RDEPENDS += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ +RDEPENDS_${PN} += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \cairo-perf-utils"
ALLOW_EMPTY= "1"meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +0
-0@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.libsdl.org"SECTION = "libs"
LICENSE = "LGPL"
DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk"meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2
-2-RDEPENDS = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" -PR = "r4" +RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" +PR = "r5"SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb +0
-0@@ -3,8 +3,9 @@ require xorg-app-common.incDESCRIPTION = "a program to create an index of X font files in a directory"
PE = "1"
meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb +2
-1+PR = "r1" -RDEPENDS += "mkfontscale" +RDEPENDS_${PN} += "mkfontscale"BBCLASSEXTEND = "native"
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +0
-0@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb"DEPENDS = "virtual/xserver font-util"
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +1
-1-RDEPENDS = "encodings font-util" +RDEPENDS_${PN} = "encodings font-util"RDEPENDS_virtclass-native = "font-util"
PE = "1"
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +1
-1-PR = "${INC_PR}.0" +PR = "${INC_PR}.1"SRC_URI[md5sum] = "
6d25f64796fef34b53b439c2e9efa562"
SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +0
-0@@ -12,10 +12,10 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"DEPENDS = "encodings util-macros"
DEPENDS_virtclass-native = "util-macros-native"meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +1
-1-RDEPENDS = "mkfontdir mkfontscale encodings" +RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"RDEPENDS_virtclass-native = "mkfontdir-native mkfontscale-native"
meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +1
-1-PR = "${INC_PR}.0" +PR = "${INC_PR}.1"do_configure_prepend() { sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.inmeta/recipes-graphics/xorg-font/xorg-font-common.inc +0
-0@@ -5,10 +5,10 @@ SECTION = "x11/fonts"LICENSE = "MIT-X"
DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
meta/recipes-graphics/xorg-font/xorg-font-common.inc +1
-1-RDEPENDS = "encodings font-util font-alias" +RDEPENDS_${PN} = "encodings font-util font-alias"
XORG_PN= "${BPN}"meta/recipes-graphics/xorg-font/xorg-font-common.inc +1
-1-INC_PR = "r1" +INC_PR = "r2"
SRC_URI= "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}"meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb +0
-0@@ -2,9 +2,9 @@ require xorg-util-common.inc
LIC_FILES_CHKSUM= "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" DESCRIPTION = "create dependencies in makefiles using 'gcc -M'"
DEPENDS = "util-macros"meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb +2
-2-RDEPENDS = "gcc" +RDEPENDS_${PN} = "gcc" -PR = "r2" +PR = "r3"PE = "1"
SRC_URI[md5sum] = "
fc49f45251c1336fe1dad5dba1c83fcd"meta/recipes-graphics/xorg-util/imake_1.0.4.bb +0
-0@@ -2,11 +2,11 @@ require xorg-util-common.incDESCRIPTION = "C preprocessor interface to the make utility" DEPENDS = "util-macros"
meta/recipes-graphics/xorg-util/imake_1.0.4.bb +1
-1-RDEPENDS = "perl xproto" +RDEPENDS_${PN} = "perl xproto"
LIC_FILES_CHKSUM= "file://COPYING;md5=b9c6cfb044c6d0ff899eaafe4c729367"meta/recipes-graphics/xorg-util/imake_1.0.4.bb +1
-1-PR = "r0" +PR = "r1"PE = "1"
SRC_URI[md5sum] = "
0fd1e53d94142ddee5340f87de0b9561"meta/recipes-kernel/oprofile/oprofile_0.9.6.bb +0
-0@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \SECTION = "devel"
DEPENDS = "popt binutils"
meta/recipes-kernel/oprofile/oprofile_0.9.6.bb +3
-3-RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" +RDEPENDS_${PN} = "binutils-symlinks" +RRECOMMENDS_${PN} = "kernel-vmlinux" -PR = "r0" +PR = "r1"SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://opstart.patch \meta/recipes-kernel/oprofile/oprofile_cvs.bb +0
-0@@ -1,13 +1,13 @@PV = "0.9.4+cvs${SRCDATE}"
meta/recipes-kernel/oprofile/oprofile_cvs.bb +1
-1-PR = "r0" +PR = "r1"SECTION = "devel"
SUMMARY = "System-Wide Profiler"
DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
of profiling all running code at low overhead."
LICENSE = "GPL"
DEPENDS = "popt binutils"meta/recipes-kernel/oprofile/oprofile_cvs.bb +2
-2-RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" +RDEPENDS_${PN} = "binutils-symlinks" +RRECOMMENDS_${PN} = "kernel-vmlinux"
DEFAULT_PREFERENCE= "-1"meta/recipes-kernel/update-modules/update-modules_1.0.bb +0
-0@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM= "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
PACKAGE_ARCH= "all"meta/recipes-kernel/update-modules/update-modules_1.0.bb +2
-2-RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r7" +RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " +PR = "r8"SRC_URI = "file://update-modules \ file://COPYING.GPL"meta/recipes-kernel/update-modules/update-modules_1.0.bb +1
-1@@ -25,7 +25,7 @@ do_install() { # The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which # supports both 2.4 and 2.6 kernels. Rather than forcing OE to have # to deal with that unique legacy corner case, we just nullify the -# RDEPENDS here and handle it in the Unslung image recipe. I know this +# RDEPENDS_${PN} here and handle it in the Unslung image recipe. I know this # is ugly. Please don't remove it unless you first make the RDEPENDS # line at the top of this file understand that a machine can be used # in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it'smeta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb +0
-0@@ -1,5 +1,5 @@DEPENDS = "gstreamer"
meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb +1
-1-RDEPENDS = "libomxil" +RDEPENDS_${PN} = "libomxil"LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb +0
-0@@ -10,7 +10,7 @@ inherit autotools
EXTRA_OECONF+= "--disable-valgrind"meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb +1
-1-PR = "r0" +PR = "r1"FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so" FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.*a"
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +0
-0@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi"
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +1
-1-RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ +RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ gnome-vfs-plugin-sftp"
SRC_URI+= " file://gst-plugins-base-tremor.patch \meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +0
-0@@ -16,7 +16,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch \SRC_URI[md5sum] = "
3ad90152b58563e1314af26c263f3c4c"
SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7"meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +1
-1-PR = "r2" +PR = "r3"inherit gettext
meta/recipes-qt/qt-apps/fotowall_0.9.bb +0
-0@@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \ file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"SECTION = "x11/apps"
meta/recipes-qt/qt-apps/fotowall_0.9.bb +2
-0+PR = "r1" +DEPENDS = "qt4-x11-free"
meta/recipes-qt/qt-apps/fotowall_0.9.bb +1
-1-RDEPENDS = "qt4-x11-free" +RDEPENDS_${PN} = "qt4-x11-free"
SRC_URI= "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"meta/recipes-qt/qt-apps/qmmp_0.4.1.bb +0
-0@@ -4,10 +4,10 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM= "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "multimedia"meta/recipes-qt/qt-apps/qmmp_0.4.1.bb +1
-1-PR = "r1" +PR = "r2"DEPENDS = "qt4-x11-free taglib"
meta/recipes-qt/qt-apps/qmmp_0.4.1.bb +1
-1-RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" +RDEPENDS_${PN} = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl"
SRC_URI= "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2"meta/recipes-qt/qt-apps/quicky_0.4.bb +0
-0@@ -4,8 +4,10 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM= "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14" SECTION = "x11/apps"meta/recipes-qt/qt-apps/quicky_0.4.bb +2
-0+PR = "r1" +DEPENDS = "qt4-x11-free"
meta/recipes-qt/qt-apps/quicky_0.4.bb +1
-1-RDEPENDS = "qt4-x11-free" +RDEPENDS_${PN} = "qt4-x11-free"
SRC_URI= "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"meta/recipes-sato/eds/eds-tools_bzr.bb +0
-0@@ -1,10 +1,10 @@LICENSE = "GPLv2"
SECTION = "x11"
DEPENDS = "dbus-glib eds-dbus"meta/recipes-sato/eds/eds-tools_bzr.bb +1
-1-RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book"DESCRIPTION = "Test applications for EDS"
meta/recipes-sato/eds/eds-tools_bzr.bb +1
-1-PR = "r0" +PR = "r1"
SRC_URI= "bzr://burtonini.com/bzr/eds-tools;proto=http"meta/recipes-sato/gaku/gaku_svn.bb +0
-0@@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a"DEPENDS = "gtk+ gstreamer libowl-av"
meta/recipes-sato/gaku/gaku_svn.bb +2
-2-RDEPENDS = "gst-plugins-base-audioconvert \ +RDEPENDS_${PN} = "gst-plugins-base-audioconvert \ gst-plugins-base-audioresample \ gst-plugins-base-typefindfunctions \ gst-plugins-base-playbin" -RRECOMMENDS = "gst-plugins-good-id3demux \ +RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ gst-plugins-base-vorbis \ gst-plugins-base-alsa \ gst-plugins-base-ogg \@@ -17,7 +17,7 @@ RRECOMMENDS = "gst-plugins-good-id3demux \PV = "0.0+svnr${SRCREV}"
meta/recipes-sato/gaku/gaku_svn.bb +1
-1-PR = "r3" +PR = "r4"
SRC_URI= "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb +0
-0@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28"DEPENDS = "gconf gtk+"
meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb +1
-1-RDEPENDS = "settings-daemon" +RDEPENDS_${PN} = "settings-daemon"PV = "0.0+svnr${SRCREV}"
+PR = "r1"S = "${WORKDIR}/${PN}"
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb +0
-0@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb +1
-1-RDEPENDS = "formfactor dbus-wait" +RDEPENDS_${PN} = "formfactor dbus-wait"SECTION = "x11"
PV = "0.0+svnr${SRCREV}"meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb +1
-1-PR = "r4" +PR = "r5"SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://configure_fix.patch;patch=1;maxrev=1819 \meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +0
-0@@ -6,8 +6,8 @@ LICENSE = "GPL"
LIC_FILES_CHKSUM= "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63"SECTION = "x11"
meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +2
-2-RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" -PR = "r27" +RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" +PR = "r28"# This package is architecture specific because the session script is modified
# based on the machine architecture.meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +0
-0@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \SECTION = "x11"
DEPENDS = "gtk+ gstreamer gst-plugins-base"meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +2
-2-RDEPENDS = "gst-meta-base" -RRECOMMENDS = "gst-meta-audio gst-meta-video" +RDEPENDS_${PN} = "gst-meta-base" +RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"PV = "0.0+svnr${SRCREV}"
meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +1
-1-PR = "r5" +PR = "r6"S = "${WORKDIR}/${PN}"
meta/recipes-sato/pimlico/contacts.inc +0
-0@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ eds-dbus"DEPENDS_append_poky= " libowl"meta/recipes-sato/pimlico/contacts.inc +1
-1-RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book"inherit autotools pkgconfig
meta/recipes-sato/pimlico/contacts_0.9.bb +0
-0@@ -1,5 +1,5 @@require contacts.inc
meta/recipes-sato/pimlico/contacts_0.9.bb +1
-1-PR = "r2" +PR = "r3"
SRC_URI=+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"meta/recipes-sato/pimlico/contacts_git.bb +0
-0@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"PV = "0.12+git${SRCPV}"
meta/recipes-sato/pimlico/contacts_git.bb +1
-1-PR = "r1" +PR = "r2"S = "${WORKDIR}/git"
meta/recipes-sato/pimlico/dates.inc +0
-0@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"meta/recipes-sato/pimlico/dates.inc +1
-1-RDEPENDS = "libedata-cal" +RDEPENDS_${PN} = "libedata-cal"inherit autotools pkgconfig gtk-icon-cache
meta/recipes-sato/pimlico/dates_0.4.8.bb +0
-0@@ -1,5 +1,5 @@require dates.inc
meta/recipes-sato/pimlico/dates_0.4.8.bb +1
-1-PR = "r3" +PR = "r4"
SRC_URI= "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"meta/recipes-sato/pimlico/dates_git.bb +0
-0@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"PV = "0.4.11+git${SRCPV}"
meta/recipes-sato/pimlico/dates_git.bb +1
-1-PR = "r1" +PR = "r2"S = "${WORKDIR}/git"
meta/recipes-support/enchant/enchant_1.6.0.bb +0
-0@@ -6,11 +6,11 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \ file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18"DEPENDS = "aspell glib-2.0"
meta/recipes-support/enchant/enchant_1.6.0.bb +1
-1-RDEPENDS = "aspell" +RDEPENDS_${PN} = "aspell"inherit autotools pkgconfig
meta/recipes-support/enchant/enchant_1.6.0.bb +1
-1-PR = "r0" +PR = "r1"
SRC_URI= "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"meta/recipes-support/hal/hal.inc +0
-0@@ -7,7 +7,7 @@ LICENSE = "GPLv2+ | AFL"
LIC_FILES_CHKSUM= "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31"DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native"
meta/recipes-support/hal/hal.inc +1
-1-RDEPENDS += "udev hal-info" +RDEPENDS_${PN} += "udev hal-info"SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ file://20hal"meta/recipes-support/hal/hal_0.5.14.bb +0
-0@@ -1,6 +1,6 @@require hal.inc
meta/recipes-support/hal/hal_0.5.14.bb +1
-1-PR = "r2" +PR = "r3"
EXTRA_OECONF+= "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"EXTRA_OEMAKE+= "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"meta/recipes-support/hal/hal_git.bb +0
-0@@ -1,7 +1,7 @@require hal.inc
PV = "0.5.9.1+git${SRCDATE}"
meta/recipes-support/hal/hal_git.bb +1
-1-PR = "r7" +PR = "r8"SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ file://20hal \Signature · 1 line
1.6.6.1
Re: [RFC][PATCH] RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
In reply to Koen KooiQuoted 3 lines · Koen Kooi
From: Koen Kooi <[email protected]>
For these recipes the depencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
Patch looks good overall. I spotted a few things as I read through it:
meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb Linux operating system." · line 9
Quoted 11 lines
meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +1
-1@@ -5,9 +5,9 @@ Linux operating system." HOMEPAGE = "http://www.openswan.org" LICENSE = "GPLv2" DEPENDS = "gmp flex-native" -RRECOMMENDS = "kernel-module-ipsec" +RRECOMMENDS_${PN} = "kernel-module-ipsec" RDEPENDS_nylon = "perl"
This should probably become:
RDEPENDS_${PN}_append_nylon = "perl"
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb line 5
Quoted 11 lines
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +1
-1@@ -1,5 +1,5 @@ require abiword-2.5.inc -PR = "r1" +PR = "r2" RCONFLICTS = "abiword-embedded"
RCONFLICTS_${PN} = "abiword-embedded"
meta/recipes-connectivity/avahi/avahi.inc PRIORITY = "optional" · line 20
Quoted 11 lines
meta/recipes-connectivity/avahi/avahi.inc +1
-1@@ -16,7 +16,7 @@ PRIORITY = "optional" LICENSE = "GPLv2+ & LGPLv2.1+" DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade" -RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_${PN} = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns"
Hmm, which bit of avahi needs this? This looks a little odd...
meta/recipes-connectivity/gsm/gsmd.inc SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ · line 24
Quoted 12 lines
meta/recipes-connectivity/gsm/gsmd.inc +1
-1@@ -19,7 +19,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ S = "${WORKDIR}/gsm" inherit autotools pkgconfig update-rc.d -# handle update-rc.d RDEPENDS manually, we don't need it on +# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on # anything but gsmd RDEPENDS_append = ""
This looks like some kind of bug waiting to be fixed...
Quoted 18 lines
meta/recipes-core/glibc/glibc.inc +1
-1@@ -13,7 +13,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" -#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" +#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv"meta/recipes-core/glibc/glibc_2.10.1.bb +0
-0
meta/recipes-core/glibc/glibc_2.10.1.bb ARM_INSTRUCTION_SET = "arm" · line 11
Quoted 8 lines
meta/recipes-core/glibc/glibc_2.10.1.bb +1
-1@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r6" +PR = "r7" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
Lets drop the PR bump for a change in the comments :)
Quoted 14 lines
meta/recipes-core/meta/external-python-tarball.bb +2
-0@@ -4,6 +4,8 @@ DEPENDS = "opkg-native opkg-utils-native virtual/fakeroot-native sed-native" inherit meta +PR = "r1" + SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
meta/recipes-core/meta/external-python-tarball.bb TOOLCHAIN_HOST_TASK ?= "\ · line 40
Quoted 7 lines
meta/recipes-core/meta/external-python-tarball.bb +1
-1@@ -33,7 +35,7 @@ TOOLCHAIN_HOST_TASK ?= "\ TOOLCHAIN_OUTPUTNAME ?= "python-nativesdk-standalone-${SDKMACHINE}" -RDEPENDS = "${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_HOST_TASK}" EXCLUDE_FROM_WORLD = "1"
Since PACKAGES = "" in this case, I think the RDEPENDS here is valid.
meta/recipes-core/meta/meta-toolchain.bb TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_AR · line 22
Quoted 12 lines
meta/recipes-core/meta/meta-toolchain.bb +1
-1@@ -17,7 +17,7 @@ TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_AR TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" -RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" EXCLUDE_FROM_WORLD = "1"
and here.
Quoted 14 lines
meta/recipes-core/tasks/task-base.bb +1
-1@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r69" +PR = "r70" inherit task
meta/recipes-core/tasks/task-base.bb PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils' · line 76
Quoted 7 lines
meta/recipes-core/tasks/task-base.bb +2
-2@@ -72,8 +72,8 @@ PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils' # # those ones can be set in machine config to supply packages needed to get machine booting # -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_${PN} ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_${PN} ?= ""
This isn't necessary...
Quoted 13 lines
meta/recipes-core/tasks/task-base.bb +0
-0# # task-base contain stuff needed for base system (machine related)meta/recipes-core/tasks/task-poky-boot.bb +1
-1@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" ALLOW_EMPTY = "1" -PR = "r7" +PR = "r8"
meta/recipes-core/tasks/task-poky-boot.bb LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 · line 21
Quoted 10 lines
meta/recipes-core/tasks/task-poky-boot.bb +2
-2# # Set by the machine configuration with packages essential for device bootup # -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_${PN} ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_${PN} ?= "" RDEPENDS_task-poky-boot = "\ base-files \
likewise
Quoted 13 lines
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +1
-1@@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r19" +PR = "r20" SRC_URI += "file://quotefix.patch;patch=1 \ file://acinclude.m4"
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb do_install () { · line 39
Quoted 7 lines
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +1
-1@@ -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"
no PR bump needed.
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb PRIORITY = "optional" · line 9
Quoted 11 lines
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +1
-1@@ -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_${PN} = "python" RDEPENDS_virtclass-native = ""
Need to change this to:
RDEPENDS_${PN}_virtclass-native = ""
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb SECTION = "console/network" · line 8
Quoted 12 lines
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +1
-1@@ -3,10 +3,10 @@ SECTION = "console/network" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -RDEPENDS = "pseudo" +RDEPENDS_${PN} = "pseudo" RDEPENDS_virtclass-native = "pseudo-native" RDEPENDS_virtclass-nativesdk = "pseudo-nativesdk"
Need to add ${PN} to the virtclass versions.
Quoted 5 lines
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +0
-0
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb line 9
Quoted 10 lines
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +3
-1@@ -1,7 +1,9 @@ require update-alternatives-dpkg.inc +PR = "r1" + PROVIDES += "virtual/update-alternatives" RPROVIDES_${PN} += "update-alternatives" -EXTRA_RDEPENDS = "perl dpkg" +EXTRA_RDEPENDS_${PN} = "perl dpkg" EXTRA_RDEPENDS_virtclass-native = "" RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
No change needed here :)
meta/recipes-gnome/gtk+/gtk+.inc FILES_${PN}-dbg += " \ · line 41
Quoted 13 lines
meta/recipes-gnome/gtk+/gtk+.inc +1
-1@@ -35,7 +35,7 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" -BASE_RRECOMMENDS = "ttf-dejavu-sans" +BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans" BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" BASE_RRECOMMENDS_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
Need to add ${PN} into these. We should really consider changing the default here...
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ · line 14
Quoted 11 lines
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +1
-1@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" DEPENDS = "virtual/xserver font-util" -RDEPENDS = "encodings font-util" +RDEPENDS_${PN} = "encodings font-util" RDEPENDS_virtclass-native = "font-util"
another virtclass to add ${PN} into.
Quoted 11 lines
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +1
-1PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +0
-0
meta/recipes-graphics/xorg-font/font-util_1.2.0.bb PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" · line 16
Quoted 6 lines
meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +1
-1@@ -12,10 +12,10 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" DEPENDS = "encodings util-macros" DEPENDS_virtclass-native = "util-macros-native" -RDEPENDS = "mkfontdir mkfontscale encodings" +RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" RDEPENDS_virtclass-native = "mkfontdir-native mkfontscale-native"
and here
Cheers,
Richard
Re: [RFC][PATCH] RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
Op 23 dec 2010, om 15:09 heeft Richard Purdie het volgende geschreven:
Quoted 21 lines · Koen Kooi
Quoted 3 lines
From: Koen Kooi <[email protected]>
For these recipes the depencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
Patch looks good overall. I spotted a few things as I read through it:
Quoted 11 lines
meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +0
-0@@ -5,9 +5,9 @@ Linux operating system."HOMEPAGE = "http://www.openswan.org"
LICENSE = "GPLv2"
DEPENDS = "gmp flex-native"meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +1
-1-RRECOMMENDS = "kernel-module-ipsec" +RRECOMMENDS_${PN} = "kernel-module-ipsec"
RDEPENDS_nylon= "perl"This should probably become:
Quoted 1 line
RDEPENDS_${PN}_append_nylon = "perl"
fixed
Quoted 7 lines
Quoted 7 lines
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +0
-0@@ -1,5 +1,5 @@require abiword-2.5.inc
Quoted 6 lines
Quoted 4 lines
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +1
-1-PR = "r1" +PR = "r2"RCONFLICTS = "abiword-embedded"
RCONFLICTS_${PN} = "abiword-embedded"
fixed
Quoted 7 lines
Quoted 7 lines
meta/recipes-connectivity/avahi/avahi.inc +0
-0@@ -16,7 +16,7 @@ PRIORITY = "optional"LICENSE = "GPLv2+ & LGPLv2.1+"
Quoted 6 lines
Quoted 4 lines
DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
meta/recipes-connectivity/avahi/avahi.inc +1
-1-RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_${PN} = "libnss-mdns"RRECOMMENDS_avahi-daemon = "libnss-mdns"
Hmm, which bit of avahi needs this? This looks a little odd...
It's an nss plugin, I install it so ssh can resolve .local addresses, not sure if avahi actually needs it. Any suggestions?
Quoted 7 lines
meta/recipes-connectivity/gsm/gsmd.inc +0
-0Quoted 6 lines
index 9818188..385c40e 100644
meta/recipes-connectivity/gsm/gsmd.inc +0
-0@@ -19,7 +19,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \S = "${WORKDIR}/gsm"
Quoted 7 lines
Quoted 5 lines
inherit autotools pkgconfig update-rc.d
meta/recipes-connectivity/gsm/gsmd.inc +1
-1-# handle update-rc.d RDEPENDS manually, we don't need it on +# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on# anything but gsmd RDEPENDS_append = ""This looks like some kind of bug waiting to be fixed...
Not sure what you want me to do here :)
Quoted 21 lines
meta/recipes-core/glibc/glibc.inc +0
-0Quoted 20 lines
index ecaf593..e2b681f 100644
meta/recipes-core/glibc/glibc.inc +0
-0@@ -13,7 +13,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"RDEPENDS_${PN}-dev = "linux-libc-headers-dev" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash"
meta/recipes-core/glibc/glibc.inc +1
-1-#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" +#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv"
meta/recipes-core/glibc/glibc_2.10.1.bb +0
-0@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC= "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
Quoted 7 lines
Quoted 5 lines
meta/recipes-core/glibc/glibc_2.10.1.bb +1
-1-PR = "r6" +PR = "r7"# the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"Lets drop the PR bump for a change in the comments :)
fixed
Quoted 15 lines
Quoted 15 lines
meta/recipes-core/meta/external-python-tarball.bb +0
-0@@ -4,6 +4,8 @@ DEPENDS = "opkg-native opkg-utils-native virtual/fakeroot-native sed-native"inherit meta
meta/recipes-core/meta/external-python-tarball.bb +2
-0+PR = "r1" +
SDK_DIR= "${WORKDIR}/sdk"SDK_OUTPUT= "${SDK_DIR}/image"SDK_DEPLOY= "${TMPDIR}/deploy/sdk"meta/recipes-core/meta/external-python-tarball.bb +0
-0@@ -33,7 +35,7 @@ TOOLCHAIN_HOST_TASK ?= "\
Quoted 8 lines
Quoted 6 lines
TOOLCHAIN_OUTPUTNAME?= "python-nativesdk-standalone-${SDKMACHINE}"meta/recipes-core/meta/external-python-tarball.bb +1
-1-RDEPENDS = "${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_HOST_TASK}"
EXCLUDE_FROM_WORLD= "1"Since PACKAGES = "" in this case, I think the RDEPENDS here is valid.
fixed
Quoted 8 lines
Quoted 8 lines
meta/recipes-core/meta/meta-toolchain.bb +0
-0@@ -17,7 +17,7 @@ TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_AR
TOOLCHAIN_TARGET_TASK?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg"TOOLCHAIN_OUTPUTNAME?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
Quoted 6 lines
Quoted 4 lines
meta/recipes-core/meta/meta-toolchain.bb +1
-1-RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" +RDEPENDS_${PN} = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
EXCLUDE_FROM_WORLD= "1"and here.
fixed
Quoted 13 lines
meta/recipes-core/tasks/task-base.bb +0
-0Quoted 12 lines
index d613bb2..4f8c8d8 100644
meta/recipes-core/tasks/task-base.bb +0
-0@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/pLICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"meta/recipes-core/tasks/task-base.bb +1
-1-PR = "r69" +PR = "r70"inherit task
Quoted 10 lines
meta/recipes-core/tasks/task-base.bb PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils' · line 76
Quoted 8 lines
meta/recipes-core/tasks/task-base.bb +2
-2@@ -72,8 +72,8 @@ PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils' # # those ones can be set in machine config to supply packages needed to get machine booting # -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_${PN} ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_${PN} ?= ""This isn't necessary...
fixed
Quoted 22 lines
Quoted 22 lines
meta/recipes-core/tasks/task-base.bb +0
-0# # task-base contain stuff needed for base system (machine related)meta/recipes-core/tasks/task-poky-boot.bb +0
-0@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PACKAGE_ARCH= "${MACHINE_ARCH}"
DEPENDS = "virtual/kernel"ALLOW_EMPTY= "1"meta/recipes-core/tasks/task-poky-boot.bb +1
-1-PR = "r7" +PR = "r8"#
# Set by the machine configuration with packages essential for device bootup #meta/recipes-core/tasks/task-poky-boot.bb +2
-2-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_${PN} ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_${PN} ?= ""
Quoted 4 lines
Quoted 2 lines
RDEPENDS_task-poky-boot = "\ base-files \likewise
fixed
Quoted 16 lines
Quoted 16 lines
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +0
-0@@ -1,6 +1,6 @@require e2fsprogs.inc
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +1
-1-PR = "r19" +PR = "r20"SRC_URI += "file://quotefix.patch;patch=1 \ file://acinclude.m4"meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +0
-0@@ -34,7 +34,7 @@ do_install () { }
Quoted 7 lines
Quoted 5 lines
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +1
-1# 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"no PR bump needed.
fixed
Quoted 14 lines
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +0
-0Quoted 10 lines
index 087d254..2c19b39 100644
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +0
-0@@ -5,10 +5,10 @@ PRIORITY = "optional"LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +1
-1-RDEPENDS = "python" +RDEPENDS_${PN} = "python"RDEPENDS_virtclass-native = ""
Need to change this to:
Quoted 1 line
RDEPENDS_${PN}_virtclass-native = ""
fixed
Quoted 9 lines
Quoted 9 lines
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +0
-0@@ -3,10 +3,10 @@ SECTION = "console/network"LICENSE = "GPLv2+"
LIC_FILES_CHKSUM= "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
Quoted 6 lines
Quoted 4 lines
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +1
-1-RDEPENDS = "pseudo" +RDEPENDS_${PN} = "pseudo"RDEPENDS_virtclass-native = "pseudo-native"
RDEPENDS_virtclass-nativesdk = "pseudo-nativesdk"Need to add ${PN} to the virtclass versions.
fixed, and that recipe seems to violate the OE versioning policy, which I didn't fix.
Quoted 8 lines
Quoted 8 lines
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +0
-0@@ -1,7 +1,9 @@require update-alternatives-dpkg.inc
Quoted 10 lines
Quoted 8 lines
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +2
-0+PR = "r1" +PROVIDES += "virtual/update-alternatives"
RPROVIDES_${PN} += "update-alternatives"meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb +1
-1-EXTRA_RDEPENDS = "perl dpkg" +EXTRA_RDEPENDS_${PN} = "perl dpkg"EXTRA_RDEPENDS_virtclass-native = ""
RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"No change needed here :)
fixed
Quoted 9 lines
Quoted 9 lines
meta/recipes-gnome/gtk+/gtk+.inc +0
-0@@ -35,7 +35,7 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
Quoted 8 lines
Quoted 5 lines
meta/recipes-gnome/gtk+/gtk+.inc +1
-1-BASE_RRECOMMENDS = "ttf-dejavu-sans" +BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans"
BASE_RRECOMMENDS_angstrom= "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"BASE_RRECOMMENDS_poky= "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"BASE_RRECOMMENDS_moblin= "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"Need to add ${PN} into these. We should really consider changing the default here...
fixed the PN part, not the default setting
Quoted 8 lines
Quoted 8 lines
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +0
-0@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb"
Quoted 6 lines
Quoted 4 lines
DEPENDS = "virtual/xserver font-util"
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +1
-1-RDEPENDS = "encodings font-util" +RDEPENDS_${PN} = "encodings font-util"RDEPENDS_virtclass-native = "font-util"
another virtclass to add ${PN} into.
fixed
Quoted 12 lines
PE = "1"
Quoted 11 lines
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +1
-1-PR = "${INC_PR}.0" +PR = "${INC_PR}.1"SRC_URI[md5sum] = "
6d25f64796fef34b53b439c2e9efa562"
SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +0
-0@@ -12,10 +12,10 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
Quoted 7 lines
Quoted 5 lines
DEPENDS = "encodings util-macros"
DEPENDS_virtclass-native = "util-macros-native"meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +1
-1-RDEPENDS = "mkfontdir mkfontscale encodings" +RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"RDEPENDS_virtclass-native = "mkfontdir-native mkfontscale-native"
and here
and fixed!!
Quoted 6 lines
Cheers,
Richard
Re: [RFC][PATCH] RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
Quoted 10 lines · Koen Kooi
Op 23 dec 2010, om 15:09 heeft Richard Purdie het volgende geschreven:
Quoted 8 lines · Koen Kooi
Quoted 7 lines
meta/recipes-connectivity/avahi/avahi.inc +0
-0@@ -16,7 +16,7 @@ PRIORITY = "optional"LICENSE = "GPLv2+ & LGPLv2.1+"
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
meta/recipes-connectivity/avahi/avahi.inc +1
-1-RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_${PN} = "libnss-mdns"RRECOMMENDS_avahi-daemon = "libnss-mdns"
Hmm, which bit of avahi needs this? This looks a little odd...
It's an nss plugin, I install it so ssh can resolve .local addresses, not sure if avahi actually needs it. Any suggestions?
I've left the patch as is for now, I think this is perhaps correct as it ensures the name resolution is available for both the client lib and the daemon.
Quoted 15 lines
Quoted 7 lines
meta/recipes-connectivity/gsm/gsmd.inc +0
-0Quoted 6 lines
index 9818188..385c40e 100644
meta/recipes-connectivity/gsm/gsmd.inc +0
-0@@ -19,7 +19,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \S = "${WORKDIR}/gsm"
Quoted 7 lines
Quoted 5 lines
inherit autotools pkgconfig update-rc.d
meta/recipes-connectivity/gsm/gsmd.inc +1
-1-# handle update-rc.d RDEPENDS manually, we don't need it on +# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on# anything but gsmd RDEPENDS_append = ""This looks like some kind of bug waiting to be fixed...
Quoted 1 line
Not sure what you want me to do here :)
I pushed a separate fix for gsmd andupdate-rc.d.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +0
-0@@ -3,10 +3,10 @@ SECTION = "console/network"LICENSE = "GPLv2+"
LIC_FILES_CHKSUM= "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +1
-1-RDEPENDS = "pseudo" +RDEPENDS_${PN} = "pseudo"RDEPENDS_virtclass-native = "pseudo-native"
RDEPENDS_virtclass-nativesdk = "pseudo-nativesdk"Need to add ${PN} to the virtclass versions.
fixed, and that recipe seems to violate the OE versioning policy, which I didn't fix.
Hmm, it does, yes. I've fixed this.
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-gnome/gtk+/gtk+.inc +0
-0@@ -35,7 +35,7 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"Quoted 8 lines
Quoted 5 lines
meta/recipes-gnome/gtk+/gtk+.inc +1
-1-BASE_RRECOMMENDS = "ttf-dejavu-sans" +BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans"
BASE_RRECOMMENDS_angstrom= "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"BASE_RRECOMMENDS_poky= "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"BASE_RRECOMMENDS_moblin= "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"Need to add ${PN} into these. We should really consider changing the default here...
Quoted 1 line
fixed the PN part, not the default setting
It raises the horrible question about what the default should be I guess (again) :/.
Cheers,
Richard
Re: [RFC][PATCH] RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
Op 30 dec 2010, om 11:13 heeft Richard Purdie het volgende geschreven:
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
Quoted 5 lines
meta/recipes-gnome/gtk+/gtk+.inc +1
-1-BASE_RRECOMMENDS = "ttf-dejavu-sans" +BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans"
BASE_RRECOMMENDS_angstrom= "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"BASE_RRECOMMENDS_poky= "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"BASE_RRECOMMENDS_moblin= "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"Need to add ${PN} into these. We should really consider changing the default here...
Quoted 4 lines
Quoted 1 line
fixed the PN part, not the default setting
It raises the horrible question about what the default should be I guess (again) :/.
This is a leftover for the familiar-angstrom split. My opinion was that doing 'opkg install gtk-app'[1] resulted in a working app, but other people like Phil Blundel disagreed and wanted the default to be broken. As you see, poky and moblin share my opininion :)
regards,
Koen
[1] 'ipkg install' at that point :)
RFC PATCH v2 1/1 RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
In reply to Richard PurdieFrom: Koen Kooi <[email protected]>
For these recipes the depencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
---
Changes since v1: Addressed Richards comments
.../openswan/openswan_2.4.7.bb | 6 +++--- .../recipes-connectivity/opensync/libsync_svn.bb | 3 ++- .../telepathy/empathy_2.26.1.bb | 6 +++--- .../recipes-gnome/abiword/abiword-2.5.inc | 2 +- .../abiword/abiword-embedded_2.5.2.bb | 2 ++ meta-demoapps/recipes-gnome/abiword/abiword.inc | 2 +- .../recipes-gnome/abiword/abiword_2.5.2.bb | 4 ++-- meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 2 +- .../recipes-gnome/libgsf/libgsf_1.14.5.bb | 4 ++-- .../matchbox-themes-gtk/matchbox-themes-gtk.bb | 4 ++-- .../eee-acpi-scripts/eee-acpi-scripts_git.bb | 4 ++-- meta/recipes-bsp/grub/grub_0.97.bb | 4 ++-- meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 4 ++-- meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb | 4 ++-- meta/recipes-bsp/qemu-config/qemu-config.bb | 4 ++-- meta/recipes-bsp/zaurusd/zaurusd_svn.bb | 3 ++- meta/recipes-connectivity/avahi/avahi.inc | 2 +- meta/recipes-connectivity/avahi/avahi_0.6.28.bb | 2 +- meta/recipes-connectivity/gsm/gsmd.inc | 4 ++-- .../libnss-mdns/libnss-mdns_0.10.bb | 4 ++-- .../nfs-utils/nfs-utils_1.2.3.bb | 6 +++--- .../ppp-dialin/ppp-dialin_0.1.bb | 4 ++-- .../resolvconf/resolvconf_1.43.bb | 4 ++-- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 4 ++-- meta/recipes-devtools/apt/apt_0.7.14.bb | 4 ++-- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 4 ++-- .../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 ++-- .../python/python-imaging_1.1.7.bb | 4 ++-- .../python/python-pycurl_7.19.0.bb | 4 ++-- .../recipes-devtools/python/python-pygtk_2.17.0.bb | 4 ++-- .../python/python-pyrex-native_0.9.9.bb | 4 ++-- .../python/python-scons-native_2.0.1.bb | 4 ++-- .../qemu/qemu-helper-native_1.0.bb | 4 ++-- .../qemu/qemu-helper-nativesdk_1.0.bb | 4 ++-- .../subversion/subversion_1.6.13.bb | 4 ++-- meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 4 ++-- .../unfs-server/unfs-server_2.2beta47.bb | 8 ++++---- meta/recipes-extended/libzypp/libzypp_git.bb | 4 ++-- meta/recipes-extended/man-pages/man-pages_3.25.bb | 4 ++-- meta/recipes-extended/mc/mc_4.7.3.bb | 4 +++- meta/recipes-extended/polkit/polkit_0.99.bb | 4 ++-- meta/recipes-extended/shadow/shadow.inc | 2 +- meta/recipes-extended/shadow/shadow_4.1.4.2.bb | 2 +- meta/recipes-extended/zypper/zypper_git.bb | 4 ++-- .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 6 +++--- meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 4 ++-- meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | 4 ++-- .../gtk+/gdk-pixbuf-csource-native_2.12.7.bb | 4 ++-- meta/recipes-gnome/gtk+/gtk+.inc | 8 ++++---- meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.20.1.bb | 2 +- meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb | 4 ++-- .../tasks/task-poky-standalone-gmae-sdk-target.bb | 4 ++-- meta/recipes-graphics/cairo/cairo_1.10.0.bb | 4 ++-- .../libsdl/libsdl-nativesdk_1.2.11.bb | 4 ++-- meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb | 3 ++- .../recipes-graphics/xorg-font/font-alias_1.0.3.bb | 6 +++--- meta/recipes-graphics/xorg-font/font-util_1.2.0.bb | 6 +++--- .../xorg-font/xorg-font-common.inc | 4 ++-- .../recipes-graphics/xorg-util/gccmakedep_1.0.2.bb | 4 ++-- meta/recipes-graphics/xorg-util/imake_1.0.4.bb | 4 ++-- meta/recipes-kernel/oprofile/oprofile_0.9.6.bb | 6 +++--- meta/recipes-kernel/oprofile/oprofile_cvs.bb | 6 +++--- .../update-modules/update-modules_1.0.bb | 6 +++--- .../gstreamer/gst-openmax_0.10.1.bb | 4 ++-- .../gstreamer/gst-plugins-base_0.10.30.bb | 4 ++-- meta/recipes-qt/qt-apps/fotowall_0.9.bb | 4 +++- meta/recipes-qt/qt-apps/qmmp_0.4.1.bb | 4 ++-- meta/recipes-qt/qt-apps/quicky_0.4.bb | 4 +++- meta/recipes-sato/eds/eds-tools_bzr.bb | 4 ++-- meta/recipes-sato/gaku/gaku_svn.bb | 6 +++--- .../matchbox-config-gtk/matchbox-config-gtk_svn.bb | 3 ++- .../matchbox-keyboard/matchbox-keyboard_svn.bb | 4 ++-- .../matchbox-sato/matchbox-session-sato_0.1.bb | 4 ++-- .../recipes-sato/owl-video-widget/libowl-av_svn.bb | 6 +++--- meta/recipes-sato/pimlico/contacts.inc | 2 +- meta/recipes-sato/pimlico/contacts_0.9.bb | 2 +- meta/recipes-sato/pimlico/contacts_git.bb | 2 +- meta/recipes-sato/pimlico/dates.inc | 2 +- meta/recipes-sato/pimlico/dates_0.4.8.bb | 2 +- meta/recipes-sato/pimlico/dates_git.bb | 2 +- meta/recipes-support/enchant/enchant_1.6.0.bb | 4 ++-- meta/recipes-support/hal/hal.inc | 2 +- meta/recipes-support/hal/hal_0.5.14.bb | 2 +- meta/recipes-support/hal/hal_git.bb | 2 +- 92 files changed, 181 insertions(+), 169 deletions(-)
meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +3 -3
@@ -5,9 +5,9 @@ Linux operating system." HOMEPAGE = "http://www.openswan.org" LICENSE = "GPLv2" DEPENDS = "gmp flex-native" -RRECOMMENDS = "kernel-module-ipsec" -RDEPENDS_nylon = "perl" -PR = "r0" +RRECOMMENDS_${PN} = "kernel-module-ipsec" +RDEPENDS_${PN}_nylon = "perl" +PR = "r1" SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ file://openswan-2.4.7-gentoo.patch;patch=1 \
meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb +2 -1
@@ -4,10 +4,11 @@ OpenSync in GLib applications." LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi" -RRECOMMENDS = "\ +RRECOMMENDS_${PN} = "\ libopensync-plugin-file \ " PV = "0.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/sync/trunk;module=sync;proto=http"
meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb +3 -3
@@ -6,9 +6,9 @@ Gadu-Gadu, Groupwise, ICQ and QQ." HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" LICENSE = "GPL" DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" -RDEPENDS = "telepathy-mission-control" -RRECOMMENDS = "telepathy-gabble" -PR = "r2" +RDEPENDS_${PN} = "telepathy-mission-control" +RRECOMMENDS_${PN} = "telepathy-gabble" +PR = "r3" inherit gnome
meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc +1 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.abiword.org" SECTION = "x11/office" LICENSE = "GPLv2" DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2" -RDEPENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb +2 -0
@@ -1,5 +1,7 @@ require abiword-2.5.inc +PR = "r1" + EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}"
meta-demoapps/recipes-gnome/abiword/abiword.inc +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.abiword.org"" LICENSE = "GPLv2" DEPENDS = "libgsf libglade libfribidi libxml2 wv" -RRECOMMENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" # Share this file between recipes that use cvs and that pull tarballs
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +2 -2
@@ -1,5 +1,5 @@ require abiword-2.5.inc -PR = "r1" +PR = "r2" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded"
meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb +1 -1
@@ -1,7 +1,7 @@ require abiword.inc PV="2.5.0+cvs${SRCDATE}" -PR = "r3" +PR = "r4" SRC_URI = "${CVSURI}"
meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +2 -2
@@ -1,10 +1,10 @@ DESCRIPTION = "GNOME Structured File Library" LICENSE = "GPL" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS= "libxml2 bzip2 glib-2.0 zlib" -RDEPENDS = "gconf gnome-vfs" +RDEPENDS_${PN} = "gconf gnome-vfs" PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb +2 -2
@@ -1,9 +1,9 @@ DESCRIPTION = "Gtk2 theme files to accompany default Matchbox themes" LICENSE = "GPL" DEPENDS = "gtk-engines" -RDEPENDS = "matchbox-wm gtk-engine-clearlooks" +RDEPENDS_${PN} = "matchbox-wm gtk-engine-clearlooks" SECTION = "x11/base" -PR = "r2" +PR = "r3" SRC_URI = "file://gtkrc"
meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +2 -2
@@ -6,9 +6,9 @@ LICENSE="GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c" PV = "1.1.11+git${SRCREV}" -PR = "r3" +PR = "r4" -RDEPENDS = "pm-utils" +RDEPENDS_${PN} = "pm-utils" SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git;protocol=git \ file://remove-doc-check.patch;patch=1 \
meta/recipes-bsp/grub/grub_0.97.bb +2 -2
@@ -10,8 +10,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6" -RDEPENDS = "diffutils" -PR = "r2" +RDEPENDS_${PN} = "diffutils" +PR = "r3" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ file://autohell.patch;apply=yes "
meta/recipes-bsp/hostap/hostap-conf_1.0.bb +2 -2
@@ -3,9 +3,9 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -RDEPENDS = "update-modules" +RDEPENDS_${PN} = "update-modules" PACKAGE_ARCH = "all" -PR = "r11" +PR = "r12" SRC_URI = "file://hostap_cs.modalias \ file://COPYING.patch"
meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb +2 -2
@@ -3,9 +3,9 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -RDEPENDS = "update-modules" +RDEPENDS_${PN} = "update-modules" PACKAGE_ARCH = "all" -PR = "r5" +PR = "r6" SRC_URI = "file://orinoco_cs.conf \ file://COPYING.patch"
meta/recipes-bsp/qemu-config/qemu-config.bb +2 -2
@@ -3,8 +3,8 @@ DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" LICENSE = "GPL" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -RDEPENDS = "distcc task-poky-nfs-server oprofileui-server rsync bash" -PR = "r18" +RDEPENDS_${PN} = "distcc task-poky-nfs-server oprofileui-server rsync bash" +PR = "r19" SRC_URI = "file://distcc.sh \ file://anjuta-remote-run \
meta/recipes-bsp/zaurusd/zaurusd_svn.bb +2 -1
@@ -3,8 +3,9 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "tslib" -RDEPENDS = "xrandr" +RDEPENDS_${PN} = "xrandr" PV = "0.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"
meta/recipes-connectivity/avahi/avahi.inc +1 -1
@@ -16,7 +16,7 @@ PRIORITY = "optional" LICENSE = "GPLv2+ & LGPLv2.1+" DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade" -RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_${PN} = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
meta/recipes-connectivity/avahi/avahi_0.6.28.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" RDEPENDS_avahi-daemon = "sysvinit-pidof" -PR = "r0" +PR = "r1" EXTRA_OECONF += "--disable-gtk3"
meta/recipes-connectivity/gsm/gsmd.inc +2 -2
@@ -10,7 +10,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://fix_machine_init.patch;patch=1 \
@@ -19,7 +19,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ S = "${WORKDIR}/gsm" inherit autotools pkgconfig update-rc.d -# handle update-rc.d RDEPENDS manually, we don't need it on +# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on # anything but gsmd RDEPENDS_append = ""
meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +2 -2
@@ -7,8 +7,8 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "avahi" -RDEPENDS = "avahi-daemon" -PR = "r1" +RDEPENDS_${PN} = "avahi-daemon" +PR = "r2" SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +3 -3
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" # util-linux for libblkid DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers" -RDEPENDS = "portmap" -RRECOMMENDS = "kernel-module-nfsd" +RDEPENDS_${PN} = "portmap" +RRECOMMENDS_${PN} = "kernel-module-nfsd" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ file://nfs-utils-1.0.6-uclibc.patch \
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +2 -2
@@ -1,8 +1,8 @@ SECTION = "console/network" DESCRIPTION = "Enables PPP dial-in through a serial connection" DEPENDS = "ppp" -RDEPENDS = "ppp" -PR = "r5" +RDEPENDS_${PN} = "ppp" +PR = "r6" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb +2 -2
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" DEPENDS = "bash" -RDEPENDS = "bash" -PR = "r1" +RDEPENDS_${PN} = "bash" +PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
meta/recipes-core/glibc/glibc.inc +1 -1
@@ -13,7 +13,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" -#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" +#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv"
meta/recipes-core/initscripts/initscripts_1.0.bb +2 -2
@@ -3,10 +3,10 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip SECTION = "base" PRIORITY = "required" DEPENDS = "makedevs" -RDEPENDS = "makedevs" +RDEPENDS_${PN} = "makedevs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r122" +PR = "r123" SRC_URI = "file://functions \ file://halt \
meta/recipes-devtools/apt/apt_0.7.14.bb +2 -2
@@ -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"
meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
@@ -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
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +1 -1
@@ -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"
meta/recipes-devtools/intltool/intltool.inc +2 -2
@@ -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
meta/recipes-devtools/intltool/intltool_0.40.6.bb +1 -1
@@ -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"
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +3 -3
@@ -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"
meta/recipes-devtools/python/python-dbus_0.83.1.bb +2 -2
@@ -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
meta/recipes-devtools/python/python-gst_0.10.19.bb +2 -2
@@ -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"
meta/recipes-devtools/python/python-imaging_1.1.7.bb +2 -2
@@ -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"
meta/recipes-devtools/python/python-pycurl_7.19.0.bb +2 -2
@@ -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 \
meta/recipes-devtools/python/python-pygtk_2.17.0.bb +2 -2
@@ -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 \
meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb +2 -2
@@ -1,5 +1,5 @@ require python-pyrex_${PV}.bb inherit native DEPENDS = "python-native" -RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1"
meta/recipes-devtools/python/python-scons-native_2.0.1.bb +2 -2
@@ -1,6 +1,6 @@ require python-scons_${PV}.bb inherit native DEPENDS = "python-native" -RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1"
meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +2 -2
@@ -1,7 +1,7 @@ DESCRIPTION = "Qemu helper utilities from Poky" LICENSE = "GPLv2" -RDEPENDS = "qemu-native" -PR = "r0" +RDEPENDS_${PN} = "qemu-native" +PR = "r1" FILESPATH = "${FILE_DIRNAME}/qemu-helper"
meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb +2 -2
@@ -1,7 +1,7 @@ DESCRIPTION = "Qemu helper scripts from Poky" LICENSE = "GPL" -RDEPENDS = "qemu-nativesdk" -PR = "r8" +RDEPENDS_${PN} = "qemu-nativesdk" +PR = "r9" FILESPATH = "${FILE_DIRNAME}/qemu-helper"
meta/recipes-devtools/subversion/subversion_1.6.13.bb +2 -2
@@ -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 \
meta/recipes-devtools/ubootchart/ubootchart_svn.bb +2 -2
@@ -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 \
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +4 -4
@@ -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 \
meta/recipes-extended/libzypp/libzypp_git.bb +2 -2
@@ -9,11 +9,11 @@ inherit cmake DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev" # rpmdb2solv from sat-solver is run from libzypp -RDEPENDS = "sat-solver" +RDEPENDS_${PN} = "sat-solver" S = "${WORKDIR}/git" PV = "0.0-git${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \
meta/recipes-extended/man-pages/man-pages_3.25.bb +2 -2
@@ -4,7 +4,7 @@ SECTION = "console/utils" PRIORITY = "required" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPL" -PR = "r0" +PR = "r1" LIC_FILES_CHKSUM = "file://README;md5=9dab010c5baa416669e5d17381799dd5" SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.tar.gz"
@@ -12,7 +12,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.ta SRC_URI[md5sum] = "98ec2324abea77d7a992470dd44d140c" SRC_URI[sha256sum] = "474242842a78dc2121687b7db6c32b6c78af5458f2bd809e23563dd185e2b169" -RDEPENDS = "man" +RDEPENDS_${PN} = "man" do_configure_prepend() { rm -rf not_installed
meta/recipes-extended/mc/mc_4.7.3.bb +3 -1
@@ -4,7 +4,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "console/utils" DEPENDS = "ncurses glib-2.0" -RDEPENDS = "ncurses-terminfo" +RDEPENDS_${PN} = "ncurses-terminfo" + +PR = "r1" SRC_URI = "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2"
meta/recipes-extended/polkit/polkit_0.99.bb +2 -2
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99" SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz" -PR = "r0" +PR = "r1" DEPENDS = "libpam expat dbus-glib eggdbus intltool" -RDEPENDS = "libpam" +RDEPENDS_${PN} = "libpam" EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection" inherit autotools pkgconfig
meta/recipes-extended/shadow/shadow.inc +1 -1
@@ -20,7 +20,7 @@ PAM_PLUGINS = " libpam-runtime \ pam-plugin-rootok" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" # since we deduce from ${SERIAL_CONSOLE} PACKAGE_ARCH = "${MACHINE_ARCH}"
meta/recipes-extended/shadow/shadow_4.1.4.2.bb +1 -1
@@ -1,6 +1,6 @@ require shadow.inc -PR = "r0" +PR = "r1" SRC_URI += "file://shadow.automake-1.11.patch \ file://shadow-4.1.3-dots-in-usernames.patch \
meta/recipes-extended/zypper/zypper_git.bb +2 -2
@@ -5,8 +5,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" DEPENDS = "libzypp augeas" -RRECOMMENDS = "procps" -PR = "r1" +RRECOMMENDS_${PN} = "procps" +PR = "r2" inherit cmake
meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +3 -3
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e" SECTION = "x11/gnome" DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" -PR = "r0" +RDEPENDS_${PN} = "hicolor-icon-theme" +RRECOMMENDS_${PN} = "librsvg-gtk" +PR = "r1" FILES_${PN} += "${datadir}/*"
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +2 -2
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "x11/gnome" -PR = "r0" +PR = "r1" inherit autotools gnome pkgconfig DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf" -RDEPENDS = "libgnome-keyring" +RDEPENDS_${PN} = "libgnome-keyring" EXTRA_OECONF = "--disable-gtk-doc"
meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +2 -2
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ inherit gnome inherit autotools -PR = "r3" +PR = "r4" SRC_URI += "file://pkgconfig.patch;patch=1"
@@ -16,4 +16,4 @@ SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c" SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" DEPENDS += "shared-mime-info intltool-native" -RDEPENDS = "shared-mime-info" +RDEPENDS_${PN} = "shared-mime-info"
meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb +2 -2
@@ -4,10 +4,10 @@ DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-nativ S = "${WORKDIR}/gtk+-${PV}" FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" SRC_URI += "file://reduce-dependencies.patch;patch=1" -PR = "r11" +PR = "r13" #clear recommends for uclibc builds -RRECOMMENDS = " " +RRECOMMENDS_${PN} = " " RRECOMMENDS_${PN}_linux = " " RRECOMMENDS_${PN}_linux-gnueabi = " "
meta/recipes-gnome/gtk+/gtk+.inc +4 -4
@@ -35,10 +35,10 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" -BASE_RRECOMMENDS = "ttf-dejavu-sans" -BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" -BASE_RRECOMMENDS_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" +BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans" +BASE_RRECOMMENDS_${PN}_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +BASE_RRECOMMENDS_${PN}_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" +BASE_RRECOMMENDS_${PN}_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1"
meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +1 -1
@@ -1,6 +1,6 @@ require gtk+.inc -PR = "r9" +PR = "r10" SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +1 -1
@@ -1,6 +1,6 @@ require gtk+.inc -PR = "r5" +PR = "r6" SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/gtk+/gtk+_2.20.1.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" -PR = "r1" +PR = "r2" SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +2 -2
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r9" +PR = "r10" ALLOW_EMPTY = "1"
@@ -14,7 +14,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-sdk \ libglade-dev \ ${SDK-GMAE} \
meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +2 -2
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r11" +PR = "r12" ALLOW_EMPTY = "1"
@@ -14,7 +14,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN} ${PN}-dbg" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-standalone-sdk-target \ libglade-dev \ ${SDK-GMAE} \
meta/recipes-graphics/cairo/cairo_1.10.0.bb +2 -2
@@ -2,14 +2,14 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -PR = "r0" +PR = "r1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" SRC_URI[md5sum] = "70a2ece66cf473d976e2db0f75bf199e" SRC_URI[sha256sum] = "0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2" -RDEPENDS += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ +RDEPENDS_${PN} += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ cairo-perf-utils" ALLOW_EMPTY = "1"
meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -2
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.libsdl.org" SECTION = "libs" LICENSE = "LGPL" DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk" -RDEPENDS = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" -PR = "r4" +RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" +PR = "r5" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \
meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb +2 -1
@@ -3,8 +3,9 @@ require xorg-app-common.inc DESCRIPTION = "a program to create an index of X font files in a directory" PE = "1" +PR = "r1" -RDEPENDS += "mkfontscale" +RDEPENDS_${PN} += "mkfontscale" BBCLASSEXTEND = "native"
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +3 -3
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" DEPENDS = "virtual/xserver font-util" -RDEPENDS = "encodings font-util" -RDEPENDS_virtclass-native = "font-util" +RDEPENDS_${PN} = "encodings font-util" +RDEPENDS_${PN}_virtclass-native = "font-util" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"
meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +3 -3
@@ -12,10 +12,10 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" DEPENDS = "encodings util-macros" DEPENDS_virtclass-native = "util-macros-native" -RDEPENDS = "mkfontdir mkfontscale encodings" -RDEPENDS_virtclass-native = "mkfontdir-native mkfontscale-native" +RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" +RDEPENDS_${PN}_virtclass-native = "mkfontdir-native mkfontscale-native" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" do_configure_prepend() { sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
meta/recipes-graphics/xorg-font/xorg-font-common.inc +2 -2
@@ -5,10 +5,10 @@ SECTION = "x11/fonts" LICENSE = "MIT-X" DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native" -RDEPENDS = "encodings font-util font-alias" +RDEPENDS_${PN} = "encodings font-util font-alias" XORG_PN = "${BPN}" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}"
meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb +2 -2
@@ -2,9 +2,9 @@ require xorg-util-common.inc LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" DEPENDS = "util-macros" -RDEPENDS = "gcc" +RDEPENDS_${PN} = "gcc" -PR = "r2" +PR = "r3" PE = "1" SRC_URI[md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd"
meta/recipes-graphics/xorg-util/imake_1.0.4.bb +2 -2
@@ -2,11 +2,11 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" DEPENDS = "util-macros" -RDEPENDS = "perl xproto" +RDEPENDS_${PN} = "perl xproto" LIC_FILES_CHKSUM = "file://COPYING;md5=b9c6cfb044c6d0ff899eaafe4c729367" -PR = "r0" +PR = "r1" PE = "1" SRC_URI[md5sum] = "0fd1e53d94142ddee5340f87de0b9561"
meta/recipes-kernel/oprofile/oprofile_0.9.6.bb +3 -3
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "devel" DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" +RDEPENDS_${PN} = "binutils-symlinks" +RRECOMMENDS_${PN} = "kernel-vmlinux" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://opstart.patch \
meta/recipes-kernel/oprofile/oprofile_cvs.bb +3 -3
@@ -1,13 +1,13 @@ PV = "0.9.4+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SECTION = "devel" SUMMARY = "System-Wide Profiler" DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ of profiling all running code at low overhead." LICENSE = "GPL" DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" +RDEPENDS_${PN} = "binutils-symlinks" +RRECOMMENDS_${PN} = "kernel-vmlinux" DEFAULT_PREFERENCE = "-1"
meta/recipes-kernel/update-modules/update-modules_1.0.bb +3 -3
@@ -4,8 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" PACKAGE_ARCH = "all" -RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r7" +RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " +PR = "r8" SRC_URI = "file://update-modules \ file://COPYING.GPL"
@@ -25,7 +25,7 @@ do_install() { # The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which # supports both 2.4 and 2.6 kernels. Rather than forcing OE to have # to deal with that unique legacy corner case, we just nullify the -# RDEPENDS here and handle it in the Unslung image recipe. I know this +# RDEPENDS_${PN} here and handle it in the Unslung image recipe. I know this # is ugly. Please don't remove it unless you first make the RDEPENDS # line at the top of this file understand that a machine can be used # in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb +2 -2
@@ -1,5 +1,5 @@ DEPENDS = "gstreamer" -RDEPENDS = "libomxil" +RDEPENDS_${PN} = "libomxil" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"
@@ -10,7 +10,7 @@ inherit autotools EXTRA_OECONF += "--disable-valgrind" -PR = "r0" +PR = "r1" FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so" FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.*a"
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +2 -2
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi" -RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ +RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ gnome-vfs-plugin-sftp" SRC_URI += " file://gst-plugins-base-tremor.patch \
@@ -16,7 +16,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch \ SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" -PR = "r2" +PR = "r3" inherit gettext
meta/recipes-qt/qt-apps/fotowall_0.9.bb +3 -1
@@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \ file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc" SECTION = "x11/apps" +PR = "r1" + DEPENDS = "qt4-x11-free" -RDEPENDS = "qt4-x11-free" +RDEPENDS_${PN} = "qt4-x11-free" SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"
meta/recipes-qt/qt-apps/qmmp_0.4.1.bb +2 -2
@@ -4,10 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "multimedia" -PR = "r1" +PR = "r2" DEPENDS = "qt4-x11-free taglib" -RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" +RDEPENDS_${PN} = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl" SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2"
meta/recipes-qt/qt-apps/quicky_0.4.bb +3 -1
@@ -4,8 +4,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14" SECTION = "x11/apps" +PR = "r1" + DEPENDS = "qt4-x11-free" -RDEPENDS = "qt4-x11-free" +RDEPENDS_${PN} = "qt4-x11-free" SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
meta/recipes-sato/eds/eds-tools_bzr.bb +2 -2
@@ -1,10 +1,10 @@ LICENSE = "GPLv2" SECTION = "x11" DEPENDS = "dbus-glib eds-dbus" -RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book" DESCRIPTION = "Test applications for EDS" -PR = "r0" +PR = "r1" SRC_URI = "bzr://burtonini.com/bzr/eds-tools;proto=http"
meta/recipes-sato/gaku/gaku_svn.bb +3 -3
@@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a" DEPENDS = "gtk+ gstreamer libowl-av" -RDEPENDS = "gst-plugins-base-audioconvert \ +RDEPENDS_${PN} = "gst-plugins-base-audioconvert \ gst-plugins-base-audioresample \ gst-plugins-base-typefindfunctions \ gst-plugins-base-playbin" -RRECOMMENDS = "gst-plugins-good-id3demux \ +RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ gst-plugins-base-vorbis \ gst-plugins-base-alsa \ gst-plugins-base-ogg \
@@ -17,7 +17,7 @@ RRECOMMENDS = "gst-plugins-good-id3demux \ PV = "0.0+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb +2 -1
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" DEPENDS = "gconf gtk+" -RDEPENDS = "settings-daemon" +RDEPENDS_${PN} = "settings-daemon" PV = "0.0+svnr${SRCREV}" +PR = "r1" S = "${WORKDIR}/${PN}"
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb +2 -2
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" -RDEPENDS = "formfactor dbus-wait" +RDEPENDS_${PN} = "formfactor dbus-wait" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://configure_fix.patch;patch=1;maxrev=1819 \
meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +2 -2
@@ -6,8 +6,8 @@ LICENSE = "GPL" LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" SECTION = "x11" -RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" -PR = "r27" +RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" +PR = "r28" # This package is architecture specific because the session script is modified # based on the machine architecture.
meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +3 -3
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ SECTION = "x11" DEPENDS = "gtk+ gstreamer gst-plugins-base" -RDEPENDS = "gst-meta-base" -RRECOMMENDS = "gst-meta-audio gst-meta-video" +RDEPENDS_${PN} = "gst-meta-base" +RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" PV = "0.0+svnr${SRCREV}" -PR = "r5" +PR = "r6" S = "${WORKDIR}/${PN}"
meta/recipes-sato/pimlico/contacts.inc +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " SECTION = "x11" DEPENDS = "glib-2.0 gtk+ eds-dbus" DEPENDS_append_poky = " libowl" -RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book" inherit autotools pkgconfig
meta/recipes-sato/pimlico/contacts_0.9.bb +1 -1
@@ -1,5 +1,5 @@ require contacts.inc -PR = "r2" +PR = "r3" SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
meta/recipes-sato/pimlico/contacts_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" PV = "0.12+git${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/git"
meta/recipes-sato/pimlico/dates.inc +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & LGPLv2+" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" -RDEPENDS = "libedata-cal" +RDEPENDS_${PN} = "libedata-cal" inherit autotools pkgconfig gtk-icon-cache
meta/recipes-sato/pimlico/dates_0.4.8.bb +1 -1
@@ -1,5 +1,5 @@ require dates.inc -PR = "r3" +PR = "r4" SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
meta/recipes-sato/pimlico/dates_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa" PV = "0.4.11+git${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/git"
meta/recipes-support/enchant/enchant_1.6.0.bb +2 -2
@@ -6,11 +6,11 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \ file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18" DEPENDS = "aspell glib-2.0" -RDEPENDS = "aspell" +RDEPENDS_${PN} = "aspell" inherit autotools pkgconfig -PR = "r0" +PR = "r1" SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
meta/recipes-support/hal/hal.inc +1 -1
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+ | AFL" LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31" DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native" -RDEPENDS += "udev hal-info" +RDEPENDS_${PN} += "udev hal-info" SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ file://20hal"
meta/recipes-support/hal/hal_0.5.14.bb +1 -1
@@ -1,6 +1,6 @@ require hal.inc -PR = "r2" +PR = "r3" EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
meta/recipes-support/hal/hal_git.bb +1 -1
@@ -1,7 +1,7 @@ require hal.inc PV = "0.5.9.1+git${SRCDATE}" -PR = "r7" +PR = "r8" SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ file://20hal \
Signature · 1 line
1.6.6.1
RFC PATCH v3 1/1 RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
From: Koen Kooi <[email protected]>
For these recipes the depencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
---
Changes since v2: Rebased after Pauls qt changes, but kept PR bumps Changes since v1: Addressed Richards comments
.../openswan/openswan_2.4.7.bb | 6 +++--- .../recipes-connectivity/opensync/libsync_svn.bb | 3 ++- .../telepathy/empathy_2.26.1.bb | 6 +++--- .../recipes-gnome/abiword/abiword-2.5.inc | 2 +- .../abiword/abiword-embedded_2.5.2.bb | 2 ++ meta-demoapps/recipes-gnome/abiword/abiword.inc | 2 +- .../recipes-gnome/abiword/abiword_2.5.2.bb | 4 ++-- meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 2 +- .../recipes-gnome/libgsf/libgsf_1.14.5.bb | 4 ++-- .../matchbox-themes-gtk/matchbox-themes-gtk.bb | 4 ++-- .../eee-acpi-scripts/eee-acpi-scripts_git.bb | 4 ++-- meta/recipes-bsp/grub/grub_0.97.bb | 4 ++-- meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 4 ++-- meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb | 4 ++-- meta/recipes-bsp/qemu-config/qemu-config.bb | 4 ++-- meta/recipes-bsp/zaurusd/zaurusd_svn.bb | 3 ++- meta/recipes-connectivity/avahi/avahi.inc | 2 +- meta/recipes-connectivity/avahi/avahi_0.6.28.bb | 2 +- meta/recipes-connectivity/gsm/gsmd.inc | 4 ++-- .../libnss-mdns/libnss-mdns_0.10.bb | 4 ++-- .../nfs-utils/nfs-utils_1.2.3.bb | 6 +++--- .../ppp-dialin/ppp-dialin_0.1.bb | 4 ++-- .../resolvconf/resolvconf_1.43.bb | 4 ++-- meta/recipes-core/glibc/glibc.inc | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 4 ++-- meta/recipes-devtools/apt/apt_0.7.14.bb | 4 ++-- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 4 ++-- .../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 ++-- .../python/python-imaging_1.1.7.bb | 4 ++-- .../python/python-pycurl_7.19.0.bb | 4 ++-- .../recipes-devtools/python/python-pygtk_2.17.0.bb | 4 ++-- .../python/python-pyrex-native_0.9.9.bb | 4 ++-- .../python/python-scons-native_2.0.1.bb | 4 ++-- .../qemu/qemu-helper-native_1.0.bb | 4 ++-- .../qemu/qemu-helper-nativesdk_1.0.bb | 4 ++-- .../subversion/subversion_1.6.13.bb | 4 ++-- meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 4 ++-- .../unfs-server/unfs-server_2.2beta47.bb | 8 ++++---- meta/recipes-extended/libzypp/libzypp_git.bb | 4 ++-- meta/recipes-extended/man-pages/man-pages_3.25.bb | 4 ++-- meta/recipes-extended/mc/mc_4.7.3.bb | 4 +++- meta/recipes-extended/polkit/polkit_0.99.bb | 4 ++-- meta/recipes-extended/shadow/shadow.inc | 2 +- meta/recipes-extended/shadow/shadow_4.1.4.2.bb | 2 +- meta/recipes-extended/zypper/zypper_git.bb | 4 ++-- .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 6 +++--- meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 4 ++-- meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | 4 ++-- .../gtk+/gdk-pixbuf-csource-native_2.12.7.bb | 4 ++-- meta/recipes-gnome/gtk+/gtk+.inc | 8 ++++---- meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.20.1.bb | 2 +- meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb | 4 ++-- .../tasks/task-poky-standalone-gmae-sdk-target.bb | 4 ++-- meta/recipes-graphics/cairo/cairo_1.10.0.bb | 4 ++-- .../libsdl/libsdl-nativesdk_1.2.11.bb | 4 ++-- meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb | 3 ++- .../recipes-graphics/xorg-font/font-alias_1.0.3.bb | 6 +++--- meta/recipes-graphics/xorg-font/font-util_1.2.0.bb | 6 +++--- .../xorg-font/xorg-font-common.inc | 4 ++-- .../recipes-graphics/xorg-util/gccmakedep_1.0.2.bb | 4 ++-- meta/recipes-graphics/xorg-util/imake_1.0.4.bb | 4 ++-- meta/recipes-kernel/oprofile/oprofile_0.9.6.bb | 6 +++--- meta/recipes-kernel/oprofile/oprofile_cvs.bb | 6 +++--- .../update-modules/update-modules_1.0.bb | 6 +++--- .../gstreamer/gst-openmax_0.10.1.bb | 4 ++-- .../gstreamer/gst-plugins-base_0.10.30.bb | 4 ++-- meta/recipes-qt/qt-apps/quicky_0.4.bb | 2 ++ meta/recipes-sato/eds/eds-tools_bzr.bb | 4 ++-- meta/recipes-sato/gaku/gaku_svn.bb | 6 +++--- .../matchbox-config-gtk/matchbox-config-gtk_svn.bb | 3 ++- .../matchbox-keyboard/matchbox-keyboard_svn.bb | 4 ++-- .../matchbox-sato/matchbox-session-sato_0.1.bb | 4 ++-- .../recipes-sato/owl-video-widget/libowl-av_svn.bb | 6 +++--- meta/recipes-sato/pimlico/contacts.inc | 2 +- meta/recipes-sato/pimlico/contacts_0.9.bb | 2 +- meta/recipes-sato/pimlico/contacts_git.bb | 2 +- meta/recipes-sato/pimlico/dates.inc | 2 +- meta/recipes-sato/pimlico/dates_0.4.8.bb | 2 +- meta/recipes-sato/pimlico/dates_git.bb | 2 +- meta/recipes-support/enchant/enchant_1.6.0.bb | 4 ++-- meta/recipes-support/hal/hal.inc | 2 +- meta/recipes-support/hal/hal_0.5.14.bb | 2 +- meta/recipes-support/hal/hal_git.bb | 2 +- 90 files changed, 175 insertions(+), 165 deletions(-)
meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb +3 -3
@@ -5,9 +5,9 @@ Linux operating system." HOMEPAGE = "http://www.openswan.org" LICENSE = "GPLv2" DEPENDS = "gmp flex-native" -RRECOMMENDS = "kernel-module-ipsec" -RDEPENDS_nylon = "perl" -PR = "r0" +RRECOMMENDS_${PN} = "kernel-module-ipsec" +RDEPENDS_${PN}_nylon = "perl" +PR = "r1" SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ file://openswan-2.4.7-gentoo.patch;patch=1 \
meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb +2 -1
@@ -4,10 +4,11 @@ OpenSync in GLib applications." LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi" -RRECOMMENDS = "\ +RRECOMMENDS_${PN} = "\ libopensync-plugin-file \ " PV = "0.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/sync/trunk;module=sync;proto=http"
meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb +3 -3
@@ -6,9 +6,9 @@ Gadu-Gadu, Groupwise, ICQ and QQ." HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" LICENSE = "GPL" DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" -RDEPENDS = "telepathy-mission-control" -RRECOMMENDS = "telepathy-gabble" -PR = "r2" +RDEPENDS_${PN} = "telepathy-mission-control" +RRECOMMENDS_${PN} = "telepathy-gabble" +PR = "r3" inherit gnome
meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc +1 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.abiword.org" SECTION = "x11/office" LICENSE = "GPLv2" DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2" -RDEPENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb +2 -0
@@ -1,5 +1,7 @@ require abiword-2.5.inc +PR = "r1" + EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}"
meta-demoapps/recipes-gnome/abiword/abiword.inc +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.abiword.org"" LICENSE = "GPLv2" DEPENDS = "libgsf libglade libfribidi libxml2 wv" -RRECOMMENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ +RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" # Share this file between recipes that use cvs and that pull tarballs
meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +2 -2
@@ -1,5 +1,5 @@ require abiword-2.5.inc -PR = "r1" +PR = "r2" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded"
meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb +1 -1
@@ -1,7 +1,7 @@ require abiword.inc PV="2.5.0+cvs${SRCDATE}" -PR = "r3" +PR = "r4" SRC_URI = "${CVSURI}"
meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +2 -2
@@ -1,10 +1,10 @@ DESCRIPTION = "GNOME Structured File Library" LICENSE = "GPL" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS= "libxml2 bzip2 glib-2.0 zlib" -RDEPENDS = "gconf gnome-vfs" +RDEPENDS_${PN} = "gconf gnome-vfs" PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb +2 -2
@@ -1,9 +1,9 @@ DESCRIPTION = "Gtk2 theme files to accompany default Matchbox themes" LICENSE = "GPL" DEPENDS = "gtk-engines" -RDEPENDS = "matchbox-wm gtk-engine-clearlooks" +RDEPENDS_${PN} = "matchbox-wm gtk-engine-clearlooks" SECTION = "x11/base" -PR = "r2" +PR = "r3" SRC_URI = "file://gtkrc"
meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +2 -2
@@ -6,9 +6,9 @@ LICENSE="GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c" PV = "1.1.11+git${SRCREV}" -PR = "r3" +PR = "r4" -RDEPENDS = "pm-utils" +RDEPENDS_${PN} = "pm-utils" SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git;protocol=git \ file://remove-doc-check.patch;patch=1 \
meta/recipes-bsp/grub/grub_0.97.bb +2 -2
@@ -10,8 +10,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6" -RDEPENDS = "diffutils" -PR = "r2" +RDEPENDS_${PN} = "diffutils" +PR = "r3" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ file://autohell.patch;apply=yes "
meta/recipes-bsp/hostap/hostap-conf_1.0.bb +2 -2
@@ -3,9 +3,9 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -RDEPENDS = "update-modules" +RDEPENDS_${PN} = "update-modules" PACKAGE_ARCH = "all" -PR = "r11" +PR = "r12" SRC_URI = "file://hostap_cs.modalias \ file://COPYING.patch"
meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb +2 -2
@@ -3,9 +3,9 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -RDEPENDS = "update-modules" +RDEPENDS_${PN} = "update-modules" PACKAGE_ARCH = "all" -PR = "r5" +PR = "r6" SRC_URI = "file://orinoco_cs.conf \ file://COPYING.patch"
meta/recipes-bsp/qemu-config/qemu-config.bb +2 -2
@@ -3,8 +3,8 @@ DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" LICENSE = "GPL" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -RDEPENDS = "distcc task-poky-nfs-server oprofileui-server rsync bash" -PR = "r18" +RDEPENDS_${PN} = "distcc task-poky-nfs-server oprofileui-server rsync bash" +PR = "r19" SRC_URI = "file://distcc.sh \ file://anjuta-remote-run \
meta/recipes-bsp/zaurusd/zaurusd_svn.bb +2 -1
@@ -3,8 +3,9 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "tslib" -RDEPENDS = "xrandr" +RDEPENDS_${PN} = "xrandr" PV = "0.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"
meta/recipes-connectivity/avahi/avahi.inc +1 -1
@@ -16,7 +16,7 @@ PRIORITY = "optional" LICENSE = "GPLv2+ & LGPLv2.1+" DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade" -RRECOMMENDS = "libnss-mdns" +RRECOMMENDS_${PN} = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
meta/recipes-connectivity/avahi/avahi_0.6.28.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" RDEPENDS_avahi-daemon = "sysvinit-pidof" -PR = "r0" +PR = "r1" EXTRA_OECONF += "--disable-gtk3"
meta/recipes-connectivity/gsm/gsmd.inc +2 -2
@@ -10,7 +10,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://fix_machine_init.patch;patch=1 \
@@ -19,7 +19,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ S = "${WORKDIR}/gsm" inherit autotools pkgconfig update-rc.d -# handle update-rc.d RDEPENDS manually, we don't need it on +# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on # anything but gsmd RDEPENDS_append = ""
meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +2 -2
@@ -7,8 +7,8 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "avahi" -RDEPENDS = "avahi-daemon" -PR = "r1" +RDEPENDS_${PN} = "avahi-daemon" +PR = "r2" SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +3 -3
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" # util-linux for libblkid DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers" -RDEPENDS = "portmap" -RRECOMMENDS = "kernel-module-nfsd" +RDEPENDS_${PN} = "portmap" +RRECOMMENDS_${PN} = "kernel-module-nfsd" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ file://nfs-utils-1.0.6-uclibc.patch \
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +2 -2
@@ -1,8 +1,8 @@ SECTION = "console/network" DESCRIPTION = "Enables PPP dial-in through a serial connection" DEPENDS = "ppp" -RDEPENDS = "ppp" -PR = "r5" +RDEPENDS_${PN} = "ppp" +PR = "r6" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb +2 -2
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" DEPENDS = "bash" -RDEPENDS = "bash" -PR = "r1" +RDEPENDS_${PN} = "bash" +PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
meta/recipes-core/glibc/glibc.inc +1 -1
@@ -13,7 +13,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" -#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" +#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv"
meta/recipes-core/initscripts/initscripts_1.0.bb +2 -2
@@ -3,10 +3,10 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip SECTION = "base" PRIORITY = "required" DEPENDS = "makedevs" -RDEPENDS = "makedevs" +RDEPENDS_${PN} = "makedevs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r122" +PR = "r123" SRC_URI = "file://functions \ file://halt \
meta/recipes-devtools/apt/apt_0.7.14.bb +2 -2
@@ -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"
meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
@@ -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
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +1 -1
@@ -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"
meta/recipes-devtools/intltool/intltool.inc +2 -2
@@ -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
meta/recipes-devtools/intltool/intltool_0.40.6.bb +1 -1
@@ -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"
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +3 -3
@@ -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"
meta/recipes-devtools/python/python-dbus_0.83.1.bb +2 -2
@@ -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
meta/recipes-devtools/python/python-gst_0.10.19.bb +2 -2
@@ -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"
meta/recipes-devtools/python/python-imaging_1.1.7.bb +2 -2
@@ -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"
meta/recipes-devtools/python/python-pycurl_7.19.0.bb +2 -2
@@ -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 \
meta/recipes-devtools/python/python-pygtk_2.17.0.bb +2 -2
@@ -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 \
meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb +2 -2
@@ -1,5 +1,5 @@ require python-pyrex_${PV}.bb inherit native DEPENDS = "python-native" -RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1"
meta/recipes-devtools/python/python-scons-native_2.0.1.bb +2 -2
@@ -1,6 +1,6 @@ require python-scons_${PV}.bb inherit native DEPENDS = "python-native" -RDEPENDS = "" -PR = "r0" +RDEPENDS_${PN} = "" +PR = "r1"
meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +2 -2
@@ -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"
meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb +2 -2
@@ -1,7 +1,7 @@ DESCRIPTION = "Qemu helper scripts from Poky" LICENSE = "GPL" -RDEPENDS = "qemu-nativesdk" -PR = "r8" +RDEPENDS_${PN} = "qemu-nativesdk" +PR = "r9" FILESPATH = "${FILE_DIRNAME}/qemu-helper"
meta/recipes-devtools/subversion/subversion_1.6.13.bb +2 -2
@@ -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 \
meta/recipes-devtools/ubootchart/ubootchart_svn.bb +2 -2
@@ -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 \
meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb +4 -4
@@ -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 \
meta/recipes-extended/libzypp/libzypp_git.bb +2 -2
@@ -9,11 +9,11 @@ inherit cmake DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev" # rpmdb2solv from sat-solver is run from libzypp -RDEPENDS = "sat-solver" +RDEPENDS_${PN} = "sat-solver" S = "${WORKDIR}/git" PV = "0.0-git${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \
meta/recipes-extended/man-pages/man-pages_3.25.bb +2 -2
@@ -4,7 +4,7 @@ SECTION = "console/utils" PRIORITY = "required" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPL" -PR = "r0" +PR = "r1" LIC_FILES_CHKSUM = "file://README;md5=9dab010c5baa416669e5d17381799dd5" SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.tar.gz"
@@ -12,7 +12,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.ta SRC_URI[md5sum] = "98ec2324abea77d7a992470dd44d140c" SRC_URI[sha256sum] = "474242842a78dc2121687b7db6c32b6c78af5458f2bd809e23563dd185e2b169" -RDEPENDS = "man" +RDEPENDS_${PN} = "man" do_configure_prepend() { rm -rf not_installed
meta/recipes-extended/mc/mc_4.7.3.bb +3 -1
@@ -4,7 +4,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "console/utils" DEPENDS = "ncurses glib-2.0" -RDEPENDS = "ncurses-terminfo" +RDEPENDS_${PN} = "ncurses-terminfo" + +PR = "r1" SRC_URI = "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2"
meta/recipes-extended/polkit/polkit_0.99.bb +2 -2
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99" SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz" -PR = "r0" +PR = "r1" DEPENDS = "libpam expat dbus-glib eggdbus intltool" -RDEPENDS = "libpam" +RDEPENDS_${PN} = "libpam" EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection" inherit autotools pkgconfig
meta/recipes-extended/shadow/shadow.inc +1 -1
@@ -20,7 +20,7 @@ PAM_PLUGINS = " libpam-runtime \ pam-plugin-rootok" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" # since we deduce from ${SERIAL_CONSOLE} PACKAGE_ARCH = "${MACHINE_ARCH}"
meta/recipes-extended/shadow/shadow_4.1.4.2.bb +1 -1
@@ -1,6 +1,6 @@ require shadow.inc -PR = "r0" +PR = "r1" SRC_URI += "file://shadow.automake-1.11.patch \ file://shadow-4.1.3-dots-in-usernames.patch \
meta/recipes-extended/zypper/zypper_git.bb +2 -2
@@ -5,8 +5,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" DEPENDS = "libzypp augeas" -RRECOMMENDS = "procps" -PR = "r1" +RRECOMMENDS_${PN} = "procps" +PR = "r2" inherit cmake
meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +3 -3
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e" SECTION = "x11/gnome" DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" -PR = "r0" +RDEPENDS_${PN} = "hicolor-icon-theme" +RRECOMMENDS_${PN} = "librsvg-gtk" +PR = "r1" FILES_${PN} += "${datadir}/*"
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +2 -2
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "x11/gnome" -PR = "r0" +PR = "r1" inherit autotools gnome pkgconfig DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf" -RDEPENDS = "libgnome-keyring" +RDEPENDS_${PN} = "libgnome-keyring" EXTRA_OECONF = "--disable-gtk-doc"
meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb +2 -2
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ inherit gnome inherit autotools -PR = "r3" +PR = "r4" SRC_URI += "file://pkgconfig.patch;patch=1"
@@ -16,4 +16,4 @@ SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c" SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" DEPENDS += "shared-mime-info intltool-native" -RDEPENDS = "shared-mime-info" +RDEPENDS_${PN} = "shared-mime-info"
meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb +2 -2
@@ -4,10 +4,10 @@ DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-nativ S = "${WORKDIR}/gtk+-${PV}" FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" SRC_URI += "file://reduce-dependencies.patch;patch=1" -PR = "r11" +PR = "r13" #clear recommends for uclibc builds -RRECOMMENDS = " " +RRECOMMENDS_${PN} = " " RRECOMMENDS_${PN}_linux = " " RRECOMMENDS_${PN}_linux-gnueabi = " "
meta/recipes-gnome/gtk+/gtk+.inc +4 -4
@@ -37,10 +37,10 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" -BASE_RRECOMMENDS = "ttf-dejavu-sans" -BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" -BASE_RRECOMMENDS_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" +BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans" +BASE_RRECOMMENDS_${PN}_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +BASE_RRECOMMENDS_${PN}_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" +BASE_RRECOMMENDS_${PN}_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1"
meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +1 -1
@@ -1,6 +1,6 @@ require gtk+.inc -PR = "r9" +PR = "r10" SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +1 -1
@@ -1,6 +1,6 @@ require gtk+.inc -PR = "r5" +PR = "r6" SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/gtk+/gtk+_2.20.1.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" -PR = "r1" +PR = "r2" SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \
meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +2 -2
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r9" +PR = "r10" ALLOW_EMPTY = "1"
@@ -14,7 +14,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-sdk \ libglade-dev \ ${SDK-GMAE} \
meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +2 -2
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r11" +PR = "r12" ALLOW_EMPTY = "1"
@@ -14,7 +14,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN} ${PN}-dbg" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ task-poky-standalone-sdk-target \ libglade-dev \ ${SDK-GMAE} \
meta/recipes-graphics/cairo/cairo_1.10.0.bb +2 -2
@@ -2,14 +2,14 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -PR = "r0" +PR = "r1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" SRC_URI[md5sum] = "70a2ece66cf473d976e2db0f75bf199e" SRC_URI[sha256sum] = "0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2" -RDEPENDS += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ +RDEPENDS_${PN} += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ cairo-perf-utils" ALLOW_EMPTY = "1"
meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -2
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.libsdl.org" SECTION = "libs" LICENSE = "LGPL" DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk" -RDEPENDS = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" -PR = "r4" +RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" +PR = "r5" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \
meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb +2 -1
@@ -3,8 +3,9 @@ require xorg-app-common.inc DESCRIPTION = "a program to create an index of X font files in a directory" PE = "1" +PR = "r1" -RDEPENDS += "mkfontscale" +RDEPENDS_${PN} += "mkfontscale" BBCLASSEXTEND = "native"
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +3 -3
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" DEPENDS = "virtual/xserver font-util" -RDEPENDS = "encodings font-util" -RDEPENDS_virtclass-native = "font-util" +RDEPENDS_${PN} = "encodings font-util" +RDEPENDS_${PN}_virtclass-native = "font-util" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"
meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +3 -3
@@ -12,10 +12,10 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" DEPENDS = "encodings util-macros" DEPENDS_virtclass-native = "util-macros-native" -RDEPENDS = "mkfontdir mkfontscale encodings" -RDEPENDS_virtclass-native = "mkfontdir-native mkfontscale-native" +RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" +RDEPENDS_${PN}_virtclass-native = "mkfontdir-native mkfontscale-native" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" do_configure_prepend() { sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
meta/recipes-graphics/xorg-font/xorg-font-common.inc +2 -2
@@ -5,10 +5,10 @@ SECTION = "x11/fonts" LICENSE = "MIT-X" DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native" -RDEPENDS = "encodings font-util font-alias" +RDEPENDS_${PN} = "encodings font-util font-alias" XORG_PN = "${BPN}" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}"
meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb +2 -2
@@ -2,9 +2,9 @@ require xorg-util-common.inc LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" DEPENDS = "util-macros" -RDEPENDS = "gcc" +RDEPENDS_${PN} = "gcc" -PR = "r2" +PR = "r3" PE = "1" SRC_URI[md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd"
meta/recipes-graphics/xorg-util/imake_1.0.4.bb +2 -2
@@ -2,11 +2,11 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" DEPENDS = "util-macros" -RDEPENDS = "perl xproto" +RDEPENDS_${PN} = "perl xproto" LIC_FILES_CHKSUM = "file://COPYING;md5=b9c6cfb044c6d0ff899eaafe4c729367" -PR = "r0" +PR = "r1" PE = "1" SRC_URI[md5sum] = "0fd1e53d94142ddee5340f87de0b9561"
meta/recipes-kernel/oprofile/oprofile_0.9.6.bb +3 -3
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "devel" DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" +RDEPENDS_${PN} = "binutils-symlinks" +RRECOMMENDS_${PN} = "kernel-vmlinux" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://opstart.patch \
meta/recipes-kernel/oprofile/oprofile_cvs.bb +3 -3
@@ -1,13 +1,13 @@ PV = "0.9.4+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SECTION = "devel" SUMMARY = "System-Wide Profiler" DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ of profiling all running code at low overhead." LICENSE = "GPL" DEPENDS = "popt binutils" -RDEPENDS = "binutils-symlinks" -RRECOMMENDS = "kernel-vmlinux" +RDEPENDS_${PN} = "binutils-symlinks" +RRECOMMENDS_${PN} = "kernel-vmlinux" DEFAULT_PREFERENCE = "-1"
meta/recipes-kernel/update-modules/update-modules_1.0.bb +3 -3
@@ -4,8 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" PACKAGE_ARCH = "all" -RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r7" +RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " +PR = "r8" SRC_URI = "file://update-modules \ file://COPYING.GPL"
@@ -25,7 +25,7 @@ do_install() { # The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which # supports both 2.4 and 2.6 kernels. Rather than forcing OE to have # to deal with that unique legacy corner case, we just nullify the -# RDEPENDS here and handle it in the Unslung image recipe. I know this +# RDEPENDS_${PN} here and handle it in the Unslung image recipe. I know this # is ugly. Please don't remove it unless you first make the RDEPENDS # line at the top of this file understand that a machine can be used # in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb +2 -2
@@ -1,5 +1,5 @@ DEPENDS = "gstreamer" -RDEPENDS = "libomxil" +RDEPENDS_${PN} = "libomxil" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"
@@ -10,7 +10,7 @@ inherit autotools EXTRA_OECONF += "--disable-valgrind" -PR = "r0" +PR = "r1" FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so" FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.*a"
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +2 -2
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi" -RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ +RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ gnome-vfs-plugin-sftp" SRC_URI += " file://gst-plugins-base-tremor.patch \
@@ -16,7 +16,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch \ SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" -PR = "r2" +PR = "r3" inherit gettext
meta/recipes-qt/qt-apps/quicky_0.4.bb +2 -0
@@ -4,6 +4,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14" SECTION = "x11/apps" +PR = "r1" + DEPENDS = "qt4-x11-free" SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
meta/recipes-sato/eds/eds-tools_bzr.bb +2 -2
@@ -1,10 +1,10 @@ LICENSE = "GPLv2" SECTION = "x11" DEPENDS = "dbus-glib eds-dbus" -RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book" DESCRIPTION = "Test applications for EDS" -PR = "r0" +PR = "r1" SRC_URI = "bzr://burtonini.com/bzr/eds-tools;proto=http"
meta/recipes-sato/gaku/gaku_svn.bb +3 -3
@@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a" DEPENDS = "gtk+ gstreamer libowl-av" -RDEPENDS = "gst-plugins-base-audioconvert \ +RDEPENDS_${PN} = "gst-plugins-base-audioconvert \ gst-plugins-base-audioresample \ gst-plugins-base-typefindfunctions \ gst-plugins-base-playbin" -RRECOMMENDS = "gst-plugins-good-id3demux \ +RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ gst-plugins-base-vorbis \ gst-plugins-base-alsa \ gst-plugins-base-ogg \
@@ -17,7 +17,7 @@ RRECOMMENDS = "gst-plugins-good-id3demux \ PV = "0.0+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb +2 -1
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" DEPENDS = "gconf gtk+" -RDEPENDS = "settings-daemon" +RDEPENDS_${PN} = "settings-daemon" PV = "0.0+svnr${SRCREV}" +PR = "r1" S = "${WORKDIR}/${PN}"
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb +2 -2
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" -RDEPENDS = "formfactor dbus-wait" +RDEPENDS_${PN} = "formfactor dbus-wait" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://configure_fix.patch;patch=1;maxrev=1819 \
meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +2 -2
@@ -6,8 +6,8 @@ LICENSE = "GPL" LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" SECTION = "x11" -RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" -PR = "r27" +RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" +PR = "r28" # This package is architecture specific because the session script is modified # based on the machine architecture.
meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +3 -3
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ SECTION = "x11" DEPENDS = "gtk+ gstreamer gst-plugins-base" -RDEPENDS = "gst-meta-base" -RRECOMMENDS = "gst-meta-audio gst-meta-video" +RDEPENDS_${PN} = "gst-meta-base" +RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" PV = "0.0+svnr${SRCREV}" -PR = "r5" +PR = "r6" S = "${WORKDIR}/${PN}"
meta/recipes-sato/pimlico/contacts.inc +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " SECTION = "x11" DEPENDS = "glib-2.0 gtk+ eds-dbus" DEPENDS_append_poky = " libowl" -RDEPENDS = "libedata-book" +RDEPENDS_${PN} = "libedata-book" inherit autotools pkgconfig
meta/recipes-sato/pimlico/contacts_0.9.bb +1 -1
@@ -1,5 +1,5 @@ require contacts.inc -PR = "r2" +PR = "r3" SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
meta/recipes-sato/pimlico/contacts_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" PV = "0.12+git${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/git"
meta/recipes-sato/pimlico/dates.inc +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & LGPLv2+" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" -RDEPENDS = "libedata-cal" +RDEPENDS_${PN} = "libedata-cal" inherit autotools pkgconfig gtk-icon-cache
meta/recipes-sato/pimlico/dates_0.4.8.bb +1 -1
@@ -1,5 +1,5 @@ require dates.inc -PR = "r3" +PR = "r4" SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
meta/recipes-sato/pimlico/dates_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa" PV = "0.4.11+git${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/git"
meta/recipes-support/enchant/enchant_1.6.0.bb +2 -2
@@ -6,11 +6,11 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \ file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18" DEPENDS = "aspell glib-2.0" -RDEPENDS = "aspell" +RDEPENDS_${PN} = "aspell" inherit autotools pkgconfig -PR = "r0" +PR = "r1" SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
meta/recipes-support/hal/hal.inc +1 -1
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+ | AFL" LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31" DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native" -RDEPENDS += "udev hal-info" +RDEPENDS_${PN} += "udev hal-info" SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ file://20hal"
meta/recipes-support/hal/hal_0.5.14.bb +1 -1
@@ -1,6 +1,6 @@ require hal.inc -PR = "r2" +PR = "r3" EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
meta/recipes-support/hal/hal_git.bb +1 -1
@@ -1,7 +1,7 @@ require hal.inc PV = "0.5.9.1+git${SRCDATE}" -PR = "r7" +PR = "r8" SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ file://20hal \
Signature · 1 line
1.6.6.1
Re: [RFC][PATCHv3] RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
Quoted 9 lines · Koen Kooi
From: Koen Kooi <[email protected]>
For these recipes the depencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
Signed-off-by Koen Kooi <[email protected]>---
Changes since v2: Rebased after Pauls qt changes, but kept PR bumps Changes since v1: Addressed Richards comments
Thanks for this, merged into master.
Cheers,
Richard
Op 22 dec 2010, om 21:37 heeft Richard Purdie het volgende geschreven:
Quoted 11 lines · Koen Kooi
Quoted 10 lines
Op 22 dec 2010, om 15:49 heeft Richard Purdie het volgende geschreven:
Quoted 5 lines · Koen Kooi
Quoted 2 lines
The core layer has tons of RDEPENDS = "foo", which should actually be RDEPENDS_${PN}. What's the policy on those?
They should be fixed. Patches very welcome...
A quick sed gives me:
Quoted 8 lines
Quoted 4 lines
76 files changed, 77 insertions(+), 77 deletions(-)Do you want that as a single patch and if not, how do you want to have it split and are PR bumps needed?
One patch is fine. One tricky part is that this is a change in behaviour as an RDEPENDS is applied to every
RDEPENDS_XXX, not just XXX=${PN} and that means we really should bump PR :/.
Patch is on the way!
Quoted 1 line
Is there also a similar problem with RRECOMMENDS?
Yes.
I did a build after bumping PR and the changes look safe for console-image: http://gitorious.org/angstrom/angstrom-testlab/commit/c4fc7f829cbaa3e16417007b3c1c4f6f05c26d60
regards,
Koen