diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2022-06-09 21:43:19 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-06-30 13:39:27 -0400 |
| commit | 1918ce06614115d377d52d61819254cdf49e31c2 (patch) | |
| tree | 8a4041a163ce4ece6522f34b93d0b46c4a9f59f3 /meta-webserver/recipes-httpd | |
| parent | be63afc4ecdb29895acf87cb093764db03d55c2d (diff) | |
| download | meta-openembedded-1918ce06614115d377d52d61819254cdf49e31c2.tar.gz | |
apache2: split out a new package apache2-utils
Split out apache2-utils so this small package could be used by
other packages. For example, htpasswd could be used by docker-registry.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb | 16 |
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" | |||
| 176 | ALTERNATIVE:${PN}-doc = "htpasswd.1" | 176 | ALTERNATIVE:${PN}-doc = "htpasswd.1" |
| 177 | ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" | 177 | ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" |
| 178 | 178 | ||
| 179 | PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" | 179 | PACKAGES = "${PN}-utils ${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" |
| 180 | 180 | ||
| 181 | CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \ | 181 | CONFFILES:${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 | ||
| 186 | FILES:${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 | ||
| 208 | FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug" | 220 | FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug" |
| 209 | 221 | ||
| 210 | RDEPENDS:${PN} += "openssl libgcc" | 222 | RDEPENDS:${PN} += "openssl libgcc ${PN}-utils" |
| 211 | RDEPENDS:${PN}-scripts += "perl ${PN}" | 223 | RDEPENDS:${PN}-scripts += "perl ${PN}" |
| 212 | RDEPENDS:${PN}-dev = "perl" | 224 | RDEPENDS:${PN}-dev = "perl" |
| 213 | 225 | ||
