> -----Original Message-----
> From: Kai <[email protected]>
> Sent: den 13 maj 2024 05:29
> To: Peter Kjellerstedt <[email protected]>
> Cc: [email protected]
> Subject: Re: [PATCH v3 1/1] apache2: fix multilib file conflicts
>
> On 5/12/24 21:59, Peter Kjellerstedt wrote:
> > -----Original Message-----
> > From: mailto:[email protected] mailto:[email protected]
> > Sent: den 8 maj 2024 09:07
> > To: Peter Kjellerstedt mailto:[email protected]
> > Cc: mailto:[email protected]
> > Subject: [PATCH v3 1/1] apache2: fix multilib file conflicts
> >
> > > From: Kai Kang mailto:[email protected]
> > >
> > > 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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110337):
https://lists.openembedded.org/g/openembedded-devel/message/110337
Mute This Topic: https://lists.openembedded.org/mt/105976652/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
