Skip to contentSkip to conversation

glibc-testsuite: Use append operator to add check-test-wrapper

PATCH In review Khem Raj 3 participants 5 messages Nov 17, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 glibc-testsuite: Use append operator to add check-test-wrapper

---
 meta/recipes-core/glibc/glibc-testsuite_2.34.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/glibc/glibc-testsuite_2.34.bb +2 -1
index e8ad2a938b1..6650ec5a483 100644
@@ -3,7 +3,8 @@ require glibc-tests.inc
 
 inherit qemu
 
-SRC_URI += "file://check-test-wrapper"
+# Use append instead of += that way patch is applied with devupstream too
+SRC_URI:append = " file://check-test-wrapper"
 
 # strip provides
 PROVIDES = ""
Signature · 1 line
2.34.0
author
#1 lore raw

PATCH 2/2 glibc: Append files instead of making then part of main SRC_URI

This will help later with using devupstream

---
 meta/recipes-core/glibc/glibc_2.34.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/glibc/glibc_2.34.bb +6 -4
index 72064772789..778898f1979 100644
@@ -29,10 +29,6 @@ NATIVESDKFIXES:class-nativesdk = "\
 "
 
 SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
-           file://etc/ld.so.conf \
-           file://generate-supported.mk \
-           file://makedbs.sh \
-           \
            ${NATIVESDKFIXES} \
            file://0009-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \
            file://0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \
@@ -60,6 +56,12 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0001-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \
            file://CVE-2021-43396.patch \
            "
+# Use append instead of += that way patch is applied with devupstream too
+SRC_URI:append = "\
+           file://etc/ld.so.conf \
+           file://generate-supported.mk \
+           file://makedbs.sh \
+"
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
Signature · 1 line
2.34.0
#2 lore raw

Re: [OE-core] [PATCH 2/2] glibc: Append files instead of making then part of main SRC_URI

Quoted 25 lines · Khem Raj

This will help later with using devupstream

---
 meta/recipes-core/glibc/glibc_2.34.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/glibc/glibc_2.34.bb +0 -4
index 72064772789..778898f1979 100644
@@ -29,10 +29,6 @@ NATIVESDKFIXES:class-nativesdk = "\
 "
 
 SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
-           file://etc/ld.so.conf \
-           file://generate-supported.mk \
-           file://makedbs.sh \
-           \
            ${NATIVESDKFIXES} \
            file://0009-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \
            file://0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \
@@ -60,6 +56,12 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0001-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \
            file://CVE-2021-43396.patch \

meta/recipes-core/glibc/glibc_2.34.bb SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ · line 67

Quoted 10 lines
meta/recipes-core/glibc/glibc_2.34.bb +6 -0
            "
+# Use append instead of += that way patch is applied with devupstream too
+SRC_URI:append = "\
+           file://etc/ld.so.conf \
+           file://generate-supported.mk \
+           file://makedbs.sh \
+"
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 

I'm afraid I really dislike these kinds of patches. We need to do something with our syntax so we don't have to jump through weird hoops like this. These kind of changes look really fragile and easy to break.

Effectively it is an arms race to turn everything into an append, then nothing can disable it.

Cheers,

Richard

author
#3 lore raw

Re: [OE-core] [PATCH 2/2] glibc: Append files instead of making then part of main SRC_URI

Quoted 33 lines · Richard Purdie
Quoted 31 lines · Khem Raj

This will help later with using devupstream

---
 meta/recipes-core/glibc/glibc_2.34.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/glibc/glibc_2.34.bb +5 -4
index 72064772789..778898f1979 100644
@@ -29,10 +29,6 @@ NATIVESDKFIXES:class-nativesdk = "\
 "
 
 SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
-           file://etc/ld.so.conf \
-           file://generate-supported.mk \
-           file://makedbs.sh \
-           \
            ${NATIVESDKFIXES} \
            file://0009-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \
            file://0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \
@@ -60,6 +56,12 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0001-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \
            file://CVE-2021-43396.patch \
            "
+# Use append instead of += that way patch is applied with devupstream too
+SRC_URI:append = "\
+           file://etc/ld.so.conf \
+           file://generate-supported.mk \
+           file://makedbs.sh \
Quoted 8 lines

meta/recipes-core/glibc/glibc_2.34.bb SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ · line 67

Quoted 4 lines
meta/recipes-core/glibc/glibc_2.34.bb +1 -0
+"
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 

I'm afraid I really dislike these kinds of patches. We need to do something with our syntax so we don't have to jump through weird hoops like this. These kind of changes look really fragile and easy to break.

what do you suggest as a better approach

Quoted 8 lines

Effectively it is an arms race to turn everything into an append, then nothing can disable it.

Cheers,

Richard

#4 lore raw

RE: [OE-core] [PATCH 2/2] glibc: Append files instead of making then part of main SRC_URI

Quoted 51 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Khem Raj
Sent: den 17 november 2021 18:41
To: Richard Purdie <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH 2/2] glibc: Append files instead of making then part of main SRC_URI

Quoted 34 lines · Richard Purdie
Quoted 32 lines · Khem Raj

This will help later with using devupstream

---
 meta/recipes-core/glibc/glibc_2.34.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/glibc/glibc_2.34.bb +6 -4
index 72064772789..778898f1979 100644
@@ -29,10 +29,6 @@ NATIVESDKFIXES:class-nativesdk = "\
 "
 
 SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
-           file://etc/ld.so.conf \
-           file://generate-supported.mk \
-           file://makedbs.sh \
-           \
            ${NATIVESDKFIXES} \
            file://0009-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \
            file://0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \
@@ -60,6 +56,12 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0001-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \
            file://CVE-2021-43396.patch \
            "
+# Use append instead of += that way patch is applied with devupstream too
+SRC_URI:append = "\
+           file://etc/ld.so.conf \
+           file://generate-supported.mk \
+           file://makedbs.sh \
+"
Quoted 8 lines

meta/recipes-core/glibc/glibc_2.34.bb SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ · line 67

Quoted 3 lines
meta/recipes-core/glibc/glibc_2.34.bb +0 -0
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 

I'm afraid I really dislike these kinds of patches. We need to do something with our syntax so we don't have to jump through weird hoops like this. These kind of> changes look really fragile and easy to break.

Quoted 1 line

what do you suggest as a better approach

One way would be to introduce, e.g.:

SRC_URI_COMMON = " \
    file://etc/ld.so.conf \
    file://generate-supported.mk \
    file://makedbs.sh \

"

and then add ${SRC_URI_COMMON} to both SRC_URI and SRC_URI:class-devupstream.

Quoted 6 lines
Quoted 6 lines

Effectively it is an arms race to turn everything into an append, then nothing can disable it.

Cheers,

Richard

//Peter