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>

14 files changed, 14 insertions, 14 deletions

diff --git a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
index 483a767915..a7bdc97088 100644
--- a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
+++ b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
 HOMEPAGE = "http://farsight.sf.net"
-SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz"
+SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz"
 LICENSE = "GPLv2.1"
 DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
 
diff --git a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb b/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
index e20c41709a..b6af11d398 100644
--- a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
+++ b/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
@@ -5,6 +5,6 @@ LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gnutls libcheck"
 PR = "r2"
 
-SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://ftp.imendio.com/pub/imendio/${BPN}/src/${BPN}-${PV}.tar.bz2"
 
 inherit autotools pkgconfig
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
index 147fcfb5ed..cde47796dd 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
@@ -2,7 +2,7 @@ DEPENDS = "libopensync (>= 0.36)"
 
 DESCRIPTION ?= "OpenSync plugin"
 
-SRC_URI = "http://opensync.org/download/releases/${PV}/${P}.tar.bz2"
+SRC_URI = "http://opensync.org/download/releases/${PV}/${BPN}-${PV}.tar.bz2"
 
 inherit cmake
 
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb b/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
index 56c32f23d6..3ddee8f4ad 100644
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
+++ b/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus telepathy-glib farsight2"
 LICENSE = "LGPLv2"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${P}.tar.gz \
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${BPN}-${PV}.tar.gz \
 "
 
 inherit autotools
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
index ff49418540..36e9d65874 100644
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
+++ b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib"
 LICENSE = "LGPL"
 
 # gabble.manager needs to get regenerated every release, so please don't copy it over blindly
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${BPN}-${PV}.tar.gz \
            file://gabble.manager"
 
 inherit autotools pkgconfig
diff --git a/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb b/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
index e3ac0017ff..42655a1df8 100644
--- a/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
+++ b/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 
 DEPENDS = "libxml2 sed-native expat"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${P}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${BPN}-${PV}.tar.gz \
            file://no-doc-install.patch;patch=1"
 
 inherit autotools pkgconfig
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
index f12e6c402a..4b74cf19c5 100644
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
+++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+"
 DESCRIPTION = "gcalctool is a powerful calculator"
 PR = "r2"
 
-SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \
+SRC_URI = "http://download.gnome.org/sources/${BPN}/5.7/${BPN}-${PV}.tar.gz \
         file://makefile-fix.diff;patch=1\
         file://fix-includedir.patch;patch=1"
 
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
index c72860c8f5..8854ecf312 100644
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
+++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ gnome-doc-utils"
 DESCRIPTION = "gcalctool is a powerful calculator"
 PR = "r0"
 
-SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \
+SRC_URI = "http://download.gnome.org/sources/${BPN}/5.8/${BPN}-${PV}.tar.gz \
         file://fix-includedir.patch;patch=1"
 
 inherit autotools pkgconfig
diff --git a/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
index f614048a16..b359938f5b 100644
--- a/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
+++ b/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
@@ -6,7 +6,7 @@ PR = "r2"
 
 inherit autotools
 
-SRC_URI = "http://burtonini.com/temp/${PN}-${PV}.tar.gz \
+SRC_URI = "http://burtonini.com/temp/${BPN}-${PV}.tar.gz \
         file://gtkstylus.sh"
 
 do_install_append() {
diff --git a/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb b/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb
index c4c115b90e..54878a97f0 100644
--- a/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb
+++ b/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb
@@ -9,6 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
 
 EXTRA_OECONF = ""
diff --git a/meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb b/meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb
index 2baa6d46f7..67db92cbeb 100644
--- a/meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb
+++ b/meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth libglade"
 PR = "r4"
 
-SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
+SRC_URI = "http://jabberstudio.2nw.net/${BPN}/${BPN}-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
            file://fix-desktop-file.patch;patch=0 \
            file://gcc4.patch;patch=1"
diff --git a/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb b/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb
index ad14043754..214dd3d5d0 100644
--- a/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb
+++ b/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb
@@ -7,7 +7,7 @@ PV = "0.3+git${SRCPV}"
 
 LIC_FILES_CHKSUM = "file://configure.ac;endline=7;md5=3c4e087662e37f10e469425f3a0ad225"
 
-SRC_URI = "git://git.yoctoproject.org/${PN};protocol=git"
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb b/meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb
index ca22e4dba0..37a8564d8f 100644
--- a/meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb
+++ b/meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code bas
 LICENSE = "Adobe"
 PR = "r0"
 
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+SRC_URI = "http://poppler.freedesktop.org/${BPN}-${PV}.tar.gz"
 
 do_compile() {
 }
diff --git a/meta-demoapps/recipes-support/poppler/poppler.inc b/meta-demoapps/recipes-support/poppler/poppler.inc
index 645e734e8b..b534ac2ed2 100644
--- a/meta-demoapps/recipes-support/poppler/poppler.inc
+++ b/meta-demoapps/recipes-support/poppler/poppler.inc
@@ -3,7 +3,7 @@ DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+SRC_URI = "http://poppler.freedesktop.org/${BPN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig