summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2019-05-02 13:52:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-03 06:11:57 +0100
commit0552d9536be8354114a6a7e25c5205a5ca7a24b4 (patch)
tree4220895e4dd147f9b438002da86dd41b97092e81 /meta/recipes-devtools
parent665fd0ae236e2bd57075ce01a920ab6be61527d3 (diff)
downloadpoky-0552d9536be8354114a6a7e25c5205a5ca7a24b4.tar.gz
opkg: fix ptest packaging when OPKGLIBDIR == libdir
there is small issue with ptest packaging in cases where OPKGLIBDIR is set to /usr/lib. Then all ptest files get packaged in libopkg instead of opkg-ptest and correct QA error is triggered: ERROR: QA Issue: /usr/lib/opkg/ptest/tests/opkgcl.py contained in package libopkg requires /usr/bin/python3, but no providers found in RDEPENDS_libopkg? [file-rdeps] # $FILES_libopkg # set /jenkins/mjansa/build-webos-master/oe-core/meta/recipes-devtools/opkg/opkg_0.4.0.bb:62 # "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" FILES_libopkg="/usr/lib/*.so.* /usr/lib/opkg/" # $FILES_opkg-ptest [2 operations] # set /jenkins/mjansa/build-webos-master/oe-core/meta/classes/ptest.bbclass:9 # "${PTEST_PATH}" # rename from FILES_${PN}-ptest data.py:117 [expandKeys] # "${PTEST_PATH}" # pre-expansion value: # "${PTEST_PATH}" FILES_opkg-ptest="/usr/lib/opkg/ptest" # $PACKAGES [4 operations] # set /jenkins/mjansa/build-webos-master/oe-core/meta/conf/bitbake.conf:292 # "${PN}-src ${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" # set /jenkins/mjansa/build-webos-master/oe-core/meta/conf/documentation.conf:314 # [doc] "The list of packages to be created from the recipe." # prepend /jenkins/mjansa/build-webos-master/oe-core/meta/classes/ptest.bbclass:20 # "${@bb.utils.contains('PTEST_ENABLED', '1', '${PN}-ptest', '', d)}" # prepend /jenkins/mjansa/build-webos-master/oe-core/meta/recipes-devtools/opkg/opkg_0.4.0.bb:60 # "libopkg" # pre-expansion value: # "libopkg ${@bb.utils.contains('PTEST_ENABLED', '1', '${PN}-ptest', '', d)} ${PN}-src ${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" PACKAGES="libopkg opkg-ptest opkg-src opkg-dbg opkg-staticdev opkg-dev opkg-doc opkg-locale opkg" The easiest fix should be to reorder PACKAGES (the _prepends) so that ${PN}-ptest is prepended later -> ends before libopkg). (From OE-Core rev: e329f1a9ad7e68575912345ec7c18c12f5971998) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.4.0.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-devtools/opkg/opkg_0.4.0.bb b/meta/recipes-devtools/opkg/opkg_0.4.0.bb
index 20c2e0b72a..e2305d096a 100644
--- a/meta/recipes-devtools/opkg/opkg_0.4.0.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.4.0.bb
@@ -23,6 +23,11 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
23SRC_URI[md5sum] = "ae51d95fee599bb4dce08453529158f5" 23SRC_URI[md5sum] = "ae51d95fee599bb4dce08453529158f5"
24SRC_URI[sha256sum] = "f6c00515d8a2ad8f6742a8e73830315d1983ed0459cba77c4d656cfc9e7fe6fe" 24SRC_URI[sha256sum] = "f6c00515d8a2ad8f6742a8e73830315d1983ed0459cba77c4d656cfc9e7fe6fe"
25 25
26# This needs to be before ptest inherit, otherwise all ptest files end packaged
27# in libopkg package if OPKGLIBDIR == libdir, because default
28# PTEST_PATH ?= "${libdir}/${BPN}/ptest"
29PACKAGES =+ "libopkg"
30
26inherit autotools pkgconfig systemd ptest 31inherit autotools pkgconfig systemd ptest
27 32
28target_localstatedir := "${localstatedir}" 33target_localstatedir := "${localstatedir}"
@@ -57,8 +62,6 @@ RREPLACES_${PN} = "opkg-nogpg opkg-collateral"
57RCONFLICTS_${PN} = "opkg-collateral" 62RCONFLICTS_${PN} = "opkg-collateral"
58RPROVIDES_${PN} = "opkg-collateral" 63RPROVIDES_${PN} = "opkg-collateral"
59 64
60PACKAGES =+ "libopkg"
61
62FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" 65FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
63 66
64BBCLASSEXTEND = "native nativesdk" 67BBCLASSEXTEND = "native nativesdk"