[oe] [PATCH 09/13] apache2: split apache2-scripts subpkg

[Robert Yang]

Hello,

I updated this commit in the original repo:

   git://git.openembedded.org/meta-openembedded-contrib rbt/rdeps

// Robert

And the patch is:
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.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
  .../recipes-httpd/apache2/apache2_2.4.10.bb        |   10 ++++++++--
  1 file 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 0356029..573cd6f 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}"
-- 
1.7.9.5


On 09/02/2014 04:31 PM, Olof Johansson wrote:
> On 14-09-01 17:18 +0200, Robert Yang wrote:
>> Perl:
>> apache2/usr/bin/dbmmanage:#!/usr/bin/perl
>> apache2/usr/bin/apxs:#!/usr/bin/perl -w
>>
>> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
>> ---
>>   .../recipes-httpd/apache2/apache2_2.4.10.bb        |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> 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 0356029..5989a05 100644
>> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
>> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
>> @@ -149,4 +149,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
>>
>>   FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
>>
>> -RDEPENDS_${PN} += "openssl libgcc"
>> +RDEPENDS_${PN} += "openssl libgcc perl"
>
> This would probably be nice to separate to a -scripts package if
> those two scripts are the only reason they would rdepend on perl.
> I think apxs could be included in the -dev package.
>
> Regards,
>