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/sthttpd/sthttpd_2.27.1.bb | |
| parent | 556b9edf97d092d04c1d05b4f2bb28506d800fb4 (diff) | |
| download | meta-openembedded-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/sthttpd/sthttpd_2.27.1.bb')
| -rw-r--r-- | meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 6 |
1 files changed, 5 insertions, 1 deletions
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 | ||