| Message ID | a6614039ee04605d4b5efe6b2c2942dc9d0aac4d.1349944125.git.paul.eggleton@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | a6614039ee04605d4b5efe6b2c2942dc9d0aac4d |
| Headers | show |
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb index 2c0fa6b..5857be7 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb @@ -3,7 +3,6 @@ extensible web server." SUMMARY = "Apache HTTP Server" HOMEPAGE = "http://httpd.apache.org/" DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" -RDEPENDS_${PN} += "openssl libgcc" SECTION = "net" LICENSE = "Apache-2.0" PR = "r2" @@ -103,13 +102,13 @@ INITSCRIPT_NAME = "apache2" INITSCRIPT_PARAMS = "defaults 91 20" LEAD_SONAME = "libapr-1.so.0" +PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" + CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \ ${sysconfdir}/${PN}/magic \ ${sysconfdir}/${PN}/mime.types \ ${sysconfdir}/init.d/${PN} " -PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" - # we override here rather than append so that .so links are # included in the runtime package rather than here (-dev) # and to get build, icons, error into the -dev package @@ -140,3 +139,5 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*" FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug" +RDEPENDS_${PN} += "openssl libgcc" +
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 11-10-12 10:29, Paul Eggleton schreef: > Move RDEPENDS to the end and PACKAGES before other packaging > definitions. > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- > .../recipes-httpd/apache2/apache2_2.4.2.bb | 7 ++++--- 1 file > changed, 4 insertions(+), 3 deletions(-) > > diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb index > 2c0fa6b..5857be7 100644 --- > a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb +++ > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb > +RDEPENDS_${PN} += "openssl libgcc" To make it clearer for future generations, could you add a commend why these aren't getting picked up by the shlib code? -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFQdpkeMkyGM64RGpERAn0nAJ9EmUE9s9NJnfs0JaYsyTMHfusJggCfWsez aCjEmgGyXcmEt8JwpayqX4U= =XkhP -----END PGP SIGNATURE-----
On Thursday 11 October 2012 12:02:06 Koen Kooi wrote: > Op 11-10-12 10:29, Paul Eggleton schreef: > > Move RDEPENDS to the end and PACKAGES before other packaging > > definitions. > > > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- > > .../recipes-httpd/apache2/apache2_2.4.2.bb | 7 ++++--- 1 file > > changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb > > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb index > > 2c0fa6b..5857be7 100644 --- > > a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb +++ > > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb > > > > +RDEPENDS_${PN} += "openssl libgcc" > > To make it clearer for future generations, could you add a commend why these > aren't getting picked up by the shlib code? I don't know without investigating and I'm afraid I have more pressing issues to solve at the moment. I will add it to my todo list though. Cheers, Paul
Move RDEPENDS to the end and PACKAGES before other packaging definitions. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- .../recipes-httpd/apache2/apache2_2.4.2.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)