[meta-webserver][PATCH 0/2] apache2 fixes

[meta-webserver][PATCH 0/2] apache2 fixes

[Paul Eggleton]

The following changes since commit 9e701bb060325bc47509d4874bd695f039191ea8:

  libconfig: port from classic and update (2012-10-10 12:35:07 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/apache2-config
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/apache2-config

Paul Eggleton (2):
  apache2: work around bug in apr-1-config/apu-1-config scripts
  apache2: reorganise packaging definitions

 .../recipes-httpd/apache2/apache2_2.4.2.bb         |   23 ++++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

-- 
1.7.9.5

[meta-webserver][PATCH 1/2] apache2: work around bug in apr-1-config/apu-1-config scripts

[Paul Eggleton]

The apr-1-config and apu-1-config scripts (installed into the sysroot
by apr and apr-util respectively) report incorrect paths with current
OE-Core - see:

  http://bugzilla.yoctoproject.org/show_bug.cgi?id=3267

Since OE-Core is frozen at the moment, work around the issue by taking
a copy of the scripts and fixing them up. Additionally we need to not
mangle the libtool name as apr installs it into the sysroot as just
'libtool'.

This fixes building apache2 with rm_work enabled.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-httpd/apache2/apache2_2.4.2.bb         |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
index 0eb5327..2c0fa6b 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
@@ -6,11 +6,10 @@ DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
 RDEPENDS_${PN} += "openssl libgcc"
 SECTION = "net"
 LICENSE = "Apache-2.0"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
            file://server-makefile.patch \
-           file://fix-libtool-name.patch \
            file://httpd-2.4.1-corelimit.patch \
            file://httpd-2.4.1-export.patch \
            file://httpd-2.4.1-selinux.patch \
@@ -37,8 +36,8 @@ CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
 EXTRA_OECONF = "--enable-ssl \
 		--with-ssl=${STAGING_LIBDIR}/.. \
 		--with-expat=${STAGING_LIBDIR}/.. \
-		--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
-		--with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \
+		--with-apr=${WORKDIR}/apr-1-config \
+		--with-apr-util=${WORKDIR}/apu-1-config \
 		--enable-info \
 		--enable-rewrite \
 		--with-dbm=sdbm \
@@ -54,6 +53,15 @@ EXTRA_OECONF = "--enable-ssl \
 		--enable-mpms-shared \
 		ac_cv_have_threadsafe_pollset=no"
 
+do_configure_prepend() {
+	# FIXME: this hack is required to work around an issue with apr/apr-util
+	# Can be removed when fixed in OE-Core (also revert --with-* options above)
+	# see http://bugzilla.yoctoproject.org/show_bug.cgi?id=3267
+	cp ${STAGING_BINDIR_CROSS}/apr-1-config ${STAGING_BINDIR_CROSS}/apu-1-config ${WORKDIR}
+	sed -i -e 's:location=source:location=installed:' ${WORKDIR}/apr-1-config
+	sed -i -e 's:location=source:location=installed:' ${WORKDIR}/apu-1-config
+}
+
 do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
 	cat ${WORKDIR}/init | \
-- 
1.7.9.5

[meta-webserver][PATCH 2/2] apache2: reorganise packaging definitions

[Paul Eggleton]

Move RDEPENDS to the end and PACKAGES before other packaging
definitions.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-httpd/apache2/apache2_2.4.2.bb         |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
index 2c0fa6b..5857be7 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
@@ -3,7 +3,6 @@ extensible web server."
 SUMMARY = "Apache HTTP Server"
 HOMEPAGE = "http://httpd.apache.org/"
 DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
-RDEPENDS_${PN} += "openssl libgcc"
 SECTION = "net"
 LICENSE = "Apache-2.0"
 PR = "r2"
@@ -103,13 +102,13 @@ INITSCRIPT_NAME = "apache2"
 INITSCRIPT_PARAMS = "defaults 91 20"
 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} "
 
-PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
-
 # 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
@@ -140,3 +139,5 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug"
 
+RDEPENDS_${PN} += "openssl libgcc"
+
-- 
1.7.9.5

Re: [meta-webserver][PATCH 2/2] apache2: reorganise packaging definitions

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 11-10-12 10:29, Paul Eggleton schreef:
> Move RDEPENDS to the end and PACKAGES before other packaging 
> definitions.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- 
> .../recipes-httpd/apache2/apache2_2.4.2.bb         |    7 ++++--- 1 file
> changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
> b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb index
> 2c0fa6b..5857be7 100644 ---
> a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb +++
> b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb

> +RDEPENDS_${PN} += "openssl libgcc"

To make it clearer for future generations, could you add a commend why these
aren't getting picked up by the shlib code?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQdpkeMkyGM64RGpERAn0nAJ9EmUE9s9NJnfs0JaYsyTMHfusJggCfWsez
aCjEmgGyXcmEt8JwpayqX4U=
=XkhP
-----END PGP SIGNATURE-----

Re: [meta-webserver][PATCH 2/2] apache2: reorganise packaging definitions

[Paul Eggleton]

On Thursday 11 October 2012 12:02:06 Koen Kooi wrote:
> Op 11-10-12 10:29, Paul Eggleton schreef:
> > Move RDEPENDS to the end and PACKAGES before other packaging
> > definitions.
> > 
> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---
> > .../recipes-httpd/apache2/apache2_2.4.2.bb         |    7 ++++--- 1 file
> > changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
> > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb index
> > 2c0fa6b..5857be7 100644 ---
> > a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb +++
> > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
> > 
> > +RDEPENDS_${PN} += "openssl libgcc"
> 
> To make it clearer for future generations, could you add a commend why these
> aren't getting picked up by the shlib code?

I don't know without investigating and I'm afraid I have more pressing issues 
to solve at the moment. I will add it to my todo list though.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre