summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-29 19:19:13 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 11:15:35 +0100
commitacc988272b4e74a9ad1e6da5af5b2d208584197b (patch)
treee9f6139325ad60ebd727ff8a401c1ad9939d5163 /meta
parentbfb2906206158748d0be33baf7984cf885756da1 (diff)
downloadopenembedded-core-acc988272b4e74a9ad1e6da5af5b2d208584197b.tar.gz
openembedded-core-acc988272b4e74a9ad1e6da5af5b2d208584197b.tar.bz2
openembedded-core-acc988272b4e74a9ad1e6da5af5b2d208584197b.zip
Cleanup: fix PN == BPN cases
When building target packages, it used to be enought to check for PN == BPN, however with the multilib configurations, this can lead to subtle errors. Change instances of PN == BPN, to ${CLASSOVERRIDE} == 'class-target'. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/distutils-base.bbclass2
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc6
-rw-r--r--meta/recipes-extended/pigz/pigz.inc4
-rw-r--r--meta/recipes-support/apr/apr-util_1.4.1.bb4
4 files changed, 9 insertions, 7 deletions
diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass
index c761b3602b..3b43e7629f 100644
--- a/meta/classes/distutils-base.bbclass
+++ b/meta/classes/distutils-base.bbclass
@@ -1,5 +1,5 @@
DEPENDS += "${@["python-native python", ""][(d.getVar('PACKAGES', True) == '')]}"
-RDEPENDS_${PN} += "${@['', 'python-core']['${PN}' == '${BPN}']}"
+RDEPENDS_${PN} += "${@['', 'python-core']['${CLASSOVERRIDE}' == 'class-target']}"
inherit distutils-common-base pythonnative
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 91b1f34779..ed7f001985 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r10"
+INC_PR = "r11"
inherit autotools binconfig multilib_header
@@ -244,8 +244,8 @@ FILES_${PN}-tools = "\
${bindir}/infotocap \
${bindir}/captoinfo \
${bindir}/infocmp \
- ${bindir}/clear${@['', '.${BPN\x7d'][d.getVar('PN', 1) == 'ncurses']} \
- ${bindir}/reset${@['', '.${BPN\x7d'][d.getVar('PN', 1) == 'ncurses']} \
+ ${bindir}/clear${@['', '.${BPN\x7d']['${CLASSOVERRIDE}' == 'class-target']} \
+ ${bindir}/reset${@['', '.${BPN\x7d']['${CLASSOVERRIDE}' == 'class-target']} \
${bindir}/tack \
${bindir}/tabs \
"
diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc
index be37e8a317..3721c9786e 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -7,6 +7,8 @@ HOMEPAGE = "http://zlib.net/pigz/"
SECTION = "console/utils"
LICENSE = "Zlib"
+PR = "r1"
+
SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \
file://ldflags.patch"
@@ -15,7 +17,7 @@ PROVIDES_virtclass-native += "gzip-native"
DEPENDS = "zlib"
do_install () {
- if [ "${PN}" = "${BPN}" ] ; then
+ if [ "${CLASSOVERRIDE}" = "class-target" ] ; then
# Install files into /bin (FHS), which is typical place for gzip
install -d ${D}${base_bindir}
install ${B}/pigz ${D}${base_bindir}/gzip
diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb
index 0516bc4acc..238af97a53 100644
--- a/meta/recipes-support/apr/apr-util_1.4.1.bb
+++ b/meta/recipes-support/apr/apr-util_1.4.1.bb
@@ -9,7 +9,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42"
-PR = "r1"
+PR = "r2"
SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
file://configfix.patch \
@@ -33,7 +33,7 @@ inherit autotools lib_package binconfig
OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
do_configure_append() {
- if [ "${PN}" == "${BPN}" ]; then
+ if [ "${CLASSOVERRIDE}" = "class-target" ]; then
cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
fi
}