[oe-commits] Kang Kai : postfix: update daemon_directory in main.cf_2.0

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: b7d706885adf9eddfe222a4e8270d40d9edeef75
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b7d706885adf9eddfe222a4e8270d40d9edeef75

Author: Kang Kai <kai.kang at windriver.com>
Date:   Thu Jun 25 13:53:57 2015 +0800

postfix: update daemon_directory in main.cf_2.0

daemon_directory is set to /usr/lib/postfix which causes daemon postfix
fails to start on 64 bits target if enable multilib. Set daemon_directory
with libexecdir to fix it.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-networking/recipes-daemons/postfix/files/main.cf_2.0 | 2 +-
 meta-networking/recipes-daemons/postfix/postfix.inc       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/postfix/files/main.cf_2.0 b/meta-networking/recipes-daemons/postfix/files/main.cf_2.0
index 9e1077f..dc7feb5 100644
--- a/meta-networking/recipes-daemons/postfix/files/main.cf_2.0
+++ b/meta-networking/recipes-daemons/postfix/files/main.cf_2.0
@@ -30,7 +30,7 @@ queue_directory = /var/spool/postfix
 mail_spool_directory = /var/spool/mail
 readme_directory = no
 command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
+daemon_directory = @LIBEXECDIR@
 mail_owner = postfix
 setgid_group = postdrop
 unknown_local_recipient_reject_code = 450
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index 72bc936..fa75a78 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -142,6 +142,8 @@ do_install () {
     mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf
     install -d ${D}${sysconfdir}/init.d
     install -m 644 ${WORKDIR}/main.cf_2.0 ${D}${sysconfdir}/postfix/main.cf
+    sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf
+
     install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
     install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient