[meta-networking][PATCH v2 0/2] postfix: some modifies

[meta-networking][PATCH v2 0/2] postfix: some modifies

[Bian Naimeng]

Bian Naimeng (2):
  postfix: don't hard-code PATH in service file
  postfix: fix bug of main.cf_2.0

 meta-networking/recipes-daemons/postfix/files/main.cf_2.0     |  2 +-
 meta-networking/recipes-daemons/postfix/files/postfix.service | 10 +++++-----
 meta-networking/recipes-daemons/postfix/postfix.inc           |  4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

-- 
1.9.1

[meta-networking][PATCH v2 1/2] postfix: don't hard-code PATH in service file

[Bian Naimeng]

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
---
 meta-networking/recipes-daemons/postfix/files/postfix.service | 10 +++++-----
 meta-networking/recipes-daemons/postfix/postfix.inc           |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/meta-networking/recipes-daemons/postfix/files/postfix.service b/meta-networking/recipes-daemons/postfix/files/postfix.service
index c781038..02ea640 100644
--- a/meta-networking/recipes-daemons/postfix/files/postfix.service
+++ b/meta-networking/recipes-daemons/postfix/files/postfix.service
@@ -5,11 +5,11 @@ Conflicts=sendmail.service exim.service
 
 [Service]
 Type=forking
-PIDFile=/var/spool/postfix/pid/master.pid
-ExecStartPre=-/usr/libexec/postfix/aliasesdb
-ExecStart=/usr/sbin/postfix start
-ExecReload=/usr/sbin/postfix reload
-ExecStop=/usr/sbin/postfix stop
+PIDFile=@LOCALSTATEDIR@/spool/postfix/pid/master.pid
+ExecStartPre=-@LIBEXECDIR@/aliasesdb
+ExecStart=@SBINDIR@/postfix start
+ExecReload=@SBINDIR@/postfix reload
+ExecStop=@SBINDIR@/postfix stop
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index e73f2f0..a6909e9 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -147,7 +147,9 @@ do_install () {
 
     install -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/postfix.service ${D}${systemd_unitdir}/system
-    sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/postfix.service
+    sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service
+    sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service
+    sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service
 
     install -m 0755 ${WORKDIR}/aliasesdb ${D}${libexecdir}
 
-- 
1.9.1

[meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0

[Bian Naimeng]

 ${exec_prefix}/libexec/${PN} => ${libexecdir}

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
---
 meta-networking/recipes-daemons/postfix/files/main.cf_2.0 | 2 +-
 1 file changed, 1 insertion(+), 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 bb31451..9e1077f 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/libexec/postfix
+daemon_directory = /usr/lib/postfix
 mail_owner = postfix
 setgid_group = postdrop
 unknown_local_recipient_reject_code = 450
-- 
1.9.1

Re: [meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]

Hi Bian,

I merged the other postfix change, but this one I'm less sure about.  Is
this actually incorrect?  The standard place to install postfix is in
/usr/libexec and that seems to be where we install it as well.

-J.

[[oe] [meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0] On 15.02.16 (Mon 15:52) Bian Naimeng wrote:

>  ${exec_prefix}/libexec/${PN} => ${libexecdir}
> 
> Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
> ---
>  meta-networking/recipes-daemons/postfix/files/main.cf_2.0 | 2 +-
>  1 file changed, 1 insertion(+), 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 bb31451..9e1077f 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/libexec/postfix
> +daemon_directory = /usr/lib/postfix
>  mail_owner = postfix
>  setgid_group = postdrop
>  unknown_local_recipient_reject_code = 450
> -- 
> 1.9.1
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]

Re: [meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1625 bytes --]

[Re: [oe] [meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0] On 15.02.23 (Mon 14:13) Joe MacDonald wrote:

> Hi Bian,
> 
> I merged the other postfix change, but this one I'm less sure about.  Is
> this actually incorrect?  The standard place to install postfix is in
> /usr/libexec and that seems to be where we install it as well.

Okay, I've just confirmed that this is the current location after all,
I'll merge this as well.  Thanks.

-J.

> 
> -J.
> 
> [[oe] [meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0] On 15.02.16 (Mon 15:52) Bian Naimeng wrote:
> 
> >  ${exec_prefix}/libexec/${PN} => ${libexecdir}
> > 
> > Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
> > ---
> >  meta-networking/recipes-daemons/postfix/files/main.cf_2.0 | 2 +-
> >  1 file changed, 1 insertion(+), 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 bb31451..9e1077f 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/libexec/postfix
> > +daemon_directory = /usr/lib/postfix
> >  mail_owner = postfix
> >  setgid_group = postdrop
> >  unknown_local_recipient_reject_code = 450
> > -- 
> > 1.9.1
> > 
> -- 
> -Joe MacDonald.
> :wq



-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]

Re: [meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0

[Bian, Naimeng]

Hi Joe,

Sorry for my late reply (The last week was Chinese New Year ^_^).
And thanks for your confirmation.

Thanks
 Bian

> -----Original Message-----
> From: Joe MacDonald [mailto:Joe_MacDonald@mentor.com]
> Sent: Tuesday, February 24, 2015 3:30 AM
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-networking][PATCH v2 2/2] postfix: fix bug of
> main.cf_2.0
> 
> [Re: [oe] [meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0] On
> 15.02.23 (Mon 14:13) Joe MacDonald wrote:
> 
> > Hi Bian,
> >
> > I merged the other postfix change, but this one I'm less sure about.
> > Is this actually incorrect?  The standard place to install postfix is
> > in /usr/libexec and that seems to be where we install it as well.
> 
> Okay, I've just confirmed that this is the current location after all, I'll
> merge this as well.  Thanks.
> 
> -J.
> 
> >
> > -J.
> >
> > [[oe] [meta-networking][PATCH v2 2/2] postfix: fix bug of main.cf_2.0] On
> 15.02.16 (Mon 15:52) Bian Naimeng wrote:
> >
> > >  ${exec_prefix}/libexec/${PN} => ${libexecdir}
> > >
> > > Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
> > > ---
> > >  meta-networking/recipes-daemons/postfix/files/main.cf_2.0 | 2 +-
> > >  1 file changed, 1 insertion(+), 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 bb31451..9e1077f 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/libexec/postfix
> > > +daemon_directory = /usr/lib/postfix
> > >  mail_owner = postfix
> > >  setgid_group = postdrop
> > >  unknown_local_recipient_reject_code = 450
> > > --
> > > 1.9.1
> > >
> > --
> > -Joe MacDonald.
> > :wq
> 
> 
> 
> --
> -Joe MacDonald.
> :wq