diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-10 11:04:20 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-10-11 09:28:09 +0100 |
commit | a6614039ee04605d4b5efe6b2c2942dc9d0aac4d (patch) | |
tree | f0a65a3b78081c4c4b4c847960bc6a3000bff09c /meta-webserver/recipes-httpd/apache2 | |
parent | dff2c1bd5291e95b35a102c1b5fdbe78aa627c41 (diff) | |
download | meta-openembedded-a6614039ee04605d4b5efe6b2c2942dc9d0aac4d.tar.gz |
apache2: reorganise packaging definitions
Move RDEPENDS to the end and PACKAGES before other packaging
definitions.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb | 7 |
1 files 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 2c0fa6b92..5857be7de 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." | |||
3 | SUMMARY = "Apache HTTP Server" | 3 | SUMMARY = "Apache HTTP Server" |
4 | HOMEPAGE = "http://httpd.apache.org/" | 4 | HOMEPAGE = "http://httpd.apache.org/" |
5 | DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" | 5 | DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" |
6 | RDEPENDS_${PN} += "openssl libgcc" | ||
7 | SECTION = "net" | 6 | SECTION = "net" |
8 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
9 | PR = "r2" | 8 | PR = "r2" |
@@ -103,13 +102,13 @@ INITSCRIPT_NAME = "apache2" | |||
103 | INITSCRIPT_PARAMS = "defaults 91 20" | 102 | INITSCRIPT_PARAMS = "defaults 91 20" |
104 | LEAD_SONAME = "libapr-1.so.0" | 103 | LEAD_SONAME = "libapr-1.so.0" |
105 | 104 | ||
105 | PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" | ||
106 | |||
106 | CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \ | 107 | CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \ |
107 | ${sysconfdir}/${PN}/magic \ | 108 | ${sysconfdir}/${PN}/magic \ |
108 | ${sysconfdir}/${PN}/mime.types \ | 109 | ${sysconfdir}/${PN}/mime.types \ |
109 | ${sysconfdir}/init.d/${PN} " | 110 | ${sysconfdir}/init.d/${PN} " |
110 | 111 | ||
111 | PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" | ||
112 | |||
113 | # we override here rather than append so that .so links are | 112 | # we override here rather than append so that .so links are |
114 | # included in the runtime package rather than here (-dev) | 113 | # included in the runtime package rather than here (-dev) |
115 | # and to get build, icons, error into the -dev package | 114 | # and to get build, icons, error into the -dev package |
@@ -140,3 +139,5 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*" | |||
140 | 139 | ||
141 | FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug" | 140 | FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug" |
142 | 141 | ||
142 | RDEPENDS_${PN} += "openssl libgcc" | ||
143 | |||