From 1918ce06614115d377d52d61819254cdf49e31c2 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 9 Jun 2022 21:43:19 -0700 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- .../recipes-httpd/apache2/apache2_2.4.54.bb | 16 ++++++++++++++-- 1 file 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" ALTERNATIVE:${PN}-doc = "htpasswd.1" ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" -PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" +PACKAGES = "${PN}-utils ${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \ ${sysconfdir}/${BPN}/magic \ ${sysconfdir}/${BPN}/mime.types \ ${sysconfdir}/${BPN}/extra/*" +FILES:${PN}-utils = "${bindir}/ab \ + ${bindir}/htdbm \ + ${bindir}/htdigest \ + ${bindir}/htpasswd \ + ${bindir}/logresolve \ + ${bindir}/httxt2dbm \ + ${sbindir}/htcacheclean \ + ${sbindir}/fcgistarter \ + ${sbindir}/checkgid \ + ${sbindir}/rotatelogs \ + " + # 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 @@ -207,7 +219,7 @@ FILES:${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin" FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug" -RDEPENDS:${PN} += "openssl libgcc" +RDEPENDS:${PN} += "openssl libgcc ${PN}-utils" RDEPENDS:${PN}-scripts += "perl ${PN}" RDEPENDS:${PN}-dev = "perl"