aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDai Caiyun <daicy.fnst@cn.fujitsu.com>2016-02-28 10:24:03 +0300
committerArmin Kuster <akuster808@gmail.com>2016-08-16 10:29:39 -0700
commitb902745e10ecc1f7f4d2d80938540c3366b8e92f (patch)
tree93d4a44214730f599dd1d08fd8fe0a21c4765f7d
parent1b9b34df352210ec948127d66dd2c9e069d82f71 (diff)
downloadmeta-openembedded-contrib-b902745e10ecc1f7f4d2d80938540c3366b8e92f.tar.gz
meta-openembedded-contrib-b902745e10ecc1f7f4d2d80938540c3366b8e92f.tar.bz2
meta-openembedded-contrib-b902745e10ecc1f7f4d2d80938540c3366b8e92f.zip
esmtp: Fix rootfs creation errors
1) error: file /usr/share/man/man1/mailq.1 from install of postfix-doc conflicts with file from package esmtp-doc 2) error: file /usr/share/man/man1/newaliases.1 from install of postfix-doc conflicts with file from package esmtp-doc 3) error: file /usr/share/man/man1/sendmail.1 from install of postfix-doc conflicts with file from package esmtp-doc Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> (cherry picked from commit a2256bb3bd2abe89c9ecfbdf2b9690aaf7540342) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-support/esmtp/esmtp_1.2.bb5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
index 163148cee3..2da73e7756 100644
--- a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
+++ b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
@@ -24,6 +24,11 @@ ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail"
ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp"
ALTERNATIVE_PRIORITY = "10"
+ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1"
+ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1"
+ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1"
+ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1"
+
SRC_URI[md5sum] = "79a9c1f9023d53f35bb82bf446150a72"
SRC_URI[sha256sum] = "a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce"