Patchwork [1/6] SRC_URI: Using BPN instaed of PN.

login
register
mail settings
Submitter Lianhao Lu
Date Aug. 5, 2011, 10:37 a.m.
Message ID <8f296f721bbda3e9df8a80422cd876b9d52712f8.1312540193.git.lianhao.lu@intel.com>
Download mbox | patch
Permalink /patch/9363/
State New, archived
Headers show

Comments

Lianhao Lu - Aug. 5, 2011, 10:37 a.m.
[YOCTO #1333]
In multilib cases, PN has the prefix of MLPREFIX. It is not correct to
use PN in SRC_URI. We should use the pruned BPN instead.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 .../recipes-connectivity/galago/libgalago_0.5.2.bb |    2 +-
 .../net-tools/net-tools_1.60-23.bb                 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
index 3a47620..a4203ec 100644
--- a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
+++ b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
@@ -7,7 +7,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
 
 DEPENDS = 	"dbus glib-2.0 dbus-glib"
 
-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 \
                  file://mkdir.patch;patch=1 \
                  file://pkgconfig.patch;patch=1 "
 
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
index 41041aa..213fb60 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
@@ -8,7 +8,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
 PR = "r0"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \
-           ${DEBIAN_MIRROR}/main/n/net-tools/${PN}_${PV}.diff.gz;apply=no;name=patch \
+           ${DEBIAN_MIRROR}/main/n/net-tools/${BPN}_${PV}.diff.gz;apply=no;name=patch \
            file://net-tools-config.h \
            file://net-tools-config.make" 
 
@@ -31,7 +31,7 @@  PARALLEL_MAKE = ""
 # up all previously applied patches in the start
 nettools_do_patch() {
 	cd ${S}
-	patch -p1 < ${WORKDIR}/${PN}_${PV}.diff
+	patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff
 	QUILT_PATCHES=${S}/debian/patches quilt push -a
 	rm -rf ${S}/patches ${S}/.pc
 }