summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-09-11 19:25:22 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 07:42:28 +0100
commit1d5b01c956918fe3dec90649fc9d83c38f3afa50 (patch)
tree2b68a287b42427d867d56966cc8ac895fac468d9
parent50b2d1679fd6a9e501e11837699ef20646cdcad9 (diff)
downloadpoky-1d5b01c956918fe3dec90649fc9d83c38f3afa50.tar.gz
target-sdk-provides-dummy: skip package_qa_multilib check
The rprovides of target-sdk-provides-dummy don't be updated with multilib, so it fails package_qa_multilib check. Because target-sdk-provides-dummy doesn't install any file to sysroot, it is safe to skip package_qa_multilib check for target-sdk-provides-dummy. Remove ${MLPREFIX}target-sdk-provides-dummy from TOOLCHAIN_TARGET_TASK at same time in populate_sdk_base.bbclass. (From OE-Core rev: 3197c086269a4b21fb807a9c552b56f23c5b86dc) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/multilib.bbclass4
-rw-r--r--meta/classes/populate_sdk_base.bbclass3
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 7b4d6472b0..e7b717eee1 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -146,6 +146,10 @@ python do_package_qa_multilib() {
146 if not ml: 146 if not ml:
147 return 147 return
148 148
149 # exception for ${MLPREFIX}target-sdk-provides-dummy
150 if 'target-sdk-provides-dummy' in d.getVar('PN'):
151 return
152
149 packages = d.getVar('PACKAGES') 153 packages = d.getVar('PACKAGES')
150 for pkg in packages.split(): 154 for pkg in packages.split():
151 check_mlprefix(pkg, 'RDEPENDS', ml) 155 check_mlprefix(pkg, 'RDEPENDS', ml)
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index bbf1ff1cd2..e07ad0cc6b 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -40,8 +40,7 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
40 40
41TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${MACHINE}" 41TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${MACHINE}"
42TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" 42TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
43TOOLCHAIN_TARGET_TASK ?= "${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')} \ 43TOOLCHAIN_TARGET_TASK ?= "${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')} target-sdk-provides-dummy"
44 ${@multilib_pkg_extend(d, 'target-sdk-provides-dummy')}"
45TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" 44TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
46TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" 45TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
47 46