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>

6 files changed, 6 insertions, 6 deletions

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"