aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-09-01 02:25:50 -0700
committerRobert Yang <liezhi.yang@windriver.com>2014-09-18 19:56:33 -0700
commitc2c746b0ba4cef62b3140bce5c0bc3d6035fa69d (patch)
treed50fe4d32014de23c148a84352815bde15f5e472
parent4a02d3391caa5ecfbac32a2f6913baa8086cb9f0 (diff)
downloadmeta-openembedded-contrib-c2c746b0ba4cef62b3140bce5c0bc3d6035fa69d.tar.gz
meta-openembedded-contrib-c2c746b0ba4cef62b3140bce5c0bc3d6035fa69d.tar.bz2
meta-openembedded-contrib-c2c746b0ba4cef62b3140bce5c0bc3d6035fa69d.zip
apache2: split apache2-scripts subpkg
Split apache2-scripts subpkg to put the perl script dbmmanage, so that apache2 doesn't have to RDEPEND on perl. Add another perl script apxs to apache2-dev pkg as Olof Johansson suggested. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
index 035602934b..573cd6fb00 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
@@ -112,7 +112,7 @@ INITSCRIPT_NAME = "apache2"
INITSCRIPT_PARAMS = "defaults 91 20"
LEAD_SONAME = "libapr-1.so.0"
-PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
+PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \
${sysconfdir}/${BPN}/magic \
@@ -129,11 +129,16 @@ FILES_${PN}-dev = "${datadir}/${BPN}/build \
${libdir}/apr*.exp \
${includedir}/${BPN} \
${libdir}/*.la \
- ${libdir}/*.a"
+ ${libdir}/*.a \
+ ${bindir}/apxs \
+ "
+
# manual to manual
FILES_${PN}-doc += " ${datadir}/${BPN}/manual"
+FILES_${PN}-scripts += "${bindir}/dbmmanage"
+
#
# override this too - here is the default, less datadir
#
@@ -150,3 +155,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc"
+RDEPENDS_${PN}-scripts += "perl ${PN}"