> -----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
>
> On Wed, Nov 17, 2021 at 9:38 AM Richard Purdie
> <[email protected]> wrote:
> >
> > On Wed, 2021-11-17 at 08:56 -0800, Khem Raj wrote:
> > > This will help later with using devupstream
> > >
> > > Signed-off-by: Khem Raj <[email protected]>
> > > ---
> > > meta/recipes-core/glibc/glibc_2.34.bb | 10 ++++++----
> > > 1 file changed, 6 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/meta/recipes-core/glibc/glibc_2.34.bb
> > > b/meta/recipes-core/glibc/glibc_2.34.bb
> > > index 72064772789..778898f1979 100644
> > > --- a/meta/recipes-core/glibc/glibc_2.34.bb
> > > +++ b/meta/recipes-core/glibc/glibc_2.34.bb
> > > @@ -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}"
> > >
> >
> > 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
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.
> > Effectively it is an arms race to turn everything into an append, then
> > nothing can disable it.
> >
> > Cheers,
> >
> > Richard
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158453):
https://lists.openembedded.org/g/openembedded-core/message/158453
Mute This Topic: https://lists.openembedded.org/mt/87124068/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
