diff options
author | Kai Kang <kai.kang@windriver.com> | 2022-12-04 18:16:03 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2022-12-20 10:44:29 -0500 |
commit | f4b166416f982da54cfb1f9546e89020451ef2b4 (patch) | |
tree | 85102d5d7162a88939f09e87728dc24fd70af405 | |
parent | 0b07e0e16801d2a0963871899fa138cdb902d9bc (diff) | |
download | meta-openembedded-f4b166416f982da54cfb1f9546e89020451ef2b4.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>
(cherry picked from commit b75c138a1cdfacb4a9fba2a291a0d15f0691526b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-networking/recipes-daemons/postfix/postfix.inc | 2 |
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 () { | |||
115 | 'data_directory=${localstatedir}/lib/postfix' \ | 115 | 'data_directory=${localstatedir}/lib/postfix' \ |
116 | -non-interactive | 116 | -non-interactive |
117 | rm -rf ${D}${localstatedir}/spool/postfix | 117 | rm -rf ${D}${localstatedir}/spool/postfix |
118 | mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf | 118 | mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf |
119 | install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ | 119 | install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ |
120 | install -d ${D}${sysconfdir}/init.d | 120 | install -d ${D}${sysconfdir}/init.d |
121 | install -m 644 ${WORKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf | 121 | install -m 644 ${WORKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf |