diff mbox series

[kirkstone,24/30] glibc-tests: not clear BBCLASSEXTEND

Message ID	1a6396c431a454a293be102c8c0e8b10f247404b.1656876825.git.steve@sakoman.com
State	Accepted, archived
Commit	1a6396c431a454a293be102c8c0e8b10f247404b
Headers	show Return-Path: <steve@sakoman.com> ip: 209.85.215.179, mailfrom: steve@sakoman.com) From: Steve Sakoman <steve@sakoman.com> To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/30] glibc-tests: not clear BBCLASSEXTEND Date: Sun, 3 Jul 2022 09:35:59 -1000 Message-Id: <1a6396c431a454a293be102c8c0e8b10f247404b.1656876825.git.steve@sakoman.com> In-Reply-To: <cover.1656876825.git.steve@sakoman.com> References: <cover.1656876825.git.steve@sakoman.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[kirkstone,01/30] unzip: Port debian fixes for two CVEs \| expand [kirkstone,01/30] unzip: Port debian fixes for two CVEs [kirkstone,02/30] ghostscript: fix CVE-2022-2085 [kirkstone,03/30] binutils : CVE-2019-1010204 [kirkstone,04/30] cups: ignore CVE-2022-26691 [kirkstone,05/30] busybox: fix CVE-2022-30065 [kirkstone,06/30] cve-extra-exclusions: Clean up and ignore three CVEs (2xqemu and nasm) [kirkstone,07/30] cve-check: hook cleanup to the BuildCompleted event, not CookerExit [kirkstone,08/30] wireless-regdb: upgrade 2022.04.08 -> 2022.06.06 [kirkstone,09/30] vim: 8.2.5083 -> 9.0.0005 [kirkstone,10/30] openssl: Upgrade 3.0.3 -> 3.0.4 [kirkstone,11/30] initramfs-framework: move storage mounts to actual rootfs [kirkstone,12/30] libffi: fix native build being not portable [kirkstone,13/30] wic: fix WicError message [kirkstone,14/30] perf: sort-pmuevents: really keep array terminators [kirkstone,15/30] kernel-uboot.bbclass: Use vmlinux.initramfs when INITRAMFS_IMAGE_BUNDLE set [kirkstone,16/30] insane.bbclass: host-user-contaminated: Correct per package home path [kirkstone,17/30] sanity.bbclass: Add ftps to accepted URI protocols for mirrors sanity [kirkstone,18/30] oeqa/sdk: drop the nativesdk-python 2.x test [kirkstone,19/30] base.bbclass: Correct the test for obsolete license exceptions [kirkstone,20/30] coreutils: Tweak packaging variable names for coreutils-dev [kirkstone,21/30] at: take tarballs from debian [kirkstone,22/30] rust: fix issue building cross-canadian tools for aarch64 on x86_64 [kirkstone,23/30] recipetool/devtool: Fix python egg whitespace issues in PACKAGECONFIG [kirkstone,24/30] glibc-tests: not clear BBCLASSEXTEND [kirkstone,25/30] curl: backport openssl fix CN check error code [kirkstone,26/30] oeqa/runtime/scp: Disable scp test for dropbear [kirkstone,27/30] packagegroup-core-ssh-dropbear: Add openssh-sftp-server recommendation [kirkstone,28/30] oe-selftest-image: Ensure the image has sftp as well as dropbear [kirkstone,29/30] openssh: break dependency on base package for -dev package [kirkstone,30/30] dropbear: break dependency on base package for -dev package

Commit Message

Steve Sakoman July 3, 2022, 7:35 p.m. UTC

From: Kai Kang <kai.kang@windriver.com>

It clears BBCLASSEXTEND in glibc-tests recipe to remove 'nativesdk'
which is set in glibc recipe. The side effect is that it removes
"${MULTILIBS}" at same time if multilib enabled. Then there will no
multilib version glibc-tests. So only remove 'nativesdk' from
BBCLASSEXTEND rather than clear it.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d15975441471c9367b6d8cfa094f093e80f910d4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-core/glibc/glibc-tests_2.35.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/meta/recipes-core/glibc/glibc-tests_2.35.bb b/meta/recipes-core/glibc/glibc-tests_2.35.bb
index 414f8660de..028e83e865 100644
--- a/meta/recipes-core/glibc/glibc-tests_2.35.bb
+++ b/meta/recipes-core/glibc/glibc-tests_2.35.bb
@@ -18,7 +18,8 @@  python __anonymous() {
        d.setVar("PROVIDES", "${PN} ${PN}-ptest")
        d.setVar("RPROVIDES", "${PN} ${PN}-ptest")
 
-       d.setVar("BBCLASSEXTEND", "")
+       bbclassextend = d.getVar("BBCLASSEXTEND").replace("nativesdk", "").strip()
+       d.setVar("BBCLASSEXTEND", bbclassextend)
        d.setVar("RRECOMMENDS", "")
        d.setVar("SYSTEMD_SERVICE:nscd", "")
        d.setVar("SYSTEMD_PACKAGES", "")
@@ -95,7 +96,7 @@  python populate_packages:prepend () {
         d.setVar('DEBIAN_NAMES', '')
 }
 
-FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/glibc-tests/*"
+FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/${PN}/*"
 
 EXCLUDE_FROM_SHLIBS = "1"