[oe-commits] [meta-openembedded] 20/60: postfix: Fix rootfs creation errors

[git at git.openembedded.org]

martin_jansa pushed a commit to branch krogoth-next
in repository meta-openembedded.

commit 1b9b34df352210ec948127d66dd2c9e069d82f71
Author: Dai Caiyun <daicy.fnst at cn.fujitsu.com>
AuthorDate: Sun Feb 28 10:23:03 2016 +0300

    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 at cn.fujitsu.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
    (cherry picked from commit 7832c673504415cf78a910263c23dda8ec9b982d)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-networking/recipes-daemons/postfix/postfix.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index 17dbf76..e9f3c74 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.