summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb16
1 files changed, 14 insertions, 2 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb
index 4b0ed2f622..c5f014b3cd 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb
@@ -176,13 +176,25 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable"
176ALTERNATIVE:${PN}-doc = "htpasswd.1" 176ALTERNATIVE:${PN}-doc = "htpasswd.1"
177ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" 177ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"
178 178
179PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" 179PACKAGES = "${PN}-utils ${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
180 180
181CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \ 181CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \
182 ${sysconfdir}/${BPN}/magic \ 182 ${sysconfdir}/${BPN}/magic \
183 ${sysconfdir}/${BPN}/mime.types \ 183 ${sysconfdir}/${BPN}/mime.types \
184 ${sysconfdir}/${BPN}/extra/*" 184 ${sysconfdir}/${BPN}/extra/*"
185 185
186FILES:${PN}-utils = "${bindir}/ab \
187 ${bindir}/htdbm \
188 ${bindir}/htdigest \
189 ${bindir}/htpasswd \
190 ${bindir}/logresolve \
191 ${bindir}/httxt2dbm \
192 ${sbindir}/htcacheclean \
193 ${sbindir}/fcgistarter \
194 ${sbindir}/checkgid \
195 ${sbindir}/rotatelogs \
196 "
197
186# We override here rather than append so that .so links are 198# We override here rather than append so that .so links are
187# included in the runtime package rather than here (-dev) 199# included in the runtime package rather than here (-dev)
188# and to get build, icons, error into the -dev package 200# and to get build, icons, error into the -dev package
@@ -207,7 +219,7 @@ FILES:${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin"
207 219
208FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug" 220FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
209 221
210RDEPENDS:${PN} += "openssl libgcc" 222RDEPENDS:${PN} += "openssl libgcc ${PN}-utils"
211RDEPENDS:${PN}-scripts += "perl ${PN}" 223RDEPENDS:${PN}-scripts += "perl ${PN}"
212RDEPENDS:${PN}-dev = "perl" 224RDEPENDS:${PN}-dev = "perl"
213 225