diff options
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb | 5 | ||||
| -rw-r--r-- | meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb index f0298b91ab..c422092f83 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb | |||
| @@ -29,7 +29,10 @@ SRC_URI[sha256sum] = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b63999 | |||
| 29 | 29 | ||
| 30 | S = "${WORKDIR}/httpd-${PV}" | 30 | S = "${WORKDIR}/httpd-${PV}" |
| 31 | 31 | ||
| 32 | inherit autotools update-rc.d pkgconfig systemd | 32 | inherit autotools update-rc.d pkgconfig systemd update-alternatives |
| 33 | |||
| 34 | ALTERNATIVE_${PN}-doc = "htpasswd.1" | ||
| 35 | ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" | ||
| 33 | 36 | ||
| 34 | SYSTEMD_SERVICE_${PN} = "apache2.service" | 37 | SYSTEMD_SERVICE_${PN} = "apache2.service" |
| 35 | SYSTEMD_AUTO_ENABLE_${PN} = "disable" | 38 | SYSTEMD_AUTO_ENABLE_${PN} = "disable" |
diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index 37bd7537dd..81815d6526 100644 --- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | |||
| @@ -19,7 +19,11 @@ UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" | |||
| 19 | 19 | ||
| 20 | S = "${WORKDIR}/sthttpd-${PV}" | 20 | S = "${WORKDIR}/sthttpd-${PV}" |
| 21 | 21 | ||
| 22 | inherit autotools update-rc.d systemd | 22 | inherit autotools update-rc.d systemd update-alternatives |
| 23 | |||
| 24 | ALTERNATIVE_PRIORITY = "100" | ||
| 25 | ALTERNATIVE_${PN}-doc = "htpasswd.1" | ||
| 26 | ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" | ||
| 23 | 27 | ||
| 24 | SRV_DIR ?= "${servicedir}/www" | 28 | SRV_DIR ?= "${servicedir}/www" |
| 25 | 29 | ||
