Skip to contentSkip to conversation

apache2: correct header file location

PATCH In review Mark Hatle 3 participants 3 messages Feb 20, 2013 – Mar 8, 2013 1 message not in the archive

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

PATCH 1/1 apache2: correct header file location

From: Pradeep Tumati <[email protected]>

Apache header files are being placed in ../usr/include/lib32-apache2 under the sysroot where as lib32-modphp looks for ../usr/include/apache2 directory. This fix ensures that apache2 header files are placed in the ../usr/include/apache2/ directory.

---
 recipes-httpd/apache2/apache2_2.4.2.bb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
recipes-httpd/apache2/apache2_2.4.2.bb +16 -16
index af7840d..af8c4ca 100644
@@ -41,13 +41,13 @@ EXTRA_OECONF = "--enable-ssl \
 		--enable-rewrite \
 		--with-dbm=sdbm \
 		--with-berkeley-db=no \
-		--localstatedir=/var/${PN} \
+		--localstatedir=/var/${BPN} \
 		--with-gdbm=no \
 		--with-ndbm=no \
-		--includedir=${includedir}/${PN} \
-		--datadir=${datadir}/${PN} \
-		--sysconfdir=${sysconfdir}/${PN} \
-                --libexecdir=${libdir}/${PN}/modules \
+		--includedir=${includedir}/${BPN} \
+		--datadir=${datadir}/${BPN} \
+		--sysconfdir=${sysconfdir}/${BPN} \
+                --libexecdir=${libdir}/${BPN}/modules \
 		ap_cv_void_ptr_lt_long=no \
 		--enable-mpms-shared \
 		ac_cv_have_threadsafe_pollset=no"
@@ -68,19 +68,19 @@ do_install_append() {
 		    -e 's,/usr/bin/,${bindir}/,g' \
 		    -e 's,/usr/lib,${libdir}/,g' \
 		    -e 's,/etc/,${sysconfdir}/,g' \
-		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${PN}
-	chmod 755 ${D}/${sysconfdir}/init.d/${PN}
+		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN}
+	chmod 755 ${D}/${sysconfdir}/init.d/${BPN}
 	# remove the goofy original files...
-	rm -rf ${D}/${sysconfdir}/${PN}/original
+	rm -rf ${D}/${sysconfdir}/${BPN}/original
 	# Expat should be found in the staging area via DEPENDS...
 	rm -f ${D}/${libdir}/libexpat.*
 
-	install -d ${D}${sysconfdir}/${PN}/conf.d
-	install -d ${D}${sysconfdir}/${PN}/modules.d
+	install -d ${D}${sysconfdir}/${BPN}/conf.d
+	install -d ${D}${sysconfdir}/${BPN}/modules.d
 
 	# Ensure configuration file pulls in conf.d and modules.d
-	printf "\nIncludeOptional ${sysconfdir}/${PN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${PN}/httpd.conf
-	printf "\nIncludeOptional ${sysconfdir}/${PN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${PN}/httpd.conf
+	printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
+	printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
 }
 
 SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
@@ -88,12 +88,12 @@ SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
 apache_sysroot_preprocess () {
 	install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
 	install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-	sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${PN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
+	sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
 	sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
 
-	sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk
-	sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk
-	sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk
+	sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+	sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+	sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
 }
 
 #
Signature · 1 line
1.8.1.2.545.g2f19ada
#1 lore raw
Quoted 70 lines · On Tuesday 19 February 2013 21:09:34 Mark Hatle wrote:

From: Pradeep Tumati <[email protected]>

Apache header files are being placed in ../usr/include/lib32-apache2 under the sysroot where as lib32-modphp looks for ../usr/include/apache2 directory. This fix ensures that apache2 header files are placed in the ../usr/include/apache2/ directory.

---
 recipes-httpd/apache2/apache2_2.4.2.bb | 32

++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

(quoted diff) +0 -0

b/recipes-httpd/apache2/apache2_2.4.2.bb index af7840d..af8c4ca 100644

recipes-httpd/apache2/apache2_2.4.2.bb +10 -11
@@ -41,13 +41,13 @@ EXTRA_OECONF = "--enable-ssl \
 		--enable-rewrite \
 		--with-dbm=sdbm \
 		--with-berkeley-db=no \
-		--localstatedir=/var/${PN} \
+		--localstatedir=/var/${BPN} \
 		--with-gdbm=no \
 		--with-ndbm=no \
-		--includedir=${includedir}/${PN} \
-		--datadir=${datadir}/${PN} \
-		--sysconfdir=${sysconfdir}/${PN} \
-                --libexecdir=${libdir}/${PN}/modules \
+		--includedir=${includedir}/${BPN} \
+		--datadir=${datadir}/${BPN} \
+		--sysconfdir=${sysconfdir}/${BPN} \
+                --libexecdir=${libdir}/${BPN}/modules \
 		ap_cv_void_ptr_lt_long=no \
 		--enable-mpms-shared \
 		ac_cv_have_threadsafe_pollset=no"
@@ -68,19 +68,19 @@ do_install_append() {
 		    -e 's,/usr/bin/,${bindir}/,g' \
 		    -e 's,/usr/lib,${libdir}/,g' \
 		    -e 's,/etc/,${sysconfdir}/,g' \
-		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${PN}
-	chmod 755 ${D}/${sysconfdir}/init.d/${PN}
+		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN}
+	chmod 755 ${D}/${sysconfdir}/init.d/${BPN}
 	# remove the goofy original files...
-	rm -rf ${D}/${sysconfdir}/${PN}/original
+	rm -rf ${D}/${sysconfdir}/${BPN}/original
 	# Expat should be found in the staging area via DEPENDS...
 	rm -f ${D}/${libdir}/libexpat.*
 
-	install -d ${D}${sysconfdir}/${PN}/conf.d
-	install -d ${D}${sysconfdir}/${PN}/modules.d
+	install -d ${D}${sysconfdir}/${BPN}/conf.d
+	install -d ${D}${sysconfdir}/${BPN}/modules.d
 
 	# Ensure configuration file pulls in conf.d and modules.d
-	printf "\nIncludeOptional ${sysconfdir}/${PN}/conf.d/*.conf" >>

${D}/${sysconfdir}/${PN}/httpd.conf - printf "\nIncludeOptional
${sysconfdir}/${PN}/modules.d/*.conf\n\n" >>
${D}/${sysconfdir}/${PN}/httpd.conf + printf "\nIncludeOptional
${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf

recipes-httpd/apache2/apache2_2.4.2.bb +1 -0
+	printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >>

${D}/${sysconfdir}/${BPN}/httpd.conf }

SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"

recipes-httpd/apache2/apache2_2.4.2.bb +0 -0
@@ -88,12 +88,12 @@ SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
 apache_sysroot_preprocess () {
 	install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
 	install -m 755 ${D}${bindir}/apxs
Quoted 1 line

${SYSROOT_DESTDIR}${bindir_crossscripts}/ - sed -i 's!my $installbuilddir

=

Quoted 22 lines

.*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${PN}/build";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs + sed -i 's!my
$installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs

recipes-httpd/apache2/apache2_2.4.2.bb +0 -1
-	sed -i 's!^APR_CONFIG = .*!APR_CONFIG =

${STAGING_BINDIR_CROSS}/apr-1-config!'
${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk - sed -i
's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!'
${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk - sed -i
's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!'
${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk + sed -i
's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!'
${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i
's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!'
${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i
's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk }

Quoted 1 line

#

Like the last patch this is not actually against meta-webserver master, and like the last patch I was about to rebase and apply it on top, and again I notice that there are ${PN} references that haven't been changed but appear to need to be - the ones I can see are in the FILES_ values e.g.

FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug"

To match up with the paths we're specifying in EXTRA_OECONF this would need to be changed to:

FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"

Surely this sort of thing should be showing up in testing?

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 3 lines · Pradeep

Randy,

Just wanted to forward you this email since Mark Hatle is on vacation...

Thanks.

Quoted 128 lines

See my comments below

Quoted 125 lines

-----Original Message-----
From: Paul Eggleton [mailto:[email protected]]
Sent: Thursday, March 07, 2013 7:51 AM
To: Hatle, Mark
Cc: Tumati, Pradeep; [email protected]
Subject: Re: [oe] [PATCH meta-webserver] apache2: correct header file location

Quoted 63 lines · On Tuesday 19 February 2013 21:09:34 Mark Hatle wrote:

From: Pradeep Tumati <[email protected]>

Apache header files are being placed in ../usr/include/lib32-apache2 under the sysroot where as lib32-modphp looks for ../usr/include/apache2 directory. This fix ensures that apache2 header files are placed in the ../usr/include/apache2/ directory.

---
  recipes-httpd/apache2/apache2_2.4.2.bb | 32

++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

(quoted diff) +0 -0

b/recipes-httpd/apache2/apache2_2.4.2.bb index af7840d..af8c4ca 100644

recipes-httpd/apache2/apache2_2.4.2.bb +10 -11
@@ -41,13 +41,13 @@ EXTRA_OECONF = "--enable-ssl \
  		--enable-rewrite \
  		--with-dbm=sdbm \
  		--with-berkeley-db=no \
-		--localstatedir=/var/${PN} \
+		--localstatedir=/var/${BPN} \
  		--with-gdbm=no \
  		--with-ndbm=no \
-		--includedir=${includedir}/${PN} \
-		--datadir=${datadir}/${PN} \
-		--sysconfdir=${sysconfdir}/${PN} \
-                --libexecdir=${libdir}/${PN}/modules \
+		--includedir=${includedir}/${BPN} \
+		--datadir=${datadir}/${BPN} \
+		--sysconfdir=${sysconfdir}/${BPN} \
+                --libexecdir=${libdir}/${BPN}/modules \
  		ap_cv_void_ptr_lt_long=no \
  		--enable-mpms-shared \
  		ac_cv_have_threadsafe_pollset=no"
@@ -68,19 +68,19 @@ do_install_append() {
  		    -e 's,/usr/bin/,${bindir}/,g' \
  		    -e 's,/usr/lib,${libdir}/,g' \
  		    -e 's,/etc/,${sysconfdir}/,g' \
-		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${PN}
-	chmod 755 ${D}/${sysconfdir}/init.d/${PN}
+		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN}
+	chmod 755 ${D}/${sysconfdir}/init.d/${BPN}
  	# remove the goofy original files...
-	rm -rf ${D}/${sysconfdir}/${PN}/original
+	rm -rf ${D}/${sysconfdir}/${BPN}/original
  	# Expat should be found in the staging area via DEPENDS...
  	rm -f ${D}/${libdir}/libexpat.*
 
-	install -d ${D}${sysconfdir}/${PN}/conf.d
-	install -d ${D}${sysconfdir}/${PN}/modules.d
+	install -d ${D}${sysconfdir}/${BPN}/conf.d
+	install -d ${D}${sysconfdir}/${BPN}/modules.d
 
  	# Ensure configuration file pulls in conf.d and modules.d
-	printf "\nIncludeOptional ${sysconfdir}/${PN}/conf.d/*.conf" >>

${D}/${sysconfdir}/${PN}/httpd.conf - printf "\nIncludeOptional
${sysconfdir}/${PN}/modules.d/*.conf\n\n" >>
${D}/${sysconfdir}/${PN}/httpd.conf + printf "\nIncludeOptional
${sysconfdir}/${BPN}/conf.d/*.conf" >>
${D}/${sysconfdir}/${BPN}/httpd.conf

recipes-httpd/apache2/apache2_2.4.2.bb

Quoted 1 line
recipes-httpd/apache2/apache2_2.4.2.bb +1 -0
+	printf "\nIncludeOptional

${sysconfdir}/${BPN}/modules.d/*.conf\n\n"

recipes-httpd/apache2/apache2_2.4.2.bb SYSROOT_PREPROCESS_FUNCS +=

Quoted 5 lines

+>>
${D}/${sysconfdir}/${BPN}/httpd.conf }

SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"

recipes-httpd/apache2/apache2_2.4.2.bb +0 -0
@@ -88,12 +88,12 @@ SYSROOT_PREPROCESS_FUNCS +=

"apache_sysroot_preprocess"

Quoted 4 lines
recipes-httpd/apache2/apache2_2.4.2.bb +0 -0
  apache_sysroot_preprocess () {
  	install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
  	install -m 755 ${D}${bindir}/apxs

${SYSROOT_DESTDIR}${bindir_crossscripts}/ - sed -i 's!my

$installbuilddir
=

Quoted 9 lines

.*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${PN}/build";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs + sed -i 's!my
$installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs

recipes-httpd/apache2/apache2_2.4.2.bb +0 -1
-	sed -i 's!^APR_CONFIG = .*!APR_CONFIG =
Quoted 3 lines

${STAGING_BINDIR_CROSS}/apr-1-config!'
${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk - sed -i
's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-

config!'

Quoted 4 lines

${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk - sed -i
's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!'
${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk + sed -i
's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-

config!'

Quoted 2 lines

${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i
's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-

config!'

Quoted 5 lines

${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i
's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk }

#

Like the last patch this is not actually against meta-webserver master, and like the last patch I was about to rebase and apply it on top, and again I notice that there are ${PN} references that haven't been changed but appear to need to be - the ones I can see are in the FILES_ values e.g.

FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug"

To match up with the paths we're specifying in EXTRA_OECONF this would need to be changed to:

FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"

Quoted 7 lines
Quoted 1 line

Surely this sort of thing should be showing up in testing?

This is Paul's response to the apache2 multilib defect that I have worked on earlier. Paul points out that a few more ${PN}s have to be changed to ${BPN}s and so I was wondering if you can guide us how to proceed from here.

We're a bit behind the upstream meta-openembedded/meta-webserver repo:

we have : apache2_2.4.2.bb
upstream has : apache2_2.4.3.bb

Not a big deal and we'll get caught up soon, I expect.

Anyway, we do in fact have this error in the meta-webserver layer's apache2_2.4.2 recipe but there isn't a warning generated when the multilib dbg rpm is packaged...Ah, that's because we have a local bbappend that needs to be sent upstream. Song can you do that that in the next day or so.

Pradeep, because we're a version behind upstream, it's best if we adjust our patches before sending upstream.

Hope that helps,

// Randy

Quoted 12 lines

Thanks,
Pradeep

Quoted 8 lines

Cheers,
Paul

--

Paul Eggleton
Intel Open Source Technology Centre

Signature · 2 lines
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350