* [PATCH][meta-webserver] apache2 multilib issues
@ 2013-02-15 18:58 Amy Fong
2013-02-16 20:15 ` Paul Eggleton
0 siblings, 1 reply; 2+ messages in thread
From: Amy Fong @ 2013-02-15 18:58 UTC (permalink / raw)
To: openembedded-devel
apache2: multilib issues
Building a multilib version of apache2 results in many packages
being installed but not packaged, resulting in apache2 being
unable to run.
We fix this by modifying the FILES*${PN} to specify BPN instead of PN
where required. (Also make he required change for CONFFILES_${PN})
Signed-off-by: Amy Fong <amy.fong@windriver.com>
--
apache2_2.4.2.bb | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/recipes-httpd/apache2/apache2_2.4.2.bb b/recipes-httpd/apache2/apache2_2.4.2.bb
index af8c4ca..1ed189b 100644
--- a/recipes-httpd/apache2/apache2_2.4.2.bb
+++ b/recipes-httpd/apache2/apache2_2.4.2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://httpd.apache.org/"
DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
SECTION = "net"
LICENSE = "Apache-2.0"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
file://server-makefile.patch \
@@ -105,40 +105,40 @@ LEAD_SONAME = "libapr-1.so.0"
PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
-CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \
- ${sysconfdir}/${PN}/magic \
- ${sysconfdir}/${PN}/mime.types \
- ${sysconfdir}/init.d/${PN} "
+CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \
+ ${sysconfdir}/${BPN}/magic \
+ ${sysconfdir}/${BPN}/mime.types \
+ ${sysconfdir}/init.d/${BPN} "
# we override here rather than append so that .so links are
# included in the runtime package rather than here (-dev)
# and to get build, icons, error into the -dev package
-FILES_${PN}-dev = "${datadir}/${PN}/build \
- ${datadir}/${PN}/icons \
- ${datadir}/${PN}/error \
+FILES_${PN}-dev = "${datadir}/${BPN}/build \
+ ${datadir}/${BPN}/icons \
+ ${datadir}/${BPN}/error \
${bindir}/apr-config ${bindir}/apu-config \
${libdir}/apr*.exp \
- ${includedir}/${PN} \
+ ${includedir}/${BPN} \
${libdir}/*.la \
${libdir}/*.a"
# manual to manual
-FILES_${PN}-doc += " ${datadir}/${PN}/manual"
+FILES_${PN}-doc += " ${datadir}/${BPN}/manual"
#
# override this too - here is the default, less datadir
#
FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconfdir} \
${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \
- ${libdir}/${PN}"
+ ${libdir}/${BPN}"
# we want htdocs and cgi-bin to go with the binary
-FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin"
+FILES_${PN} += "${datadir}/${BPN}/htdocs ${datadir}/${BPN}/cgi-bin"
#make sure the lone .so links also get wrapped in the base package
FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
-FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug"
+FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][meta-webserver] apache2 multilib issues
2013-02-15 18:58 [PATCH][meta-webserver] apache2 multilib issues Amy Fong
@ 2013-02-16 20:15 ` Paul Eggleton
0 siblings, 0 replies; 2+ messages in thread
From: Paul Eggleton @ 2013-02-16 20:15 UTC (permalink / raw)
To: Amy Fong; +Cc: openembedded-devel
Hi Amy,
On Friday 15 February 2013 13:58:26 Amy Fong wrote:
> apache2: multilib issues
>
> Building a multilib version of apache2 results in many packages
> being installed but not packaged, resulting in apache2 being
> unable to run.
>
> We fix this by modifying the FILES*${PN} to specify BPN instead of PN
> where required. (Also make he required change for CONFFILES_${PN})
>
> Signed-off-by: Amy Fong <amy.fong@windriver.com>
> --
> apache2_2.4.2.bb | 26 +++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/recipes-httpd/apache2/apache2_2.4.2.bb
> b/recipes-httpd/apache2/apache2_2.4.2.bb index af8c4ca..1ed189b 100644
> --- a/recipes-httpd/apache2/apache2_2.4.2.bb
> +++ b/recipes-httpd/apache2/apache2_2.4.2.bb
This patch is effectively against the danny branch; master has moved on to
version 2.4.3. I was about to rebase it on top of master and then I noticed
that there are still some PN references in the value of EXTRA_OECONF that
might be problematic for the multilib case. This patch will certainly fix the
warnings, but has it been tested at runtime?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-16 20:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-15 18:58 [PATCH][meta-webserver] apache2 multilib issues Amy Fong
2013-02-16 20:15 ` Paul Eggleton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.