Skip to contentSkip to conversation

glibc-tests: not clear BBCLASSEXTEND

PATCH In review [email protected] 3 participants 4 messages Jun 28, 2022 – Jun 30, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 glibc-tests: not clear BBCLASSEXTEND

From: Kai Kang <[email protected]>

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.

---
 meta/recipes-core/glibc/glibc-tests_2.35.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/glibc/glibc-tests_2.35.bb +3 -2
index 414f8660de..028e83e865 100644
@@ -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"
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 28 lines · kai

From: Kai Kang <[email protected]>

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.

---
 meta/recipes-core/glibc/glibc-tests_2.35.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/glibc/glibc-tests_2.35.bb +2 -1
index 414f8660de..028e83e865 100644
@@ -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", "")

meta/recipes-core/glibc/glibc-tests_2.35.bb python populate_packages:prepend () { · line 102

Quoted 8 lines
meta/recipes-core/glibc/glibc-tests_2.35.bb +1 -1
@@ -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"
 

Have you tested the multilib glibc-tests and been able to use it successfully?

Cheers,

Richard

#2 lore raw
Quoted 32 lines · Richard Purdie
Quoted 31 lines · kai

From: Kai Kang <[email protected]>

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.

---
  meta/recipes-core/glibc/glibc-tests_2.35.bb | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/glibc/glibc-tests_2.35.bb +2 -1
index 414f8660de..028e83e865 100644
@@ -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', '')
  }
 
Quoted 7 lines

meta/recipes-core/glibc/glibc-tests_2.35.bb python populate_packages:prepend () { · line 102

Quoted 5 lines
meta/recipes-core/glibc/glibc-tests_2.35.bb +1 -1
-FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/glibc-tests/*"
+FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/${PN}/*"
 
  EXCLUDE_FROM_SHLIBS = "1"
 

Have you tested the multilib glibc-tests and been able to use it successfully?

If Kai hasn't Naveen will.

../Randy

Quoted 14 lines

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167350): https://lists.openembedded.org/g/openembedded-core/message/167350
Mute This Topic: https://lists.openembedded.org/mt/92046086/3616765
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 2 lines
# Randy MacLeod
# Wind River Linux
author
#3 lore raw
Quoted 40 lines · Randy MacLeod
Quoted 29 lines · Richard Purdie
Quoted 28 lines · kai

From: Kai Kang <[email protected]>

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.

---
  meta/recipes-core/glibc/glibc-tests_2.35.bb | 5 +++--

  1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/glibc/glibc-tests_2.35.bb +2 -0
index 414f8660de..028e83e865 100644
@@ -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", "")

meta/recipes-core/glibc/glibc-tests_2.35.bb +0 -0
@@ -95,7 +96,7 @@ python populate_packages:prepend () {
Quoted 8 lines
Quoted 6 lines
meta/recipes-core/glibc/glibc-tests_2.35.bb +0 -0
           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"

Have you tested the multilib glibc-tests and been able to use it successfully?

Quoted 1 line

If Kai hasn't Naveen will.

Thanks. I test it on core-image-minimal with multilib enabled.

And 132 test cases of lib32-glibc-tests run, 121 PASS, 10 FAIL and 1 SKIP.

Regards,
Kai

Quoted 18 lines

../Randy

Quoted 14 lines

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167350): https://lists.openembedded.org/g/openembedded-core/message/167350
Mute This Topic: https://lists.openembedded.org/mt/92046086/3616765
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 2 lines
Kai Kang
Wind River Linux