From d15975441471c9367b6d8cfa094f093e80f910d4 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 28 Jun 2022 23:22:28 +0800 Subject: [PATCH] glibc-tests: not clear BBCLASSEXTEND 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 Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-tests_2.35.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-tests_2.35.bb b/meta/recipes-core/glibc/glibc-tests_2.35.bb index 414f8660de3..028e83e865b 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" -- 2.47.3