[meta-webserver][PATCH 1/2] apache2: Correct appending to SYSROOT_PREPROCESS_FUNCS

[meta-webserver][PATCH 1/2] apache2: Correct appending to SYSROOT_PREPROCESS_FUNCS

[Peter Kjellerstedt]

A missing space lead to problems if something else was already added to
SYSROOT_PREPROCESS_FUNCS.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

We have a bbappend which amongst others inherits useradd, which also
appends to SYSROOT_PREPROCESS_FUNCS. What really confuses me though,
is that there was no error due to not being able to find the non-
existent useradd_sysroot_sstateapache_sysroot_preprocess function...
Only reason I noticed that there was a problem was because other
packages failed to build because apxs had not been installed in the
sysroot as expected.

 meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
index d58ccb8f2..c6961ef9b 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
@@ -147,7 +147,7 @@ do_install_append_class-native() {
     install -m 755 server/gen_test_char ${D}${bindir}
 }
 
-SYSROOT_PREPROCESS_FUNCS_append_class-target = "apache_sysroot_preprocess"
+SYSROOT_PREPROCESS_FUNCS_append_class-target = " apache_sysroot_preprocess"
 
 apache_sysroot_preprocess() {
     install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
-- 
2.12.0

[meta-webserver][PATCH 2/2] apache2: Correct packaging of build and doc related files

[Peter Kjellerstedt]

The build related files (${datadir}/${BPN}/build and ${bindir}/apxs)
belong in the -dev package, and the manual belong in the -doc package.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

No idea why these files were moved to the main package in the 2.4.39
update, but it makes no sense. The build files and apxs are only needed
if you build on target, and that's what -dev is for, and the manual
obviously belongs in the -doc package.

 meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
index c6961ef9b..2bd21f7d1 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
@@ -184,12 +184,17 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \
 
 # We override here rather than append so that .so links are
 # included in the runtime package rather than here (-dev)
-# and to get icons, error into the -dev package
-FILES_${PN}-dev = "${datadir}/${BPN}/icons \
+# and to get build, icons, error into the -dev package
+FILES_${PN}-dev = "${datadir}/${BPN}/build \
+                   ${datadir}/${BPN}/icons \
                    ${datadir}/${BPN}/error \
                    ${includedir}/${BPN} \
+                   ${bindir}/apxs \
                   "
 
+# Add the manual to -doc
+FILES_${PN}-doc += " ${datadir}/${BPN}/manual"
+
 FILES_${PN}-scripts += "${bindir}/dbmmanage"
 
 # Override this too - here is the default, less datadir
-- 
2.12.0