From 667a6dbb2f886bc14b91d6370f3e6c904f5dfb0d Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 1 Sep 2014 02:25:50 -0700 Subject: [PATCH] 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. (From meta-openembedded rev: df56eb34857748f6400ac04279194212356a94cb) Signed-off-by: Robert Yang Signed-off-by: Patrick Ohly --- .../meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb index 0356029..573cd6f 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb +++ b/meta-openembedded/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}" -- 2.7.4