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>
This commit is contained in:
parent
eab4995400
commit
cf7cff7d23
|
@ -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
|
||||
|
||||
|
|
|
@ -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 \
|
||||
"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue