aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-07-28 21:28:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-04 15:01:16 +0100
commitd6dca85028640034b1a5356920aad3268bd4f1c2 (patch)
tree65d1c3b12cc4713c8487fbec467af787b356b46b /meta
parent243ee5509995403c131114aef1a75c5d2af2e0cc (diff)
downloadopenembedded-core-contrib-d6dca85028640034b1a5356920aad3268bd4f1c2.tar.gz
openembedded-core-contrib-d6dca85028640034b1a5356920aad3268bd4f1c2.tar.bz2
openembedded-core-contrib-d6dca85028640034b1a5356920aad3268bd4f1c2.zip
SRC_URI, S: use BPN instead of PN for multilib case
in multilibcase, PN has multilib prefix, so it is not correct to use PN in SRC_URI and S. instead, we've dedicately pruned multilib prefix in BPN, so BPN is the right alternative for PN. Signed-off-by: Yu Ke <ke.y@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb4
-rw-r--r--meta/recipes-bsp/zaurusd/zaurusd_svn.bb2
-rw-r--r--meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb2
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb2
-rw-r--r--meta/recipes-connectivity/ofono/ofono_0.50.bb2
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib_0.14.3.bb2
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle_0.1.8.bb2
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb2
-rw-r--r--meta/recipes-core/dbus-wait/dbus-wait_svn.bb2
-rw-r--r--meta/recipes-core/glib-networking/glib-networking_2.28.7.bb2
-rw-r--r--meta/recipes-devtools/distcc/distcc_2.18.3.bb2
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.6.15.bb2
-rw-r--r--meta/recipes-extended/blktool/blktool_4-6.bb2
-rw-r--r--meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb2
-rw-r--r--meta/recipes-extended/libidn/libidn_0.6.14.bb2
-rw-r--r--meta/recipes-extended/libidn/libidn_1.22.bb2
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb4
-rw-r--r--meta/recipes-extended/mktemp/mktemp_1.7.bb2
-rw-r--r--meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb2
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-driver-common.inc2
-rw-r--r--meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb2
-rw-r--r--meta/recipes-sato/eds/eds-tools_bzr.bb2
-rw-r--r--meta/recipes-sato/gaku/gaku_svn.bb2
-rw-r--r--meta/recipes-sato/libical/libical_0.46.bb2
-rw-r--r--meta/recipes-sato/libowl/libowl_svn.bb2
-rw-r--r--meta/recipes-sato/owl-video-widget/libowl-av_svn.bb2
-rw-r--r--meta/recipes-sato/puzzles/oh-puzzles_svn.bb2
-rw-r--r--meta/recipes-sato/puzzles/puzzles_r9175.bb2
-rw-r--r--meta/recipes-sato/screenshot/screenshot_svn.bb2
-rw-r--r--meta/recipes-support/apr/apr-util_1.3.10.bb2
-rw-r--r--meta/recipes-support/apr/apr_1.4.2.bb2
-rw-r--r--meta/recipes-support/liboil/liboil_0.3.17.bb2
-rw-r--r--meta/recipes-support/neon/neon_0.29.5.bb2
34 files changed, 36 insertions, 36 deletions
diff --git a/meta/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb b/meta/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
index 22a55b278a..0e850bcbfe 100644
--- a/meta/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
+++ b/meta/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
@@ -5,7 +5,7 @@ inherit module
SRC_URI = "http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-1.3.13.1397.tar.bz2"
-S = ${WORKDIR}/${PN}-${PV}/eurasiacon/build/linux/omap3430_linux/kbuild/
+S = ${WORKDIR}/${BPN}-${PV}/eurasiacon/build/linux/omap3430_linux/kbuild/
MAKE_TARGETS = "BUILD=debug"
@@ -13,5 +13,5 @@ COMPATIBLE_MACHINE = "(omap-3430ldp|omap-3430sdp|beagleboard|overo)"
do_install() {
mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu
- cp ${WORKDIR}/${PN}-${PV}/eurasiacon/binary_omap3430_linux_debug/*.ko ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu
+ cp ${WORKDIR}/${BPN}-${PV}/eurasiacon/binary_omap3430_linux_debug/*.ko ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu
}
diff --git a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
index 6f9ed033fb..eaac3034c4 100644
--- a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
+++ b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
@@ -11,7 +11,7 @@ PR = "r3"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
file://fix_makefile.patch"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb b/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
index 01f0ef7c12..81a367d739 100644
--- a/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
+++ b/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libgalago dbus glib-2.0"
-SRC_URI = "http://www.galago-project.org/files/releases/source/${BPN}/${P}.tar.gz "
+SRC_URI = "http://www.galago-project.org/files/releases/source/${BPN}/${BPN}-${PV}.tar.gz "
SRC_URI[md5sum] = "fdb81f938f86f380b127158ebb542279"
SRC_URI[sha256sum] = "db42a0d1d0f8b069ea5ac1203207f9178f25ac1367f4910bd48547f5be1db4c2"
diff --git a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
index e82275060b..7abc41fc14 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
@@ -2,7 +2,7 @@ require iproute2.inc
PR = "r0"
-SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \
+SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${BPN}-${PV}.tar.bz2 \
file://configure-cross.patch"
SRC_URI[md5sum] = "a243bfea837e71824b7ca26c3bb45fa8"
diff --git a/meta/recipes-connectivity/ofono/ofono_0.50.bb b/meta/recipes-connectivity/ofono/ofono_0.50.bb
index 4635386884..ef4fbf0ba8 100644
--- a/meta/recipes-connectivity/ofono/ofono_0.50.bb
+++ b/meta/recipes-connectivity/ofono/ofono_0.50.bb
@@ -2,7 +2,7 @@ require ofono.inc
PR = "r1"
-SRC_URI = "${KERNELORG_MIRROR}/linux/network/ofono/${P}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/linux/network/ofono/${BPN}-${PV}.tar.bz2 \
file://ofono"
EXTRA_OECONF += "\
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.14.3.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.14.3.bb
index 9351be4554..8bb63e7d77 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.14.3.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.14.3.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
LICENSE = "LGPLv2.1+"
PR = "r0"
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz"
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "fe9a4f781651593fd4afddb343ff50bf"
SRC_URI[sha256sum] = "62e759084355ac0fce61feb561a7535a6707b223f0d1e4305fd47c83fa5494d0"
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.8.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.8.bb
index 5bd4e28adc..bc1fb4e9d0 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.8.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.8.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
PR = "r0"
-SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${P}.tar.gz"
+SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "82f5eafa07df5e1abc785061143bbfd2"
SRC_URI[sha256sum] = "384119cc64022626b6f51aaaef605abf248602d8fae25baff82762a097f20fe9"
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
index 0a483c489f..ead8dea05b 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
RDEPENDS_${PN} += "python-dbus"
-SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${P}.tar.gz \
+SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
file://parallel_make.patch"
PR = "r2"
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_svn.bb b/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
index 9a6130fd87..1270973630 100644
--- a/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
+++ b/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
@@ -11,6 +11,6 @@ PR = "r2"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=dbus-wait;proto=http"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
inherit autotools
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.28.7.bb b/meta/recipes-core/glib-networking/glib-networking_2.28.7.bb
index 64fff50033..f492dd3629 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.28.7.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.28.7.bb
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 gnutls"
PR = "r0"
-SRC_URI = "${GNOME_MIRROR}/${PN}/2.28/${PN}-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/2.28/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "c10e51571d03c10111a37bcd21fbf777"
SRC_URI[sha256sum] = "98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c"
diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
index e474cce4c7..ec6ffb37fa 100644
--- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
@@ -14,7 +14,7 @@ RRECOMMENDS_${PN} = "avahi-daemon"
# Upstream change this patch periodically so store locally
# http://0pointer.de/public/distcc-avahi.patch
-SRC_URI = "http://distcc.googlecode.com/files/${PN}-${PV}.tar.bz2 \
+SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
file://distcc-avahi.patch \
file://makefile-param-order.patch \
file://default \
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index f73bd1ebd9..4b3dd94665 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://subversion.tigris.org"
PR = "r0"
-SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
file://disable-revision-install.patch;patch=1 \
file://neon-detection.patch;patch=1 \
file://libtool2.patch;patch=1"
diff --git a/meta/recipes-extended/blktool/blktool_4-6.bb b/meta/recipes-extended/blktool/blktool_4-6.bb
index 86d2d0d3a1..cc1174cdf7 100644
--- a/meta/recipes-extended/blktool/blktool_4-6.bb
+++ b/meta/recipes-extended/blktool/blktool_4-6.bb
@@ -19,6 +19,6 @@ SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e0680
SRC_URI[patch.md5sum] = "2d1bc2f2c38b65d47e27da7c7508d17f"
SRC_URI[patch.sha256sum] = "999f2062203e389327d997724621be37bea9c98fa226238f9f4eb4a6ea25bd4b"
-S = "${WORKDIR}/${PN}-4.orig"
+S = "${WORKDIR}/${BPN}-4.orig"
inherit autotools
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
index 7d5f0691fb..659f964313 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
@@ -14,7 +14,7 @@ DEPENDS = "libnewt popt"
PR = "r0"
-SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${P}.tar.bz2"
+SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "a576808a6d66763606d750ec451bab6d"
SRC_URI[sha256sum] = "aa36bf7fd3f7c6e3371eddd8a7846b83435c48f132cc5919d83a830504b797d6"
diff --git a/meta/recipes-extended/libidn/libidn_0.6.14.bb b/meta/recipes-extended/libidn/libidn_0.6.14.bb
index c453b79ecc..67c9381a98 100644
--- a/meta/recipes-extended/libidn/libidn_0.6.14.bb
+++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb
@@ -11,7 +11,7 @@ PR = "r0"
inherit pkgconfig autotools gettext
-SRC_URI = "http://alpha.gnu.org/gnu/libidn/${P}.tar.gz"
+SRC_URI = "http://alpha.gnu.org/gnu/libidn/${BPN}-${PV}.tar.gz"
EXTRA_OECONF = " --disable-tld"
diff --git a/meta/recipes-extended/libidn/libidn_1.22.bb b/meta/recipes-extended/libidn/libidn_1.22.bb
index cf08eaf79b..6a1059c9d8 100644
--- a/meta/recipes-extended/libidn/libidn_1.22.bb
+++ b/meta/recipes-extended/libidn/libidn_1.22.bb
@@ -11,7 +11,7 @@ PR = "r0"
inherit pkgconfig autotools gettext
-SRC_URI = "${GNU_MIRROR}/libidn/${P}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+
# so package command into a separate package
diff --git a/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb b/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb
index dbc15e10b5..8988ca11c2 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb
@@ -11,8 +11,8 @@ PR = "r0"
DEPENDS += "xz-native"
PROVIDES = "virtual/librpc"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.bz2;name=libtirpc \
- ${GENTOO_MIRROR}/${PN}-glibc-nfs.tar.xz;name=glibc-nfs \
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2;name=libtirpc \
+ ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \
file://libtirpc-0.2.1-fortify.patch \
file://libtirpc-0.2.2-rpc-des-prot.patch \
file://remove-des-crypt.patch \
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index 1d099641fe..d0479ced2a 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
PR = "r0"
-SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${P}.tar.gz \
+SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
file://disable-strip.patch \
"
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb
index 695e4f3d20..f54d591c2d 100644
--- a/meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb
+++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb
@@ -18,7 +18,7 @@ PR="r0"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a5367a90934098d6b05af3b746405014"
-SRC_URI = "http://portland.freedesktop.org/download/${PN}-${PV}.tgz"
+SRC_URI = "http://portland.freedesktop.org/download/${BPN}-${PV}.tgz"
inherit autotools
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
index 1b02258521..e1f9ffb961 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
@@ -17,7 +17,7 @@ FONTREV = "0.20100721"
SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \
file://30-liberation-aliases.conf"
-S = ${WORKDIR}/${PN}-${PV}.${FONTREV}
+S = ${WORKDIR}/${BPN}-${PV}.${FONTREV}
do_install () {
install -d ${D}${datadir}/fonts/ttf/
diff --git a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
index 6ff1391c71..34d03b2000 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
@@ -9,7 +9,7 @@ PR = "r1"
DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
-XORG_PN = "${PN}"
+XORG_PN = "${BPN}"
SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
S = "${WORKDIR}/${XORG_PN}-${PV}"
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
index 0498c1955e..665601f11b 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
@@ -7,7 +7,7 @@ DEPENDS = "libvorbis libogg alsa-lib libmad"
SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-B-${PV}.tar.gz"
-S = "${WORKDIR}/${PN}-B-${PV}"
+S = "${WORKDIR}/${BPN}-B-${PV}"
inherit autotools
diff --git a/meta/recipes-sato/eds/eds-tools_bzr.bb b/meta/recipes-sato/eds/eds-tools_bzr.bb
index bd693db378..afa80004e4 100644
--- a/meta/recipes-sato/eds/eds-tools_bzr.bb
+++ b/meta/recipes-sato/eds/eds-tools_bzr.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
inherit autotools pkgconfig
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
FILES_${PN} += "${libdir}/evolution-data-server-1.2/extensions/*.so"
diff --git a/meta/recipes-sato/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_svn.bb
index 4a2e9078d0..3806021b0d 100644
--- a/meta/recipes-sato/gaku/gaku_svn.bb
+++ b/meta/recipes-sato/gaku/gaku_svn.bb
@@ -22,6 +22,6 @@ PR = "r4"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
inherit autotools pkgconfig
diff --git a/meta/recipes-sato/libical/libical_0.46.bb b/meta/recipes-sato/libical/libical_0.46.bb
index 6ad5d359b0..e0e88ba8e7 100644
--- a/meta/recipes-sato/libical/libical_0.46.bb
+++ b/meta/recipes-sato/libical/libical_0.46.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=35da21efce2b9f0ca07524c9f844e6ed \
SECTION = "libs"
PR = "r0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "9c08f88945bfd5d0791d102e4aa4125c"
SRC_URI[sha256sum] = "000762efb81501421d94ec56343648a62b3bd2884e7cdf6f638e2c207dd8f6a1"
diff --git a/meta/recipes-sato/libowl/libowl_svn.bb b/meta/recipes-sato/libowl/libowl_svn.bb
index 147a3322c5..1500fad5c6 100644
--- a/meta/recipes-sato/libowl/libowl_svn.bb
+++ b/meta/recipes-sato/libowl/libowl_svn.bb
@@ -16,6 +16,6 @@ PR = "r6"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
inherit autotools pkgconfig
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 9d5fd89e53..04928a4c30 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
@@ -16,7 +16,7 @@ SRCREV = "416"
PV = "0.0+svnr${SRCPV}"
PR = "r6"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \
file://gst_change_state.patch \
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
index d00b0607c5..616fb0e244 100644
--- a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
+++ b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
@@ -22,7 +22,7 @@ inherit autotools pkgconfig
SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;patch=1;pnum=0 "
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
diff --git a/meta/recipes-sato/puzzles/puzzles_r9175.bb b/meta/recipes-sato/puzzles/puzzles_r9175.bb
index 5cd8bb912a..ee0c02537a 100644
--- a/meta/recipes-sato/puzzles/puzzles_r9175.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r9175.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar
#SRC_URI[sha256sum] = "69f37e497e63b2f7ab44e7bbd50aee078269c16dbc2d78ec1b00257678f2cbd2"
#SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
do_configure () {
./mkfiles.pl
diff --git a/meta/recipes-sato/screenshot/screenshot_svn.bb b/meta/recipes-sato/screenshot/screenshot_svn.bb
index 66a5c812c3..825870d6dd 100644
--- a/meta/recipes-sato/screenshot/screenshot_svn.bb
+++ b/meta/recipes-sato/screenshot/screenshot_svn.bb
@@ -15,7 +15,7 @@ PR = "r2"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \
file://fix_ldadd_order.patch"
-S = ${WORKDIR}/${PN}
+S = ${WORKDIR}/${BPN}
inherit autotools pkgconfig
diff --git a/meta/recipes-support/apr/apr-util_1.3.10.bb b/meta/recipes-support/apr/apr-util_1.3.10.bb
index 7071b904f2..01595df8a2 100644
--- a/meta/recipes-support/apr/apr-util_1.3.10.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.10.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
PR = "r0"
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
+SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
file://configfix.patch;patch=1 \
file://configure_fixes.patch;patch=1"
diff --git a/meta/recipes-support/apr/apr_1.4.2.bb b/meta/recipes-support/apr/apr_1.4.2.bb
index b37001d4ca..2d5edaa9c5 100644
--- a/meta/recipes-support/apr/apr_1.4.2.bb
+++ b/meta/recipes-support/apr/apr_1.4.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
PR = "r1"
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
+SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
file://configure_fixes.patch;patch=1 \
file://cleanup.patch;patch=1 \
file://configfix.patch;patch=1 \
diff --git a/meta/recipes-support/liboil/liboil_0.3.17.bb b/meta/recipes-support/liboil/liboil_0.3.17.bb
index f342a820fe..64e1ddd2f9 100644
--- a/meta/recipes-support/liboil/liboil_0.3.17.bb
+++ b/meta/recipes-support/liboil/liboil_0.3.17.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \
DEPENDS = "glib-2.0"
PR = "r3"
-SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
+SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \
file://no-tests.patch \
file://fix-unaligned-whitelist.patch \
"
diff --git a/meta/recipes-support/neon/neon_0.29.5.bb b/meta/recipes-support/neon/neon_0.29.5.bb
index ae476a6891..f465a4d6ba 100644
--- a/meta/recipes-support/neon/neon_0.29.5.bb
+++ b/meta/recipes-support/neon/neon_0.29.5.bb
@@ -8,7 +8,7 @@ DEPENDS = "zlib libxml2 expat time gnutls"
PR = "r0"
-SRC_URI = "http://www.webdav.org/${BPN}/${P}.tar.gz \
+SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
file://pkgconfig.patch;patch=1"
SRC_URI[md5sum] = "ff369e69ef0f0143beb5626164e87ae2"