[oe] [oe-commits] Bian Naimeng : ipsec-tools: add systemd supported

[Bian, Naimeng]

> -----Original Message-----
> From: Martin Jansa [mailto:martin.jansa at gmail.com]
> Sent: Wednesday, April 08, 2015 8:51 PM
> Cc: openembedded-commits at lists.openembedded.org
> Subject: Re: [oe-commits] Bian Naimeng : ipsec-tools: add systemd supported
> 
> On Mon, Feb 23, 2015 at 07:03:17PM +0000, git at git.openembedded.org wrote:
> > Module: meta-openembedded.git
> > Branch: master
> > Commit: 1eb5a644459f16219410ee53f47b7d2d082e17a1
> > URL:
> http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=1eb5a64445
> 9f16219410ee53f47b7d2d082e17a1
> >
> > Author: Bian Naimeng <biannm at cn.fujitsu.com>
> > Date:   Mon Feb 16 11:14:35 2015 +0800
> >
> > ipsec-tools: add systemd supported
> >
> > Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
> > Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> > Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
> >
> > ---
> >
> >  .../recipes-support/ipsec-tools/ipsec-tools/racoon.conf   |  8 ++++++++
> >  .../ipsec-tools/ipsec-tools/racoon.service                | 11
> +++++++++++
> >  .../recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb      | 15
> ++++++++++++++-
> >  3 files changed, 33 insertions(+), 1 deletion(-)
> >
> > diff --git
> > a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf
> > b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf
> > new file mode 100644
> > index 0000000..6b50750
> > --- /dev/null
> > +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.c
> > +++ onf
> > @@ -0,0 +1,8 @@
> > +# Defaults for racoon service
> > +# sourced by racoon.service
> > +# installed at /etc/default/racoon by the maintainer scripts # # This
> > +is a POSIX shell fragment # # Arguments to pass to racoon
> > +RACOON_ARGS=""
> > diff --git
> > a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.servi
> > ce
> > b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.servi
> > ce
> > new file mode 100644
> > index 0000000..a10e770
> > --- /dev/null
> > +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.s
> > +++ ervice
> > @@ -0,0 +1,11 @@
> > +[Unit]
> > +Description=Racoon IKEv1 key management daemon for IPSEC
> > +After=syslog.target network.target
> > +
> > +[Service]
> > +Type=forking
> > +EnvironmentFile=- at SYSCONFDIR@/default/racoon
> > +ExecStart=@SBINDIR@/racoon $RACOON_ARGS
> > +
> > +[Install]
> > +WantedBy=multi-user.target
> > diff --git
> > a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
> > b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
> > index 7519d83..9704b13 100644
> > --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
> > +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
> > @@ -16,11 +16,13 @@ SRC_URI =
> "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV
> >             file://glibc-2.20.patch \
> >
> file://racoon-Resend-UPDATE-message-when-received-EINTR-message.patch \
> >             file://racoon.conf.sample \
> > +           file://racoon.conf \
> > +           file://racoon.service \
> >            "
> >  SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41"
> >  SRC_URI[sha256sum] =
> "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d"
> >
> > -inherit autotools
> > +inherit autotools systemd
> 
> SYSTEMD_SERVICE variable isn't set, so this racoon isn't enabled and packaged,
> how was this change tested?
> 
> Also causes QA warning:
> ipsec-tools-0.8.2: ipsec-tools: Files/directories were installed but not
> shipped
>   /lib
>   /lib/systemd
>   /lib/systemd/system
>   /lib/systemd/system/racoon.service [installed-vs-shipped]
> 

Sorry for that. I will send a patch to fix this.

Thanks
 Bian

> >  # Options:
> >  #  --enable-adminport      enable admin port
> > @@ -68,4 +70,15 @@ PACKAGECONFIG[selinux] =
> > "--enable-security-context,--disable-security-context,l
> >  do_install_append() {
> >      install -d ${D}${sysconfdir}/racoon
> >      install -m 0644 ${WORKDIR}/racoon.conf.sample
> > ${D}${sysconfdir}/racoon/racoon.conf
> > +
> > +    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
> d)}; then
> > +        install -d ${D}${systemd_unitdir}/system
> > +        install -m 0644 ${WORKDIR}/racoon.service
> > + ${D}${systemd_unitdir}/system
> > +
> > +        sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g'
> ${D}${systemd_unitdir}/system/racoon.service
> > +        sed -i -e 's#@SBINDIR@#${sbindir}#g'
> > + ${D}${systemd_unitdir}/system/racoon.service
> > +
> > +        install -d ${D}${sysconfdir}/default/
> > +        install -m 0644 ${WORKDIR}/racoon.conf
> ${D}${sysconfdir}/default/racoon
> > +    fi
> >  }
> >
> > --
> > _______________________________________________
> > Openembedded-commits mailing list
> > Openembedded-commits at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-commits
> 
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com