From a242da91a216d3a2d7a85dc6fa7799bcb648f1ae Mon Sep 17 00:00:00 2001
From: Yu Ke <ke.yu@intel.com>
Date: Thu, 28 Jul 2011 21:28:20 +0800
Subject: 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.

(From OE-Core rev: d6dca85028640034b1a5356920aad3268bd4f1c2)

Signed-off-by: Yu Ke <ke.y@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-sato/eds/eds-tools_bzr.bb              | 2 +-
 meta/recipes-sato/gaku/gaku_svn.bb                  | 2 +-
 meta/recipes-sato/libical/libical_0.46.bb           | 2 +-
 meta/recipes-sato/libowl/libowl_svn.bb              | 2 +-
 meta/recipes-sato/owl-video-widget/libowl-av_svn.bb | 2 +-
 meta/recipes-sato/puzzles/oh-puzzles_svn.bb         | 2 +-
 meta/recipes-sato/puzzles/puzzles_r9175.bb          | 2 +-
 meta/recipes-sato/screenshot/screenshot_svn.bb      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'meta/recipes-sato')

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
 
-- 
cgit v1.2.3-54-g00ecf