From 3c31d1480e3f481a67d373abcd153307a923b99f Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 16 May 2018 11:22:13 +0800 Subject: apache2/sthttpd: add alternatives for doc There is a failure to install both of sthttpd-doc and apache2-doc to rootfs. ... |Error: Transaction check error: | file /usr/share/man/man1/htpasswd.1 conflicts between attempted installs of sthttpd-doc-2.27.1 -r0.0.armv7ahf_neon and apache2-doc-2.4.27 -r0.0.armv7ahf_neon ... Signed-off-by: Hongxu Jia Signed-off-by: Armin Kuster --- meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb | 5 ++++- meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'meta-webserver') 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 S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd +inherit autotools update-rc.d pkgconfig systemd update-alternatives + +ALTERNATIVE_${PN}-doc = "htpasswd.1" +ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" SYSTEMD_SERVICE_${PN} = "apache2.service" 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\d+(\.\d+)+).tar.gz" S = "${WORKDIR}/sthttpd-${PV}" -inherit autotools update-rc.d systemd +inherit autotools update-rc.d systemd update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN}-doc = "htpasswd.1" +ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" SRV_DIR ?= "${servicedir}/www" -- cgit 1.2.3-korg