diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-05-16 11:22:13 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-05-17 08:31:12 -0700 |
commit | 3c31d1480e3f481a67d373abcd153307a923b99f (patch) | |
tree | ad81414d13b9c2af1ed6c4ce2550f9f6e8817253 /meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb | |
parent | 556b9edf97d092d04c1d05b4f2bb28506d800fb4 (diff) | |
download | meta-openembedded-contrib-3c31d1480e3f481a67d373abcd153307a923b99f.tar.gz |
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 <hongxu.jia@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb | 5 |
1 files changed, 4 insertions, 1 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 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" |