aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2022-12-04 18:16:03 +0800
committerKhem Raj <raj.khem@gmail.com>2022-12-05 18:02:40 -0800
commitb75c138a1cdfacb4a9fba2a291a0d15f0691526b (patch)
tree0a736993aeed902c337560026bca2537079d01c9
parentabc501113aa7e136963c1bbab9b202d425014dbf (diff)
downloadmeta-openembedded-b75c138a1cdfacb4a9fba2a291a0d15f0691526b.tar.gz
postfix: fix multilib conflict of sample-main.cf
It fails to install postfix and lib32-postfix at same time: | Error: Transaction test error: | file /etc/postfix/sample-main.cf conflicts between attempted installs of lib32-postfix-cfg-3.7.3-r0.i586 and postfix-cfg-3.7.3-r0.core2_64 Rename sample-main.cf with ${MLPREFIX}. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-daemons/postfix/postfix.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index 8a4428c504..5133caaa46 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -115,7 +115,7 @@ do_install () {
'data_directory=${localstatedir}/lib/postfix' \
-non-interactive
rm -rf ${D}${localstatedir}/spool/postfix
- mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf
+ mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf
install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/
install -d ${D}${sysconfdir}/init.d
install -m 644 ${WORKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf