summaryrefslogtreecommitdiffstats
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:40:50 +0100
commitcf7cff7d2306f83847609d369477984dc8e31cdd (patch)
treee694f89e2a193aedefc61d56850e1ded766101e6
parenteab49954002c26bab4bffd344c1fd82d8f524f6e (diff)
downloadpoky-cf7cff7d2306f83847609d369477984dc8e31cdd.tar.gz
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'. (From OE-Core rev: acc988272b4e74a9ad1e6da5af5b2d208584197b) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
1DEPENDS += "${@["python-native python", ""][(d.getVar('PACKAGES', True) == '')]}" 1DEPENDS += "${@["python-native python", ""][(d.getVar('PACKAGES', True) == '')]}"
2RDEPENDS_${PN} += "${@['', 'python-core']['${PN}' == '${BPN}']}" 2RDEPENDS_${PN} += "${@['', 'python-core']['${CLASSOVERRIDE}' == 'class-target']}"
3 3
4inherit distutils-common-base pythonnative 4inherit distutils-common-base pythonnative
5 5
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
6SECTION = "libs" 6SECTION = "libs"
7DEPENDS = "ncurses-native" 7DEPENDS = "ncurses-native"
8DEPENDS_virtclass-native = "" 8DEPENDS_virtclass-native = ""
9INC_PR = "r10" 9INC_PR = "r11"
10 10
11inherit autotools binconfig multilib_header 11inherit autotools binconfig multilib_header
12 12
@@ -244,8 +244,8 @@ FILES_${PN}-tools = "\
244 ${bindir}/infotocap \ 244 ${bindir}/infotocap \
245 ${bindir}/captoinfo \ 245 ${bindir}/captoinfo \
246 ${bindir}/infocmp \ 246 ${bindir}/infocmp \
247 ${bindir}/clear${@['', '.${BPN\x7d'][d.getVar('PN', 1) == 'ncurses']} \ 247 ${bindir}/clear${@['', '.${BPN\x7d']['${CLASSOVERRIDE}' == 'class-target']} \
248 ${bindir}/reset${@['', '.${BPN\x7d'][d.getVar('PN', 1) == 'ncurses']} \ 248 ${bindir}/reset${@['', '.${BPN\x7d']['${CLASSOVERRIDE}' == 'class-target']} \
249 ${bindir}/tack \ 249 ${bindir}/tack \
250 ${bindir}/tabs \ 250 ${bindir}/tabs \
251" 251"
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/"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "Zlib" 8LICENSE = "Zlib"
9 9
10PR = "r1"
11
10SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \ 12SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \
11 file://ldflags.patch" 13 file://ldflags.patch"
12 14
@@ -15,7 +17,7 @@ PROVIDES_virtclass-native += "gzip-native"
15DEPENDS = "zlib" 17DEPENDS = "zlib"
16 18
17do_install () { 19do_install () {
18 if [ "${PN}" = "${BPN}" ] ; then 20 if [ "${CLASSOVERRIDE}" = "class-target" ] ; then
19 # Install files into /bin (FHS), which is typical place for gzip 21 # Install files into /bin (FHS), which is typical place for gzip
20 install -d ${D}${base_bindir} 22 install -d ${D}${base_bindir}
21 install ${B}/pigz ${D}${base_bindir}/gzip 23 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"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ 9LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
10 file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" 10 file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42"
11 11
12PR = "r1" 12PR = "r2"
13 13
14SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ 14SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
15 file://configfix.patch \ 15 file://configfix.patch \
@@ -33,7 +33,7 @@ inherit autotools lib_package binconfig
33OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" 33OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
34 34
35do_configure_append() { 35do_configure_append() {
36 if [ "${PN}" == "${BPN}" ]; then 36 if [ "${CLASSOVERRIDE}" = "class-target" ]; then
37 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk 37 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
38 fi 38 fi
39} 39}