From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
To: Kai <kai.kang@windriver.com>
Cc: "openembedded-devel@lists.openembedded.org"
<openembedded-devel@lists.openembedded.org>
Subject: RE: [PATCH v3 1/1] apache2: fix multilib file conflicts
Date: Mon, 13 May 2024 10:03:24 +0000 [thread overview]
Message-ID: <DB5PR02MB10213E03D862E6062165BDECDEFE22@DB5PR02MB10213.eurprd02.prod.outlook.com> (raw)
In-Reply-To: <17619a5b-7ded-43d6-ab8b-626b428a7023@windriver.com>
> -----Original Message-----
> From: Kai <kai.kang@windriver.com>
> Sent: den 13 maj 2024 05:29
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [PATCH v3 1/1] apache2: fix multilib file conflicts
>
> On 5/12/24 21:59, Peter Kjellerstedt wrote:
> > -----Original Message-----
> > From: mailto:kai.kang@windriver.com mailto:kai.kang@windriver.com
> > Sent: den 8 maj 2024 09:07
> > To: Peter Kjellerstedt mailto:peter.kjellerstedt@axis.com
> > Cc: mailto:openembedded-devel@lists.openembedded.org
> > Subject: [PATCH v3 1/1] apache2: fix multilib file conflicts
> >
> > > From: Kai Kang mailto:kai.kang@windriver.com
> > >
> > > There are file conflicts of apache2 when multilib enabled:
[snip]
> > > @@ -80,7 +80,9 @@ EXTRA_OECONF:class-native = "\
> > > "
> > >
> > > do_configure:prepend() {
> > > - sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout
> > > + sed -i -e 's#\(cgidir:\s*\).*#\1${libexecdir}/cgi-bin#' \
> >
> > I do not know if this was intentional or not, but the above changes the
> > location of the CGI directory for all layouts, where it previously only
> > changed the path used by the Debian layout.
> >
> > It is not a problem for us as we do not use it anyway (we actually
> > remove it in our bbappend), but if it was intentional, it should be
> > mentioned in the commit message, and if it was not intentional, then
> > it should be reverted.
>
> It is indeed to change `the CGI directory` and it has been done a long time ago for all layouts.
It may have been the intention, but until now, the path was only changed
for layouts that use `${prefix}/usr/lib/cgi-bin` as cgidir, which only the
Debian layout does. So it definitely needs to be documented as a change.
> It is just update the sed pattern to make it more clear this time.
You also change `$''{libexecdir}/cgi-bin` to `${libexecdir}/cgi-bin`. This means
that the modified file now contains the expanded value of ${libexecdir} rather
than the unexpanded string as it did before. I do not think this is a problem
per se, but you may as well continue to use $''{libexecdir} above and below to
maintain the formatting of the file.
>
> > > + -e 's#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#' \
> >
> > This now works for us while using the RedHat layout.
>
> Thanks for your feedback.
>
> Regards,
> Kai
//Peter
next prev parent reply other threads:[~2024-05-13 10:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <17CD719EC1248206.5708@lists.openembedded.org>
2024-05-08 7:06 ` [PATCH v3 1/1] apache2: fix multilib file conflicts kai.kang
2024-05-12 13:59 ` Peter Kjellerstedt
2024-05-13 3:29 ` Kai
2024-05-13 5:12 ` [oe] " Khem Raj
2024-05-13 10:03 ` Peter Kjellerstedt [this message]
2024-05-21 8:43 ` Kai
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=DB5PR02MB10213E03D862E6062165BDECDEFE22@DB5PR02MB10213.eurprd02.prod.outlook.com \
--to=peter.kjellerstedt@axis.com \
--cc=kai.kang@windriver.com \
--cc=openembedded-devel@lists.openembedded.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).