From 1b9b34df352210ec948127d66dd2c9e069d82f71 Mon Sep 17 00:00:00 2001 From: Dai Caiyun Date: Sun, 28 Feb 2016 10:23:03 +0300 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald (cherry picked from commit 7832c673504415cf78a910263c23dda8ec9b982d) Signed-off-by: Armin Kuster --- 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 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 -- cgit 1.2.3-korg