summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2010-12-23 20:23:33 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-30 10:03:10 +0000
commit0e8f0f0a033c79611a15914fde5826876502af2e (patch)
tree6eaed12c3fbab03d9adf193e923b6e20e2937f0d
parent35e3443b57d009bffd8904c7c6c3a4769193c1b4 (diff)
downloadpoky-0e8f0f0a033c79611a15914fde5826876502af2e.tar.gz
RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN} Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb6
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb3
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb6
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc2
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb2
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword.inc2
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb4
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb2
-rw-r--r--meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb4
-rw-r--r--meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb4
-rw-r--r--meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb4
-rw-r--r--meta/recipes-bsp/grub/grub_0.97.bb4
-rw-r--r--meta/recipes-bsp/hostap/hostap-conf_1.0.bb4
-rw-r--r--meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb4
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb4
-rw-r--r--meta/recipes-bsp/zaurusd/zaurusd_svn.bb3
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc2
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.6.28.bb2
-rw-r--r--meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb4
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb6
-rw-r--r--meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb4
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb4
-rw-r--r--meta/recipes-core/glibc/glibc.inc2
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb4
-rw-r--r--meta/recipes-devtools/apt/apt_0.7.14.bb4
-rw-r--r--meta/recipes-devtools/distcc/distcc_2.18.3.bb4
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb2
-rw-r--r--meta/recipes-devtools/intltool/intltool.inc4
-rw-r--r--meta/recipes-devtools/intltool/intltool_0.40.6.bb2
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb6
-rw-r--r--meta/recipes-devtools/python/python-dbus_0.83.1.bb4
-rw-r--r--meta/recipes-devtools/python/python-gst_0.10.19.bb4
-rw-r--r--meta/recipes-devtools/python/python-imaging_1.1.7.bb4
-rw-r--r--meta/recipes-devtools/python/python-pycurl_7.19.0.bb4
-rw-r--r--meta/recipes-devtools/python/python-pygtk_2.17.0.bb4
-rw-r--r--meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb4
-rw-r--r--meta/recipes-devtools/python/python-scons-native_2.0.1.bb4
-rw-r--r--meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb4
-rw-r--r--meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb4
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.6.13.bb4
-rw-r--r--meta/recipes-devtools/ubootchart/ubootchart_svn.bb4
-rw-r--r--meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb8
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb4
-rw-r--r--meta/recipes-extended/man-pages/man-pages_3.25.bb4
-rw-r--r--meta/recipes-extended/mc/mc_4.7.3.bb4
-rw-r--r--meta/recipes-extended/polkit/polkit_0.99.bb4
-rw-r--r--meta/recipes-extended/shadow/shadow.inc2
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.2.bb2
-rw-r--r--meta/recipes-extended/zypper/zypper_git.bb4
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb6
-rw-r--r--meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb4
-rw-r--r--meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb4
-rw-r--r--meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb4
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc8
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.12.7.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.16.6.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.20.1.bb2
-rw-r--r--meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb4
-rw-r--r--meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb4
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.10.0.bb4
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb4
-rw-r--r--meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb3
-rw-r--r--meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb6
-rw-r--r--meta/recipes-graphics/xorg-font/font-util_1.2.0.bb6
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-font-common.inc4
-rw-r--r--meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb4
-rw-r--r--meta/recipes-graphics/xorg-util/imake_1.0.4.bb4
-rw-r--r--meta/recipes-kernel/oprofile/oprofile_0.9.6.bb6
-rw-r--r--meta/recipes-kernel/oprofile/oprofile_cvs.bb6
-rw-r--r--meta/recipes-kernel/update-modules/update-modules_1.0.bb6
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb4
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb4
-rw-r--r--meta/recipes-qt/qt-apps/quicky_0.4.bb2
-rw-r--r--meta/recipes-sato/eds/eds-tools_bzr.bb4
-rw-r--r--meta/recipes-sato/gaku/gaku_svn.bb6
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb3
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb4
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb4
-rw-r--r--meta/recipes-sato/owl-video-widget/libowl-av_svn.bb6
-rw-r--r--meta/recipes-sato/pimlico/contacts.inc2
-rw-r--r--meta/recipes-sato/pimlico/contacts_0.9.bb2
-rw-r--r--meta/recipes-sato/pimlico/contacts_git.bb2
-rw-r--r--meta/recipes-sato/pimlico/dates.inc2
-rw-r--r--meta/recipes-sato/pimlico/dates_0.4.8.bb2
-rw-r--r--meta/recipes-sato/pimlico/dates_git.bb2
-rw-r--r--meta/recipes-support/enchant/enchant_1.6.0.bb4
-rw-r--r--meta/recipes-support/hal/hal.inc2
-rw-r--r--meta/recipes-support/hal/hal_0.5.14.bb2
-rw-r--r--meta/recipes-support/hal/hal_git.bb2
89 files changed, 173 insertions, 163 deletions
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
index 022f709f99..d647f682d0 100644
--- a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
@@ -5,9 +5,9 @@ Linux operating system."
5HOMEPAGE = "http://www.openswan.org" 5HOMEPAGE = "http://www.openswan.org"
6LICENSE = "GPLv2" 6LICENSE = "GPLv2"
7DEPENDS = "gmp flex-native" 7DEPENDS = "gmp flex-native"
8RRECOMMENDS = "kernel-module-ipsec" 8RRECOMMENDS_${PN} = "kernel-module-ipsec"
9RDEPENDS_nylon = "perl" 9RDEPENDS_${PN}_nylon = "perl"
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ 12SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
13 file://openswan-2.4.7-gentoo.patch;patch=1 \ 13 file://openswan-2.4.7-gentoo.patch;patch=1 \
diff --git a/meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb b/meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb
index 74ca752ad6..06e44fd812 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb
@@ -4,10 +4,11 @@ OpenSync in GLib applications."
4LICENSE = "LGPL" 4LICENSE = "LGPL"
5SECTION = "x11" 5SECTION = "x11"
6DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi" 6DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi"
7RRECOMMENDS = "\ 7RRECOMMENDS_${PN} = "\
8 libopensync-plugin-file \ 8 libopensync-plugin-file \
9 " 9 "
10PV = "0.0+svnr${SRCREV}" 10PV = "0.0+svnr${SRCREV}"
11PR = "r1"
11 12
12SRC_URI = "svn://svn.o-hand.com/repos/sync/trunk;module=sync;proto=http" 13SRC_URI = "svn://svn.o-hand.com/repos/sync/trunk;module=sync;proto=http"
13 14
diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
index 2e07b19c16..2c973ac664 100644
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
+++ b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
@@ -6,9 +6,9 @@ Gadu-Gadu, Groupwise, ICQ and QQ."
6HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" 6HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
7LICENSE = "GPL" 7LICENSE = "GPL"
8DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" 8DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
9RDEPENDS = "telepathy-mission-control" 9RDEPENDS_${PN} = "telepathy-mission-control"
10RRECOMMENDS = "telepathy-gabble" 10RRECOMMENDS_${PN} = "telepathy-gabble"
11PR = "r2" 11PR = "r3"
12 12
13inherit gnome 13inherit gnome
14 14
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
index dcd3b85534..e3f6a9d2b9 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.abiword.org"
3SECTION = "x11/office" 3SECTION = "x11/office"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2" 5DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
6RDEPENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ 6RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
7 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" 7 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
8 8
9SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" 9SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb b/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
index 47cf9e03c0..7ee0f866a0 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
+++ b/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
@@ -1,5 +1,7 @@
1require abiword-2.5.inc 1require abiword-2.5.inc
2 2
3PR = "r1"
4
3EXTRA_OECONF += "--enable-embedded" 5EXTRA_OECONF += "--enable-embedded"
4 6
5S = "${WORKDIR}/abiword-${PV}" 7S = "${WORKDIR}/abiword-${PV}"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc
index d2fabf931c..5d7e3ce600 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword.inc
+++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.abiword.org""
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5 5
6DEPENDS = "libgsf libglade libfribidi libxml2 wv" 6DEPENDS = "libgsf libglade libfribidi libxml2 wv"
7RRECOMMENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ 7RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
8 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" 8 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
9 9
10# Share this file between recipes that use cvs and that pull tarballs 10# Share this file between recipes that use cvs and that pull tarballs
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb b/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb
index 566d0fa203..c10d761b06 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb
+++ b/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb
@@ -1,5 +1,5 @@
1require abiword-2.5.inc 1require abiword-2.5.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5RCONFLICTS = "abiword-embedded" 5RCONFLICTS_${PN} = "abiword-embedded"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
index e0e3bd7d60..4dffbd0710 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
+++ b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
@@ -1,7 +1,7 @@
1require abiword.inc 1require abiword.inc
2 2
3PV="2.5.0+cvs${SRCDATE}" 3PV="2.5.0+cvs${SRCDATE}"
4PR = "r3" 4PR = "r4"
5 5
6SRC_URI = "${CVSURI}" 6SRC_URI = "${CVSURI}"
7 7
diff --git a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
index 760c5c10af..3ac7d6e2eb 100644
--- a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
+++ b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
@@ -1,10 +1,10 @@
1DESCRIPTION = "GNOME Structured File Library" 1DESCRIPTION = "GNOME Structured File Library"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "libs" 3SECTION = "libs"
4PR = "r0" 4PR = "r1"
5 5
6DEPENDS= "libxml2 bzip2 glib-2.0 zlib" 6DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
7RDEPENDS = "gconf gnome-vfs" 7RDEPENDS_${PN} = "gconf gnome-vfs"
8 8
9 9
10PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " 10PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
diff --git a/meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb b/meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb
index 60be56de13..21716cf72e 100644
--- a/meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb
+++ b/meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb
@@ -1,9 +1,9 @@
1DESCRIPTION = "Gtk2 theme files to accompany default Matchbox themes" 1DESCRIPTION = "Gtk2 theme files to accompany default Matchbox themes"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "gtk-engines" 3DEPENDS = "gtk-engines"
4RDEPENDS = "matchbox-wm gtk-engine-clearlooks" 4RDEPENDS_${PN} = "matchbox-wm gtk-engine-clearlooks"
5SECTION = "x11/base" 5SECTION = "x11/base"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "file://gtkrc" 8SRC_URI = "file://gtkrc"
9 9
diff --git a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
index d186727886..05bedb9e81 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
+++ b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
@@ -6,9 +6,9 @@ LICENSE="GPL"
6LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c" 6LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c"
7 7
8PV = "1.1.11+git${SRCREV}" 8PV = "1.1.11+git${SRCREV}"
9PR = "r3" 9PR = "r4"
10 10
11RDEPENDS = "pm-utils" 11RDEPENDS_${PN} = "pm-utils"
12 12
13SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git;protocol=git \ 13SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git;protocol=git \
14 file://remove-doc-check.patch;patch=1 \ 14 file://remove-doc-check.patch;patch=1 \
diff --git a/meta/recipes-bsp/grub/grub_0.97.bb b/meta/recipes-bsp/grub/grub_0.97.bb
index 503dac07ea..131d942cc7 100644
--- a/meta/recipes-bsp/grub/grub_0.97.bb
+++ b/meta/recipes-bsp/grub/grub_0.97.bb
@@ -10,8 +10,8 @@ LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \
11 file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6" 11 file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6"
12 12
13RDEPENDS = "diffutils" 13RDEPENDS_${PN} = "diffutils"
14PR = "r2" 14PR = "r3"
15 15
16SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ 16SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
17 file://autohell.patch;apply=yes " 17 file://autohell.patch;apply=yes "
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index ef004e60e5..fa29470485 100644
--- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
@@ -3,9 +3,9 @@ SECTION = "kernel/modules"
3PRIORITY = "optional" 3PRIORITY = "optional"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
6RDEPENDS = "update-modules" 6RDEPENDS_${PN} = "update-modules"
7PACKAGE_ARCH = "all" 7PACKAGE_ARCH = "all"
8PR = "r11" 8PR = "r12"
9 9
10SRC_URI = "file://hostap_cs.modalias \ 10SRC_URI = "file://hostap_cs.modalias \
11 file://COPYING.patch" 11 file://COPYING.patch"
diff --git a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
index bc22f6f871..a24d004adb 100644
--- a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
+++ b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
@@ -3,9 +3,9 @@ SECTION = "kernel/modules"
3PRIORITY = "optional" 3PRIORITY = "optional"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
6RDEPENDS = "update-modules" 6RDEPENDS_${PN} = "update-modules"
7PACKAGE_ARCH = "all" 7PACKAGE_ARCH = "all"
8PR = "r5" 8PR = "r6"
9 9
10SRC_URI = "file://orinoco_cs.conf \ 10SRC_URI = "file://orinoco_cs.conf \
11 file://COPYING.patch" 11 file://COPYING.patch"
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index dbe5d83b09..0792670463 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
3LICENSE = "GPL" 3LICENSE = "GPL"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" 4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
5 5
6RDEPENDS = "distcc task-poky-nfs-server oprofileui-server rsync bash" 6RDEPENDS_${PN} = "distcc task-poky-nfs-server oprofileui-server rsync bash"
7PR = "r18" 7PR = "r19"
8 8
9SRC_URI = "file://distcc.sh \ 9SRC_URI = "file://distcc.sh \
10 file://anjuta-remote-run \ 10 file://anjuta-remote-run \
diff --git a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
index 523f72dbd4..64145a3e33 100644
--- a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
+++ b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
@@ -3,8 +3,9 @@ SECTION = "base"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS = "tslib" 5DEPENDS = "tslib"
6RDEPENDS = "xrandr" 6RDEPENDS_${PN} = "xrandr"
7PV = "0.0+svnr${SRCREV}" 7PV = "0.0+svnr${SRCREV}"
8PR = "r1"
8 9
9SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http" 10SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"
10 11
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index b266ea4141..5c3b4dd75e 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -16,7 +16,7 @@ PRIORITY = "optional"
16LICENSE = "GPLv2+ & LGPLv2.1+" 16LICENSE = "GPLv2+ & LGPLv2.1+"
17 17
18DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade" 18DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
19RRECOMMENDS = "libnss-mdns" 19RRECOMMENDS_${PN} = "libnss-mdns"
20RRECOMMENDS_avahi-daemon = "libnss-mdns" 20RRECOMMENDS_avahi-daemon = "libnss-mdns"
21 21
22SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ 22SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb b/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
index b2e9efb7f9..fb339e79ab 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.28.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" 7 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
8 8
9RDEPENDS_avahi-daemon = "sysvinit-pidof" 9RDEPENDS_avahi-daemon = "sysvinit-pidof"
10PR = "r0" 10PR = "r1"
11 11
12EXTRA_OECONF += "--disable-gtk3" 12EXTRA_OECONF += "--disable-gtk3"
13 13
diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index 0cdb057521..4c94d2aeaf 100644
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
@@ -7,8 +7,8 @@ LICENSE = "LGPLv2.1+"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
8 8
9DEPENDS = "avahi" 9DEPENDS = "avahi"
10RDEPENDS = "avahi-daemon" 10RDEPENDS_${PN} = "avahi-daemon"
11PR = "r1" 11PR = "r2"
12 12
13SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" 13SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
14 14
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
index d86bd0f737..a2bac61b91 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
10 10
11# util-linux for libblkid 11# util-linux for libblkid
12DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers" 12DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
13RDEPENDS = "portmap" 13RDEPENDS_${PN} = "portmap"
14RRECOMMENDS = "kernel-module-nfsd" 14RRECOMMENDS_${PN} = "kernel-module-nfsd"
15 15
16PR = "r0" 16PR = "r1"
17 17
18SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ 18SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
19 file://nfs-utils-1.0.6-uclibc.patch \ 19 file://nfs-utils-1.0.6-uclibc.patch \
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index 79805614d3..aa3684a440 100644
--- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
@@ -1,8 +1,8 @@
1SECTION = "console/network" 1SECTION = "console/network"
2DESCRIPTION = "Enables PPP dial-in through a serial connection" 2DESCRIPTION = "Enables PPP dial-in through a serial connection"
3DEPENDS = "ppp" 3DEPENDS = "ppp"
4RDEPENDS = "ppp" 4RDEPENDS_${PN} = "ppp"
5PR = "r5" 5PR = "r6"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb
index 16d88dc86c..02aed1d9ab 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
10AUTHOR = "Thomas Hood" 10AUTHOR = "Thomas Hood"
11HOMEPAGE = "http://packages.debian.org/resolvconf" 11HOMEPAGE = "http://packages.debian.org/resolvconf"
12DEPENDS = "bash" 12DEPENDS = "bash"
13RDEPENDS = "bash" 13RDEPENDS_${PN} = "bash"
14PR = "r1" 14PR = "r2"
15 15
16SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" 16SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
17 17
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index ecaf593b22..e2b681f9b2 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -13,7 +13,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
13RDEPENDS_${PN}-dev = "linux-libc-headers-dev" 13RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
14#this leads to circular deps, so lets not add it yet 14#this leads to circular deps, so lets not add it yet
15#RDEPENDS_ldd += " bash" 15#RDEPENDS_ldd += " bash"
16#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" 16#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
17PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" 17PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
18PROVIDES += "virtual/libintl virtual/libiconv" 18PROVIDES += "virtual/libintl virtual/libiconv"
19 19
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 758c607c8d..1d2509e68b 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,10 +3,10 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
3SECTION = "base" 3SECTION = "base"
4PRIORITY = "required" 4PRIORITY = "required"
5DEPENDS = "makedevs" 5DEPENDS = "makedevs"
6RDEPENDS = "makedevs" 6RDEPENDS_${PN} = "makedevs"
7LICENSE = "GPLv2" 7LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
9PR = "r122" 9PR = "r123"
10 10
11SRC_URI = "file://functions \ 11SRC_URI = "file://functions \
12 file://halt \ 12 file://halt \
diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb
index 54096ef6a0..d2bcde5a22 100644
--- a/meta/recipes-devtools/apt/apt_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt_0.7.14.bb
@@ -1,9 +1,9 @@
1DEPENDS = "curl db" 1DEPENDS = "curl db"
2RDEPENDS = "dpkg" 2RDEPENDS_${PN} = "dpkg"
3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" 3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
4require apt.inc 4require apt.inc
5 5
6PR = "r3" 6PR = "r4"
7 7
8SRC_URI += "file://nodoc.patch \ 8SRC_URI += "file://nodoc.patch \
9 file://includes-fix.patch" 9 file://includes-fix.patch"
diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
index 1b14a6b119..b6b7b7878a 100644
--- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
@@ -4,10 +4,10 @@ compilation of C/C++/ObjC code across machines on a network."
4SECTION = "devel" 4SECTION = "devel"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7PR = "r5" 7PR = "r6"
8 8
9DEPENDS = "avahi gtk+" 9DEPENDS = "avahi gtk+"
10RRECOMMENDS = "avahi-daemon" 10RRECOMMENDS_${PN} = "avahi-daemon"
11 11
12# Upstream change this patch periodically so store locally 12# Upstream change this patch periodically so store locally
13# http://0pointer.de/public/distcc-avahi.patch 13# http://0pointer.de/public/distcc-avahi.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
index 3f9195a4c4..3681ab3f2c 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -34,7 +34,7 @@ do_install () {
34} 34}
35 35
36# blkid used to be part of e2fsprogs but is useful outside, add it 36# blkid used to be part of e2fsprogs but is useful outside, add it
37# as an RDEPENDS so that anything relying on it being in e2fsprogs 37# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs
38# still works 38# still works
39RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks" 39RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks"
40 40
diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index f9bdf93b7b..9df79f580b 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -8,8 +8,8 @@ SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
8S = "${WORKDIR}/intltool-${PV}" 8S = "${WORKDIR}/intltool-${PV}"
9 9
10DEPENDS = "libxml-parser-perl-native" 10DEPENDS = "libxml-parser-perl-native"
11#RDEPENDS = "libxml-parser-perl" 11#RDEPENDS_${PN} = "libxml-parser-perl"
12RRECOMMENDS = "perl-modules" 12RRECOMMENDS_${PN} = "perl-modules"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index 4b5fe820e8..88d441cb93 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
@@ -1,7 +1,7 @@
1require intltool.inc 1require intltool.inc
2LICENSE="GPLv2" 2LICENSE="GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4PR = "r0" 4PR = "r1"
5 5
6SRC_URI_append = " file://intltool-nowarn-0.40.0.patch" 6SRC_URI_append = " file://intltool-nowarn-0.40.0.patch"
7 7
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
index 087d25498f..ce039e5aa1 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
@@ -5,10 +5,10 @@ PRIORITY = "optional"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" 7 file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
8RDEPENDS = "python" 8RDEPENDS_${PN} = "python"
9RDEPENDS_virtclass-native = "" 9RDEPENDS_${PN}_virtclass-native = ""
10PV = "0.1.8+svnr${SRCREV}" 10PV = "0.1.8+svnr${SRCREV}"
11PR = "r1" 11PR = "r2"
12 12
13SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ 13SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
14 file://index-ignore-filenotfound.patch" 14 file://index-ignore-filenotfound.patch"
diff --git a/meta/recipes-devtools/python/python-dbus_0.83.1.bb b/meta/recipes-devtools/python/python-dbus_0.83.1.bb
index d405ffa8c1..fcf638d441 100644
--- a/meta/recipes-devtools/python/python-dbus_0.83.1.bb
+++ b/meta/recipes-devtools/python/python-dbus_0.83.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=f5612614133e9a2f2dad527d97554670" 5LIC_FILES_CHKSUM = "file://COPYING;md5=f5612614133e9a2f2dad527d97554670"
6DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" 6DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
7PR = "ml0" 7PR = "ml1"
8 8
9SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" 9SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
10 10
@@ -20,6 +20,6 @@ export HOST_SYS
20export STAGING_LIBDIR 20export STAGING_LIBDIR
21export STAGING_INCDIR 21export STAGING_INCDIR
22 22
23RDEPENDS = "python-io python-logging python-stringold python-threading python-xml" 23RDEPENDS_${PN} = "python-io python-logging python-stringold python-threading python-xml"
24 24
25FILES_${PN}-dev += "${libdir}/pkgconfig 25FILES_${PN}-dev += "${libdir}/pkgconfig
diff --git a/meta/recipes-devtools/python/python-gst_0.10.19.bb b/meta/recipes-devtools/python/python-gst_0.10.19.bb
index 16852d1a15..22d63393b4 100644
--- a/meta/recipes-devtools/python/python-gst_0.10.19.bb
+++ b/meta/recipes-devtools/python/python-gst_0.10.19.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Python Gstreamer bindings"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "LGPLv2.1" 3LICENSE = "LGPLv2.1"
4DEPENDS = "gstreamer gst-plugins-base python-pygobject" 4DEPENDS = "gstreamer gst-plugins-base python-pygobject"
5RDEPENDS += "python-pygtk" 5RDEPENDS_${PN} += "python-pygtk"
6PR = "r0" 6PR = "r1"
7 7
8SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ 8SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
9 file://python-path.patch" 9 file://python-path.patch"
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index bd6fe1d227..ce3b977114 100644
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
@@ -4,9 +4,9 @@ PRIORITY = "optional"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec" 5LIC_FILES_CHKSUM = "file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec"
6DEPENDS = "freetype jpeg tiff" 6DEPENDS = "freetype jpeg tiff"
7RDEPENDS = "python-lang python-stringold" 7RDEPENDS_${PN} = "python-lang python-stringold"
8SRCNAME = "Imaging" 8SRCNAME = "Imaging"
9PR = "ml0" 9PR = "ml1"
10 10
11SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ 11SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
12 file://path.patch" 12 file://path.patch"
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb b/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
index c8841f4405..b868ad8cde 100644
--- a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
+++ b/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://README;endline=13;md5=fbfe545b1869617123a08c0983ef17b
8 file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518" 8 file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518"
9 9
10DEPENDS = "curl python" 10DEPENDS = "curl python"
11RDEPENDS = "python-core curl" 11RDEPENDS_${PN} = "python-core curl"
12SRCNAME = "pycurl" 12SRCNAME = "pycurl"
13PR = "r0" 13PR = "r1"
14 14
15SRC_URI = "\ 15SRC_URI = "\
16 http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ 16 http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \
diff --git a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
index c32d9987ac..f56e1fec84 100644
--- a/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
+++ b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "Python GTK+ 2.17.x Bindings"
2SECTION = "devel/python" 2SECTION = "devel/python"
3# needs gtk+ 2.17.x 3# needs gtk+ 2.17.x
4DEPENDS = "gtk+ libglade python-pycairo python-pygobject" 4DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
5RDEPENDS = "python-shell python-pycairo python-pygobject" 5RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject"
6PROVIDES = "python-pygtk2" 6PROVIDES = "python-pygtk2"
7SRCNAME = "pygtk" 7SRCNAME = "pygtk"
8LICENSE = "LGPLv2.1" 8LICENSE = "LGPLv2.1"
9LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" 9LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
10PR = "ml8.3" 10PR = "ml9"
11 11
12SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.17/${SRCNAME}-${PV}.tar.bz2 \ 12SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.17/${SRCNAME}-${PV}.tar.bz2 \
13 file://fix-gtkunixprint.patch \ 13 file://fix-gtkunixprint.patch \
diff --git a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
index 90b6b16836..827635425d 100644
--- a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
+++ b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
@@ -1,5 +1,5 @@
1require python-pyrex_${PV}.bb 1require python-pyrex_${PV}.bb
2inherit native 2inherit native
3DEPENDS = "python-native" 3DEPENDS = "python-native"
4RDEPENDS = "" 4RDEPENDS_${PN} = ""
5PR = "r0" 5PR = "r1"
diff --git a/meta/recipes-devtools/python/python-scons-native_2.0.1.bb b/meta/recipes-devtools/python/python-scons-native_2.0.1.bb
index a4bcd4258a..f7646a2587 100644
--- a/meta/recipes-devtools/python/python-scons-native_2.0.1.bb
+++ b/meta/recipes-devtools/python/python-scons-native_2.0.1.bb
@@ -1,6 +1,6 @@
1require python-scons_${PV}.bb 1require python-scons_${PV}.bb
2inherit native 2inherit native
3DEPENDS = "python-native" 3DEPENDS = "python-native"
4RDEPENDS = "" 4RDEPENDS_${PN} = ""
5PR = "r0" 5PR = "r1"
6 6
diff --git a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
index 87e96f3443..23771acf2b 100644
--- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Qemu helper utilities from Poky" 1DESCRIPTION = "Qemu helper utilities from Poky"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3RDEPENDS = "qemu-native" 3RDEPENDS_${PN} = "qemu-native"
4PR = "r0" 4PR = "r1"
5 5
6LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999" 6LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999"
7 7
diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
index f7f416193b..18d278db7a 100644
--- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Qemu helper scripts from Poky" 1DESCRIPTION = "Qemu helper scripts from Poky"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3RDEPENDS = "qemu-nativesdk" 3RDEPENDS_${PN} = "qemu-nativesdk"
4PR = "r8" 4PR = "r9"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-helper" 6FILESPATH = "${FILE_DIRNAME}/qemu-helper"
7 7
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.13.bb b/meta/recipes-devtools/subversion/subversion_1.6.13.bb
index bcdb6c22ea..b535f06a61 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.13.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.13.bb
@@ -1,11 +1,11 @@
1DESCRIPTION = "The Subversion (svn) client" 1DESCRIPTION = "The Subversion (svn) client"
2SECTION = "console/network" 2SECTION = "console/network"
3DEPENDS = "apr-util neon" 3DEPENDS = "apr-util neon"
4RDEPENDS = "neon" 4RDEPENDS_${PN} = "neon"
5LICENSE = "Apache BSD" 5LICENSE = "Apache BSD"
6HOMEPAGE = "http://subversion.tigris.org" 6HOMEPAGE = "http://subversion.tigris.org"
7 7
8PR = "r0" 8PR = "r1"
9 9
10SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ 10SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
11 file://disable-revision-install.patch;patch=1 \ 11 file://disable-revision-install.patch;patch=1 \
diff --git a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
index 6897f18153..28a9e6f680 100644
--- a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
+++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "http://code.google.com/p/ubootchart/"
3LICENSE = "GPLv3" 3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" 4LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
5PV = "0.0+r${SRCREV}" 5PV = "0.0+r${SRCREV}"
6PR = "r4" 6PR = "r5"
7 7
8#RRECOMMENDS = "acct" 8#RRECOMMENDS_${PN} = "acct"
9 9
10SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \ 10SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \
11 file://sysvinit.patch;patch=1;pnum=0 \ 11 file://sysvinit.patch;patch=1;pnum=0 \
diff --git a/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb
index 89313d6972..86ef300b09 100644
--- a/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb
+++ b/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb
@@ -3,10 +3,10 @@ SECTION = "console/network"
3LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" 4LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
5 5
6RDEPENDS = "pseudo" 6RDEPENDS_${PN} = "pseudo"
7RDEPENDS_virtclass-native = "pseudo-native" 7RDEPENDS_${PN}_virtclass-native = "pseudo-native"
8RDEPENDS_virtclass-nativesdk = "pseudo-nativesdk" 8RDEPENDS_${PN}_virtclass-nativesdk = "pseudo-nativesdk"
9PR = "r1" 9PR = "r2"
10 10
11SRC_URI = "ftp://linux.mathematik.tu-darmstadt.de/pub/linux/oldstuff/people/okir/nfs-server-${PV}.tar.gz \ 11SRC_URI = "ftp://linux.mathematik.tu-darmstadt.de/pub/linux/oldstuff/people/okir/nfs-server-${PV}.tar.gz \
12 file://001-2.2b47-2.2b51.patch \ 12 file://001-2.2b47-2.2b51.patch \
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index e29556925a..6918263296 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -9,11 +9,11 @@ inherit cmake
9DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev" 9DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev"
10 10
11# rpmdb2solv from sat-solver is run from libzypp 11# rpmdb2solv from sat-solver is run from libzypp
12RDEPENDS = "sat-solver" 12RDEPENDS_${PN} = "sat-solver"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15PV = "0.0-git${SRCPV}" 15PV = "0.0-git${SRCPV}"
16PR = "r3" 16PR = "r4"
17 17
18SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ 18SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
19 file://no-doc.patch \ 19 file://no-doc.patch \
diff --git a/meta/recipes-extended/man-pages/man-pages_3.25.bb b/meta/recipes-extended/man-pages/man-pages_3.25.bb
index b5b200c98a..358f78dc76 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.25.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.25.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
4PRIORITY = "required" 4PRIORITY = "required"
5HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" 5HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"
6LICENSE = "GPL" 6LICENSE = "GPL"
7PR = "r0" 7PR = "r1"
8 8
9LIC_FILES_CHKSUM = "file://README;md5=9dab010c5baa416669e5d17381799dd5" 9LIC_FILES_CHKSUM = "file://README;md5=9dab010c5baa416669e5d17381799dd5"
10SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.tar.gz" 10SRC_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
12SRC_URI[md5sum] = "98ec2324abea77d7a992470dd44d140c" 12SRC_URI[md5sum] = "98ec2324abea77d7a992470dd44d140c"
13SRC_URI[sha256sum] = "474242842a78dc2121687b7db6c32b6c78af5458f2bd809e23563dd185e2b169" 13SRC_URI[sha256sum] = "474242842a78dc2121687b7db6c32b6c78af5458f2bd809e23563dd185e2b169"
14 14
15RDEPENDS = "man" 15RDEPENDS_${PN} = "man"
16 16
17do_configure_prepend() { 17do_configure_prepend() {
18 rm -rf not_installed 18 rm -rf not_installed
diff --git a/meta/recipes-extended/mc/mc_4.7.3.bb b/meta/recipes-extended/mc/mc_4.7.3.bb
index 22a1a9397d..537aa05e37 100644
--- a/meta/recipes-extended/mc/mc_4.7.3.bb
+++ b/meta/recipes-extended/mc/mc_4.7.3.bb
@@ -4,7 +4,9 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5SECTION = "console/utils" 5SECTION = "console/utils"
6DEPENDS = "ncurses glib-2.0" 6DEPENDS = "ncurses glib-2.0"
7RDEPENDS = "ncurses-terminfo" 7RDEPENDS_${PN} = "ncurses-terminfo"
8
9PR = "r1"
8 10
9SRC_URI = "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2" 11SRC_URI = "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2"
10 12
diff --git a/meta/recipes-extended/polkit/polkit_0.99.bb b/meta/recipes-extended/polkit/polkit_0.99.bb
index f578ccad6b..7f969792ea 100644
--- a/meta/recipes-extended/polkit/polkit_0.99.bb
+++ b/meta/recipes-extended/polkit/polkit_0.99.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
7 file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99" 7 file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99"
8 8
9SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz" 9SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz"
10PR = "r0" 10PR = "r1"
11DEPENDS = "libpam expat dbus-glib eggdbus intltool" 11DEPENDS = "libpam expat dbus-glib eggdbus intltool"
12RDEPENDS = "libpam" 12RDEPENDS_${PN} = "libpam"
13EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection" 13EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
14 14
15inherit autotools pkgconfig 15inherit autotools pkgconfig
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index fcbcb3eb75..42f92a7f4e 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -20,7 +20,7 @@ PAM_PLUGINS = " libpam-runtime \
20 pam-plugin-rootok" 20 pam-plugin-rootok"
21 21
22DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 22DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
23RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" 23RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
24 24
25# since we deduce from ${SERIAL_CONSOLE} 25# since we deduce from ${SERIAL_CONSOLE}
26PACKAGE_ARCH = "${MACHINE_ARCH}" 26PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.2.bb b/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
index ca5f533f92..224ae5e38f 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
@@ -1,6 +1,6 @@
1require shadow.inc 1require shadow.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI += "file://shadow.automake-1.11.patch \ 5SRC_URI += "file://shadow.automake-1.11.patch \
6 file://shadow-4.1.3-dots-in-usernames.patch \ 6 file://shadow-4.1.3-dots-in-usernames.patch \
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index 8caf4db39e..c8895e5806 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -5,8 +5,8 @@ LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" 5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
6 6
7DEPENDS = "libzypp augeas" 7DEPENDS = "libzypp augeas"
8RRECOMMENDS = "procps" 8RRECOMMENDS_${PN} = "procps"
9PR = "r1" 9PR = "r2"
10 10
11inherit cmake 11inherit cmake
12 12
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index 9898428972..17fff1c53c 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e"
7 7
8SECTION = "x11/gnome" 8SECTION = "x11/gnome"
9DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" 9DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
10RDEPENDS = "hicolor-icon-theme" 10RDEPENDS_${PN} = "hicolor-icon-theme"
11RRECOMMENDS = "librsvg-gtk" 11RRECOMMENDS_${PN} = "librsvg-gtk"
12PR = "r0" 12PR = "r1"
13 13
14FILES_${PN} += "${datadir}/*" 14FILES_${PN} += "${datadir}/*"
15 15
diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
index 153979e363..5932ddd8c2 100644
--- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
+++ b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
11 11
12SECTION = "x11/gnome" 12SECTION = "x11/gnome"
13 13
14PR = "r0" 14PR = "r1"
15 15
16inherit autotools gnome pkgconfig 16inherit autotools gnome pkgconfig
17 17
18DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf" 18DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf"
19RDEPENDS = "libgnome-keyring" 19RDEPENDS_${PN} = "libgnome-keyring"
20 20
21EXTRA_OECONF = "--disable-gtk-doc" 21EXTRA_OECONF = "--disable-gtk-doc"
22 22
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
index 3bb50d1af3..b730daed34 100644
--- a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
8 8
9inherit gnome 9inherit gnome
10inherit autotools 10inherit autotools
11PR = "r3" 11PR = "r4"
12 12
13SRC_URI += "file://pkgconfig.patch;patch=1" 13SRC_URI += "file://pkgconfig.patch;patch=1"
14 14
@@ -16,4 +16,4 @@ SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c"
16SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" 16SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7"
17 17
18DEPENDS += "shared-mime-info intltool-native" 18DEPENDS += "shared-mime-info intltool-native"
19RDEPENDS = "shared-mime-info" 19RDEPENDS_${PN} = "shared-mime-info"
diff --git a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
index c88a79570a..0c8506a8e7 100644
--- a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
@@ -4,10 +4,10 @@ DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-nativ
4S = "${WORKDIR}/gtk+-${PV}" 4S = "${WORKDIR}/gtk+-${PV}"
5FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" 5FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
6SRC_URI += "file://reduce-dependencies.patch;patch=1" 6SRC_URI += "file://reduce-dependencies.patch;patch=1"
7PR = "r11" 7PR = "r13"
8 8
9#clear recommends for uclibc builds 9#clear recommends for uclibc builds
10RRECOMMENDS = " " 10RRECOMMENDS_${PN} = " "
11RRECOMMENDS_${PN}_linux = " " 11RRECOMMENDS_${PN}_linux = " "
12RRECOMMENDS_${PN}_linux-gnueabi = " " 12RRECOMMENDS_${PN}_linux-gnueabi = " "
13 13
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 5927a0b7fd..62a6a268fc 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -37,10 +37,10 @@ FILES_${PN}-dbg += " \
37 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ 37 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
38 ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" 38 ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
39 39
40BASE_RRECOMMENDS = "ttf-dejavu-sans" 40BASE_RRECOMMENDS_${PN} = "ttf-dejavu-sans"
41BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" 41BASE_RRECOMMENDS_${PN}_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
42BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" 42BASE_RRECOMMENDS_${PN}_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
43BASE_RRECOMMENDS_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" 43BASE_RRECOMMENDS_${PN}_moblin = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
44 44
45GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1" 45GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1"
46 46
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index d829308513..12193f9b97 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -1,6 +1,6 @@
1require gtk+.inc 1require gtk+.inc
2 2
3PR = "r9" 3PR = "r10"
4 4
5SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ 5SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
6 file://xsettings.patch;patch=1 \ 6 file://xsettings.patch;patch=1 \
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index becd2bc29c..1864d1ba06 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -1,6 +1,6 @@
1require gtk+.inc 1require gtk+.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ 5SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
6 file://xsettings.patch;patch=1 \ 6 file://xsettings.patch;patch=1 \
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
index dec518746b..80be21cd4e 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ 4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ 5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" 6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7PR = "r1" 7PR = "r2"
8 8
9SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ 9SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \
10 file://xsettings.patch;patch=1 \ 10 file://xsettings.patch;patch=1 \
diff --git a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
index b3b5ebbc10..d009e4ebe4 100644
--- a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
+++ b/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r9" 9PR = "r10"
10 10
11ALLOW_EMPTY = "1" 11ALLOW_EMPTY = "1"
12 12
@@ -14,7 +14,7 @@ require task-sdk-gmae.inc
14 14
15PACKAGES = "${PN}" 15PACKAGES = "${PN}"
16 16
17RDEPENDS = "\ 17RDEPENDS_${PN} = "\
18 task-poky-sdk \ 18 task-poky-sdk \
19 libglade-dev \ 19 libglade-dev \
20 ${SDK-GMAE} \ 20 ${SDK-GMAE} \
diff --git a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
index cf81bf387e..7dcad61943 100644
--- a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r11" 9PR = "r12"
10 10
11ALLOW_EMPTY = "1" 11ALLOW_EMPTY = "1"
12 12
@@ -14,7 +14,7 @@ require task-sdk-gmae.inc
14 14
15PACKAGES = "${PN} ${PN}-dbg" 15PACKAGES = "${PN} ${PN}-dbg"
16 16
17RDEPENDS = "\ 17RDEPENDS_${PN} = "\
18 task-poky-standalone-sdk-target \ 18 task-poky-standalone-sdk-target \
19 libglade-dev \ 19 libglade-dev \
20 ${SDK-GMAE} \ 20 ${SDK-GMAE} \
diff --git a/meta/recipes-graphics/cairo/cairo_1.10.0.bb b/meta/recipes-graphics/cairo/cairo_1.10.0.bb
index d4d0703244..59e5ff9d57 100644
--- a/meta/recipes-graphics/cairo/cairo_1.10.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.10.0.bb
@@ -2,14 +2,14 @@ require cairo.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" 3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
4 4
5PR = "r0" 5PR = "r1"
6 6
7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" 7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
8 8
9SRC_URI[md5sum] = "70a2ece66cf473d976e2db0f75bf199e" 9SRC_URI[md5sum] = "70a2ece66cf473d976e2db0f75bf199e"
10SRC_URI[sha256sum] = "0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2" 10SRC_URI[sha256sum] = "0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2"
11 11
12RDEPENDS += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \ 12RDEPENDS_${PN} += "libcairo2 libcairo-gobject2 libcairo-script-interpreter2 \
13 cairo-perf-utils" 13 cairo-perf-utils"
14 14
15ALLOW_EMPTY = "1" 15ALLOW_EMPTY = "1"
diff --git a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
index e47b78c078..2ef14b83a8 100644
--- a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
+++ b/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.libsdl.org"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "LGPLv2.1" 4LICENSE = "LGPLv2.1"
5DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk" 5DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk"
6RDEPENDS = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" 6RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
7PR = "r4" 7PR = "r5"
8 8
9LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" 9LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
10 10
diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb
index 729c2a5d4f..aebc11dea1 100644
--- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb
@@ -3,8 +3,9 @@ require xorg-app-common.inc
3DESCRIPTION = "a program to create an index of X font files in a directory" 3DESCRIPTION = "a program to create an index of X font files in a directory"
4 4
5PE = "1" 5PE = "1"
6PR = "r1"
6 7
7RDEPENDS += "mkfontscale" 8RDEPENDS_${PN} += "mkfontscale"
8 9
9BBCLASSEXTEND = "native" 10BBCLASSEXTEND = "native"
10 11
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
index f3b3716355..a1c3c63dc7 100644
--- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \
10 file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" 10 file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb"
11 11
12DEPENDS = "virtual/xserver font-util" 12DEPENDS = "virtual/xserver font-util"
13RDEPENDS = "encodings font-util" 13RDEPENDS_${PN} = "encodings font-util"
14RDEPENDS_virtclass-native = "font-util" 14RDEPENDS_${PN}_virtclass-native = "font-util"
15 15
16PE = "1" 16PE = "1"
17PR = "${INC_PR}.0" 17PR = "${INC_PR}.1"
18 18
19SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" 19SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562"
20SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" 20SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"
diff --git a/meta/recipes-graphics/xorg-font/font-util_1.2.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.2.0.bb
index 972e9e3ae4..a04bd6d5a3 100644
--- a/meta/recipes-graphics/xorg-font/font-util_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-font/font-util_1.2.0.bb
@@ -12,10 +12,10 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
12 12
13DEPENDS = "encodings util-macros" 13DEPENDS = "encodings util-macros"
14DEPENDS_virtclass-native = "util-macros-native" 14DEPENDS_virtclass-native = "util-macros-native"
15RDEPENDS = "mkfontdir mkfontscale encodings" 15RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"
16RDEPENDS_virtclass-native = "mkfontdir-native mkfontscale-native" 16RDEPENDS_${PN}_virtclass-native = "mkfontdir-native mkfontscale-native"
17 17
18PR = "${INC_PR}.0" 18PR = "${INC_PR}.1"
19 19
20do_configure_prepend() { 20do_configure_prepend() {
21 sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in 21 sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
index c2175a9613..5d19b4c704 100644
--- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc
+++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
@@ -5,10 +5,10 @@ SECTION = "x11/fonts"
5LICENSE = "MIT-X" 5LICENSE = "MIT-X"
6 6
7DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native" 7DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
8RDEPENDS = "encodings font-util font-alias" 8RDEPENDS_${PN} = "encodings font-util font-alias"
9 9
10XORG_PN = "${BPN}" 10XORG_PN = "${BPN}"
11INC_PR = "r1" 11INC_PR = "r2"
12 12
13SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" 13SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
14S = "${WORKDIR}/${XORG_PN}-${PV}" 14S = "${WORKDIR}/${XORG_PN}-${PV}"
diff --git a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb
index 9b89400bdb..a42745fc8a 100644
--- a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb
@@ -2,9 +2,9 @@ require xorg-util-common.inc
2LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" 2LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d"
3DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" 3DESCRIPTION = "create dependencies in makefiles using 'gcc -M'"
4DEPENDS = "util-macros" 4DEPENDS = "util-macros"
5RDEPENDS = "gcc" 5RDEPENDS_${PN} = "gcc"
6 6
7PR = "r2" 7PR = "r3"
8PE = "1" 8PE = "1"
9 9
10SRC_URI[md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd" 10SRC_URI[md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd"
diff --git a/meta/recipes-graphics/xorg-util/imake_1.0.4.bb b/meta/recipes-graphics/xorg-util/imake_1.0.4.bb
index 8943c2dd4c..d770590e1c 100644
--- a/meta/recipes-graphics/xorg-util/imake_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-util/imake_1.0.4.bb
@@ -2,11 +2,11 @@ require xorg-util-common.inc
2 2
3DESCRIPTION = "C preprocessor interface to the make utility" 3DESCRIPTION = "C preprocessor interface to the make utility"
4DEPENDS = "util-macros" 4DEPENDS = "util-macros"
5RDEPENDS = "perl xproto" 5RDEPENDS_${PN} = "perl xproto"
6 6
7LIC_FILES_CHKSUM = "file://COPYING;md5=b9c6cfb044c6d0ff899eaafe4c729367" 7LIC_FILES_CHKSUM = "file://COPYING;md5=b9c6cfb044c6d0ff899eaafe4c729367"
8 8
9PR = "r0" 9PR = "r1"
10PE = "1" 10PE = "1"
11 11
12SRC_URI[md5sum] = "0fd1e53d94142ddee5340f87de0b9561" 12SRC_URI[md5sum] = "0fd1e53d94142ddee5340f87de0b9561"
diff --git a/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb b/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
index 85e065f999..eb707e06d1 100644
--- a/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
+++ b/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
12SECTION = "devel" 12SECTION = "devel"
13 13
14DEPENDS = "popt binutils" 14DEPENDS = "popt binutils"
15RDEPENDS = "binutils-symlinks" 15RDEPENDS_${PN} = "binutils-symlinks"
16RRECOMMENDS = "kernel-vmlinux" 16RRECOMMENDS_${PN} = "kernel-vmlinux"
17 17
18PR = "r0" 18PR = "r1"
19 19
20SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ 20SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
21 file://opstart.patch \ 21 file://opstart.patch \
diff --git a/meta/recipes-kernel/oprofile/oprofile_cvs.bb b/meta/recipes-kernel/oprofile/oprofile_cvs.bb
index f2ff5adfc2..f2b5520f63 100644
--- a/meta/recipes-kernel/oprofile/oprofile_cvs.bb
+++ b/meta/recipes-kernel/oprofile/oprofile_cvs.bb
@@ -1,13 +1,13 @@
1PV = "0.9.4+cvs${SRCDATE}" 1PV = "0.9.4+cvs${SRCDATE}"
2PR = "r0" 2PR = "r1"
3SECTION = "devel" 3SECTION = "devel"
4SUMMARY = "System-Wide Profiler" 4SUMMARY = "System-Wide Profiler"
5DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ 5DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
6of profiling all running code at low overhead." 6of profiling all running code at low overhead."
7LICENSE = "GPL" 7LICENSE = "GPL"
8DEPENDS = "popt binutils" 8DEPENDS = "popt binutils"
9RDEPENDS = "binutils-symlinks" 9RDEPENDS_${PN} = "binutils-symlinks"
10RRECOMMENDS = "kernel-vmlinux" 10RRECOMMENDS_${PN} = "kernel-vmlinux"
11 11
12DEFAULT_PREFERENCE = "-1" 12DEFAULT_PREFERENCE = "-1"
13 13
diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
index 93bc1493d9..a473bb58c7 100644
--- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
+++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" 4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
5 5
6PACKAGE_ARCH = "all" 6PACKAGE_ARCH = "all"
7RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " 7RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
8PR = "r7" 8PR = "r8"
9 9
10SRC_URI = "file://update-modules \ 10SRC_URI = "file://update-modules \
11 file://COPYING.GPL" 11 file://COPYING.GPL"
@@ -25,7 +25,7 @@ do_install() {
25# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which 25# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which
26# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have 26# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have
27# to deal with that unique legacy corner case, we just nullify the 27# to deal with that unique legacy corner case, we just nullify the
28# RDEPENDS here and handle it in the Unslung image recipe. I know this 28# RDEPENDS_${PN} here and handle it in the Unslung image recipe. I know this
29# is ugly. Please don't remove it unless you first make the RDEPENDS 29# is ugly. Please don't remove it unless you first make the RDEPENDS
30# line at the top of this file understand that a machine can be used 30# line at the top of this file understand that a machine can be used
31# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's 31# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
diff --git a/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb b/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
index a4cf815336..5eb7e425c1 100644
--- a/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
@@ -1,5 +1,5 @@
1DEPENDS = "gstreamer" 1DEPENDS = "gstreamer"
2RDEPENDS = "libomxil" 2RDEPENDS_${PN} = "libomxil"
3LICENSE = "LGPLv2.1" 3LICENSE = "LGPLv2.1"
4LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
5 file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc" 5 file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"
@@ -10,7 +10,7 @@ inherit autotools
10 10
11EXTRA_OECONF += "--disable-valgrind" 11EXTRA_OECONF += "--disable-valgrind"
12 12
13PR = "r0" 13PR = "r1"
14 14
15FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so" 15FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so"
16FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.*a" 16FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.*a"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
index 006efdfd03..cbc13daf0a 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
7 file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" 7 file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
8 8
9DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi" 9DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi"
10RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ 10RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
11 gnome-vfs-plugin-sftp" 11 gnome-vfs-plugin-sftp"
12 12
13SRC_URI += " file://gst-plugins-base-tremor.patch \ 13SRC_URI += " file://gst-plugins-base-tremor.patch \
@@ -16,7 +16,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch \
16SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" 16SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c"
17SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" 17SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7"
18 18
19PR = "r2" 19PR = "r3"
20 20
21inherit gettext 21inherit gettext
22 22
diff --git a/meta/recipes-qt/qt-apps/quicky_0.4.bb b/meta/recipes-qt/qt-apps/quicky_0.4.bb
index 9e367f261d..20c04f8db0 100644
--- a/meta/recipes-qt/qt-apps/quicky_0.4.bb
+++ b/meta/recipes-qt/qt-apps/quicky_0.4.bb
@@ -4,6 +4,8 @@ LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14" 4LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14"
5SECTION = "x11/apps" 5SECTION = "x11/apps"
6 6
7PR = "r1"
8
7DEPENDS = "qt4-x11-free" 9DEPENDS = "qt4-x11-free"
8 10
9SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz" 11SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
diff --git a/meta/recipes-sato/eds/eds-tools_bzr.bb b/meta/recipes-sato/eds/eds-tools_bzr.bb
index 0dfcf593c0..9cead16516 100644
--- a/meta/recipes-sato/eds/eds-tools_bzr.bb
+++ b/meta/recipes-sato/eds/eds-tools_bzr.bb
@@ -1,10 +1,10 @@
1LICENSE = "GPLv2" 1LICENSE = "GPLv2"
2SECTION = "x11" 2SECTION = "x11"
3DEPENDS = "dbus-glib eds-dbus" 3DEPENDS = "dbus-glib eds-dbus"
4RDEPENDS = "libedata-book" 4RDEPENDS_${PN} = "libedata-book"
5DESCRIPTION = "Test applications for EDS" 5DESCRIPTION = "Test applications for EDS"
6 6
7PR = "r0" 7PR = "r1"
8 8
9SRC_URI = "bzr://burtonini.com/bzr/eds-tools;proto=http" 9SRC_URI = "bzr://burtonini.com/bzr/eds-tools;proto=http"
10 10
diff --git a/meta/recipes-sato/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_svn.bb
index a70863e6bc..d1e2a3f43f 100644
--- a/meta/recipes-sato/gaku/gaku_svn.bb
+++ b/meta/recipes-sato/gaku/gaku_svn.bb
@@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
4 file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a" 4 file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a"
5DEPENDS = "gtk+ gstreamer libowl-av" 5DEPENDS = "gtk+ gstreamer libowl-av"
6 6
7RDEPENDS = "gst-plugins-base-audioconvert \ 7RDEPENDS_${PN} = "gst-plugins-base-audioconvert \
8 gst-plugins-base-audioresample \ 8 gst-plugins-base-audioresample \
9 gst-plugins-base-typefindfunctions \ 9 gst-plugins-base-typefindfunctions \
10 gst-plugins-base-playbin" 10 gst-plugins-base-playbin"
11 11
12RRECOMMENDS = "gst-plugins-good-id3demux \ 12RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \
13 gst-plugins-base-vorbis \ 13 gst-plugins-base-vorbis \
14 gst-plugins-base-alsa \ 14 gst-plugins-base-alsa \
15 gst-plugins-base-ogg \ 15 gst-plugins-base-ogg \
@@ -17,7 +17,7 @@ RRECOMMENDS = "gst-plugins-good-id3demux \
17 17
18PV = "0.0+svnr${SRCREV}" 18PV = "0.0+svnr${SRCREV}"
19 19
20PR = "r3" 20PR = "r4"
21 21
22SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http" 22SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
23 23
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
index af748f14ff..88484eb12b 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" 7 file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28"
8 8
9DEPENDS = "gconf gtk+" 9DEPENDS = "gconf gtk+"
10RDEPENDS = "settings-daemon" 10RDEPENDS_${PN} = "settings-daemon"
11 11
12PV = "0.0+svnr${SRCREV}" 12PV = "0.0+svnr${SRCREV}"
13PR = "r1"
13 14
14S = "${WORKDIR}/${PN}" 15S = "${WORKDIR}/${PN}"
15 16
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
index 337738edf8..935136d6fb 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b" 8 file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
9 9
10DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" 10DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
11RDEPENDS = "formfactor dbus-wait" 11RDEPENDS_${PN} = "formfactor dbus-wait"
12SECTION = "x11" 12SECTION = "x11"
13PV = "0.0+svnr${SRCREV}" 13PV = "0.0+svnr${SRCREV}"
14PR = "r4" 14PR = "r5"
15 15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
17 file://configure_fix.patch;patch=1;maxrev=1819 \ 17 file://configure_fix.patch;patch=1;maxrev=1819 \
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index 96d644c3c9..a4abea4b8b 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL"
6LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" 6LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63"
7 7
8SECTION = "x11" 8SECTION = "x11"
9RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" 9RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session"
10PR = "r27" 10PR = "r28"
11 11
12# This package is architecture specific because the session script is modified 12# This package is architecture specific because the session script is modified
13# based on the machine architecture. 13# based on the machine architecture.
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
index 4eeeed6d24..15bd37ac8c 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
9 9
10SECTION = "x11" 10SECTION = "x11"
11DEPENDS = "gtk+ gstreamer gst-plugins-base" 11DEPENDS = "gtk+ gstreamer gst-plugins-base"
12RDEPENDS = "gst-meta-base" 12RDEPENDS_${PN} = "gst-meta-base"
13RRECOMMENDS = "gst-meta-audio gst-meta-video" 13RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
14 14
15PV = "0.0+svnr${SRCREV}" 15PV = "0.0+svnr${SRCREV}"
16PR = "r5" 16PR = "r6"
17 17
18S = "${WORKDIR}/${PN}" 18S = "${WORKDIR}/${PN}"
19 19
diff --git a/meta/recipes-sato/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc
index a424295aca..ce990d7ddd 100644
--- a/meta/recipes-sato/pimlico/contacts.inc
+++ b/meta/recipes-sato/pimlico/contacts.inc
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
6SECTION = "x11" 6SECTION = "x11"
7DEPENDS = "glib-2.0 gtk+ eds-dbus" 7DEPENDS = "glib-2.0 gtk+ eds-dbus"
8DEPENDS_append_poky = " libowl" 8DEPENDS_append_poky = " libowl"
9RDEPENDS = "libedata-book" 9RDEPENDS_${PN} = "libedata-book"
10 10
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
diff --git a/meta/recipes-sato/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb
index 1e4628737d..a9e3f15ad1 100644
--- a/meta/recipes-sato/pimlico/contacts_0.9.bb
+++ b/meta/recipes-sato/pimlico/contacts_0.9.bb
@@ -1,5 +1,5 @@
1require contacts.inc 1require contacts.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz" 5SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb
index c375435309..0d2e235e56 100644
--- a/meta/recipes-sato/pimlico/contacts_git.bb
+++ b/meta/recipes-sato/pimlico/contacts_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" 6 file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
7 7
8PV = "0.12+git${SRCPV}" 8PV = "0.12+git${SRCPV}"
9PR = "r1" 9PR = "r2"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
diff --git a/meta/recipes-sato/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc
index 6ef7b60611..01ab409625 100644
--- a/meta/recipes-sato/pimlico/dates.inc
+++ b/meta/recipes-sato/pimlico/dates.inc
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"
6 6
7SECTION = "x11" 7SECTION = "x11"
8DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" 8DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
9RDEPENDS = "libedata-cal" 9RDEPENDS_${PN} = "libedata-cal"
10 10
11inherit autotools pkgconfig gtk-icon-cache 11inherit autotools pkgconfig gtk-icon-cache
12 12
diff --git a/meta/recipes-sato/pimlico/dates_0.4.8.bb b/meta/recipes-sato/pimlico/dates_0.4.8.bb
index 13afc157d0..ca88a7301e 100644
--- a/meta/recipes-sato/pimlico/dates_0.4.8.bb
+++ b/meta/recipes-sato/pimlico/dates_0.4.8.bb
@@ -1,5 +1,5 @@
1require dates.inc 1require dates.inc
2 2
3PR = "r3" 3PR = "r4"
4 4
5SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz" 5SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
index d09f4e6216..bceeec671e 100644
--- a/meta/recipes-sato/pimlico/dates_git.bb
+++ b/meta/recipes-sato/pimlico/dates_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
6 file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa" 6 file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
7 7
8PV = "0.4.11+git${SRCPV}" 8PV = "0.4.11+git${SRCPV}"
9PR = "r1" 9PR = "r2"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
diff --git a/meta/recipes-support/enchant/enchant_1.6.0.bb b/meta/recipes-support/enchant/enchant_1.6.0.bb
index 7df4f9738b..a3ef37912a 100644
--- a/meta/recipes-support/enchant/enchant_1.6.0.bb
+++ b/meta/recipes-support/enchant/enchant_1.6.0.bb
@@ -6,11 +6,11 @@ LICENSE = "LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \ 6LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \
7 file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18" 7 file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18"
8DEPENDS = "aspell glib-2.0" 8DEPENDS = "aspell glib-2.0"
9RDEPENDS = "aspell" 9RDEPENDS_${PN} = "aspell"
10 10
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13PR = "r0" 13PR = "r1"
14 14
15SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz" 15SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
16 16
diff --git a/meta/recipes-support/hal/hal.inc b/meta/recipes-support/hal/hal.inc
index 839dfd0652..ee6c7ba15d 100644
--- a/meta/recipes-support/hal/hal.inc
+++ b/meta/recipes-support/hal/hal.inc
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+ | AFL"
7LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31" 7LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31"
8 8
9DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native" 9DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native"
10RDEPENDS += "udev hal-info" 10RDEPENDS_${PN} += "udev hal-info"
11 11
12SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ 12SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \
13 file://20hal" 13 file://20hal"
diff --git a/meta/recipes-support/hal/hal_0.5.14.bb b/meta/recipes-support/hal/hal_0.5.14.bb
index f9437f8d60..8b82ca8502 100644
--- a/meta/recipes-support/hal/hal_0.5.14.bb
+++ b/meta/recipes-support/hal/hal_0.5.14.bb
@@ -1,6 +1,6 @@
1require hal.inc 1require hal.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" 5EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
6EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'" 6EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
diff --git a/meta/recipes-support/hal/hal_git.bb b/meta/recipes-support/hal/hal_git.bb
index baed472375..483867f267 100644
--- a/meta/recipes-support/hal/hal_git.bb
+++ b/meta/recipes-support/hal/hal_git.bb
@@ -1,7 +1,7 @@
1require hal.inc 1require hal.inc
2 2
3PV = "0.5.9.1+git${SRCDATE}" 3PV = "0.5.9.1+git${SRCDATE}"
4PR = "r7" 4PR = "r8"
5 5
6SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ 6SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
7 file://20hal \ 7 file://20hal \