aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDai Caiyun <daicy.fnst@cn.fujitsu.com>2016-02-28 10:23:03 +0300
committerArmin Kuster <akuster808@gmail.com>2016-08-16 10:29:39 -0700
commit1b9b34df352210ec948127d66dd2c9e069d82f71 (patch)
tree2b25d0ba82159ef284acc81e9cdbd6b1156c2293
parent4ee1c29420952a7c9fed847946b923eba35880b2 (diff)
downloadmeta-openembedded-contrib-1b9b34df352210ec948127d66dd2c9e069d82f71.tar.gz
meta-openembedded-contrib-1b9b34df352210ec948127d66dd2c9e069d82f71.tar.bz2
meta-openembedded-contrib-1b9b34df352210ec948127d66dd2c9e069d82f71.zip
postfix: 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 7832c673504415cf78a910263c23dda8ec9b982d) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-daemons/postfix/postfix.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index 17dbf76ceb..e9f3c74cac 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -224,6 +224,11 @@ ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix"
ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail"
ALTERNATIVE_PRIORITY = "120"
+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"
+
pkg_postinst_${PN} () {
if [ "x$D" = "x" ]; then
touch /etc/aliases