From f4b166416f982da54cfb1f9546e89020451ef2b4 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sun, 4 Dec 2022 18:16:03 +0800 Subject: 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 Signed-off-by: Khem Raj (cherry picked from commit b75c138a1cdfacb4a9fba2a291a0d15f0691526b) Signed-off-by: Armin Kuster --- meta-networking/recipes-daemons/postfix/postfix.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-networking') 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 -- cgit v1.2.3-54-g00ecf