Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
To: Khem Raj <raj.khem@gmail.com>,
	Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
Subject: RE: [OE-core] [PATCH 2/2] glibc: Append files instead of making then part of main SRC_URI
Date: Wed, 17 Nov 2021 18:24:43 +0000	[thread overview]
Message-ID: <37589655d6014c378b65665345e8534a@axis.com> (raw)
In-Reply-To: <CAMKF1sr0f61MFBwQ=xqwe34=znuR2HgtOnHKjb_ncQhU0fMaWQ@mail.gmail.com>

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: den 17 november 2021 18:41
> To: Richard Purdie <richard.purdie@linuxfoundation.org>
> Cc: Patches and discussions about the oe-core layer <openembedded-core@lists.openembedded.org>
> 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 <richard.purdie@linuxfoundation.org> 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 <raj.khem@gmail.com>
> > > ---
> > >  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


      reply	other threads:[~2021-11-17 18:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-17 16:56 [PATCH 1/2] glibc-testsuite: Use append operator to add check-test-wrapper Khem Raj
2021-11-17 16:56 ` [PATCH 2/2] glibc: Append files instead of making then part of main SRC_URI Khem Raj
2021-11-17 17:38   ` [OE-core] " Richard Purdie
2021-11-17 17:41     ` Khem Raj
2021-11-17 18:24       ` Peter Kjellerstedt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=37589655d6014c378b65665345e8534a@axis.com \
    --to=peter.kjellerstedt@axis.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=raj.khem@gmail.com \
    --cc=richard.purdie@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox