diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2011-08-05 09:53:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-05 17:43:34 +0100 |
commit | e3bdc689f2b73e4e901bdc49a1bade42520cf8d8 (patch) | |
tree | 89bafd8538fee03878ab7bb3854795fa9b16913e | |
parent | 999a84bdb3694ae9871ed1d400f3906c6727e435 (diff) | |
download | poky-e3bdc689f2b73e4e901bdc49a1bade42520cf8d8.tar.gz |
SRC_URI: Using BPN instaed of PN.
[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.
(From OE-Core rev: ce94fa29b81bebaaee8058f0600e111832d638f2)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/galago/libgalago_0.5.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-23.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb index 3a476209af..a4203ec11d 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 \ | |||
7 | 7 | ||
8 | DEPENDS = "dbus glib-2.0 dbus-glib" | 8 | DEPENDS = "dbus glib-2.0 dbus-glib" |
9 | 9 | ||
10 | SRC_URI = "http://www.galago-project.org/files/releases/source/${BPN}/${P}.tar.gz \ | 10 | SRC_URI = "http://www.galago-project.org/files/releases/source/${BPN}/${BPN}-${PV}.tar.gz \ |
11 | file://mkdir.patch;patch=1 \ | 11 | file://mkdir.patch;patch=1 \ |
12 | file://pkgconfig.patch;patch=1 " | 12 | file://pkgconfig.patch;patch=1 " |
13 | 13 | ||
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 41041aad6d..213fb6075c 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 \ | |||
8 | PR = "r0" | 8 | PR = "r0" |
9 | 9 | ||
10 | SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \ | 10 | SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \ |
11 | ${DEBIAN_MIRROR}/main/n/net-tools/${PN}_${PV}.diff.gz;apply=no;name=patch \ | 11 | ${DEBIAN_MIRROR}/main/n/net-tools/${BPN}_${PV}.diff.gz;apply=no;name=patch \ |
12 | file://net-tools-config.h \ | 12 | file://net-tools-config.h \ |
13 | file://net-tools-config.make" | 13 | file://net-tools-config.make" |
14 | 14 | ||
@@ -31,7 +31,7 @@ PARALLEL_MAKE = "" | |||
31 | # up all previously applied patches in the start | 31 | # up all previously applied patches in the start |
32 | nettools_do_patch() { | 32 | nettools_do_patch() { |
33 | cd ${S} | 33 | cd ${S} |
34 | patch -p1 < ${WORKDIR}/${PN}_${PV}.diff | 34 | patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff |
35 | QUILT_PATCHES=${S}/debian/patches quilt push -a | 35 | QUILT_PATCHES=${S}/debian/patches quilt push -a |
36 | rm -rf ${S}/patches ${S}/.pc | 36 | rm -rf ${S}/patches ${S}/.pc |
37 | } | 37 | } |