Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 1/2] neard: re-order recipe so the statement order is logical
@ 2013-04-29 11:57 Ross Burton
  2013-04-29 11:57 ` [PATCH 2/2] neard: add systemd unit file Ross Burton
  0 siblings, 1 reply; 3+ messages in thread
From: Ross Burton @ 2013-04-29 11:57 UTC (permalink / raw)
  To: openembedded-core


Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/neard/neard_0.9.bb |   54 ++++++++++++--------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb
index d598666..2c4acb3 100644
--- a/meta/recipes-connectivity/neard/neard_0.9.bb
+++ b/meta/recipes-connectivity/neard/neard_0.9.bb
@@ -1,15 +1,26 @@
-SUMMARY  = "Linux NFC daemon"
+SUMMARY = "Linux NFC daemon"
 DESCRIPTION = "A daemon for the Linux Near Field Communication stack"
 HOMEPAGE = "http://01.org/linux-nfc"
+LICENSE = "GPLv2"
 
-LICENSE  = "GPLv2"
+DEPENDS = "dbus glib-2.0 libnl"
 
-DEPENDS  = "dbus glib-2.0 libnl"
+SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
+           file://neard.in \
+          "
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
+ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
+ "
+
+S = "${WORKDIR}/git"
+SRCREV = "eb486bf35e24d7d1db61350f5ab393a0c880523d"
+PV = "0.10+git${SRCPV}"
+PR = "r0"
 
 inherit autotools pkgconfig update-rc.d
 
-INITSCRIPT_NAME = "neard"
-INITSCRIPT_PARAMS = "defaults 64"
+EXTRA_OECONF += "--enable-tools"
 
 do_install() {
 	oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install
@@ -31,35 +42,20 @@ do_install_append() {
 	install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
 }
 
-RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
-
-# Bluez & Wifi are not mandatory except for handover	"
-RRECOMMENDS_${PN} = "\
-	${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
-	${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
-	"
-
-#Additional
 PACKAGES =+ "${PN}-tests"
 
 FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
 FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
 
-RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
-
-# This is valid for 0.10+
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
- file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
- "
-S	= "${WORKDIR}/git"
-SRCREV	= "eb486bf35e24d7d1db61350f5ab393a0c880523d"
-PV	= "0.10+git${SRCPV}"
-PR	= "r0"
+RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
 
-SRC_URI  = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
-	file://neard.in \
-	"
+# Bluez & Wifi are not mandatory except for handover
+RRECOMMENDS_${PN} = "\
+                     ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
+                     ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
+                    "
 
-EXTRA_OECONF += "--enable-tools \
-	"
+RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
 
+INITSCRIPT_NAME = "neard"
+INITSCRIPT_PARAMS = "defaults 64"
-- 
1.7.10.4




^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 2/2] neard: add systemd unit file
  2013-04-29 11:57 [PATCH 1/2] neard: re-order recipe so the statement order is logical Ross Burton
@ 2013-04-29 11:57 ` Ross Burton
  2013-04-29 13:42   ` Martin Jansa
  0 siblings, 1 reply; 3+ messages in thread
From: Ross Burton @ 2013-04-29 11:57 UTC (permalink / raw)
  To: openembedded-core

Add a systemd unit file, and respect the sysvinit feature when installing the
init script.

(thanks to Jukka Rissanen for the unit file)

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../neard/neard/neard.service.in                   |   13 +++++++++
 meta/recipes-connectivity/neard/neard_0.9.bb       |   28 +++++++++++++-------
 2 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 meta/recipes-connectivity/neard/neard/neard.service.in

diff --git a/meta/recipes-connectivity/neard/neard/neard.service.in b/meta/recipes-connectivity/neard/neard/neard.service.in
new file mode 100644
index 0000000..90e5302
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/neard.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=NFC service
+After=syslog.target
+
+[Service]
+Type=dbus
+BusName=org.neard
+Restart=on-failure
+ExecStart=@installpath@/neard -n
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb
index 2c4acb3..1442d00 100644
--- a/meta/recipes-connectivity/neard/neard_0.9.bb
+++ b/meta/recipes-connectivity/neard/neard_0.9.bb
@@ -7,6 +7,7 @@ DEPENDS = "dbus glib-2.0 libnl"
 
 SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
            file://neard.in \
+	file://neard.service.in \
           "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
@@ -18,7 +19,7 @@ SRCREV = "eb486bf35e24d7d1db61350f5ab393a0c880523d"
 PV = "0.10+git${SRCPV}"
 PR = "r0"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools pkgconfig systemd update-rc.d
 
 EXTRA_OECONF += "--enable-tools"
 
@@ -28,15 +29,20 @@ do_install() {
 
 # This would copy neard start-stop shell and test scripts
 do_install_append() {
-	# start/stop
-	install -d ${D}${sysconfdir}/init.d/
-
-	sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
-		> ${D}${sysconfdir}/init.d/neard
-
-	chmod 0755 ${D}${sysconfdir}/init.d/neard
-
-	#test files
+	if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+		install -d ${D}${sysconfdir}/init.d/
+		sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
+		  > ${D}${sysconfdir}/init.d/neard
+		chmod 0755 ${D}${sysconfdir}/init.d/neard
+	fi
+
+	if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+		install -d ${D}${systemd_unitdir}/system
+		sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \
+		  > ${D}${systemd_unitdir}/system/neard.service
+	fi
+
+	# Install the tests for neard-tests
 	install -d ${D}${libdir}/neard
 	install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
 	install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
@@ -59,3 +65,5 @@ RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
 
 INITSCRIPT_NAME = "neard"
 INITSCRIPT_PARAMS = "defaults 64"
+
+SYSTEMD_SERVICE_${PN} = "neard.service"
-- 
1.7.10.4




^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] neard: add systemd unit file
  2013-04-29 11:57 ` [PATCH 2/2] neard: add systemd unit file Ross Burton
@ 2013-04-29 13:42   ` Martin Jansa
  0 siblings, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2013-04-29 13:42 UTC (permalink / raw)
  To: Ross Burton; +Cc: openembedded-core

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

On Mon, Apr 29, 2013 at 12:57:15PM +0100, Ross Burton wrote:
> Add a systemd unit file, and respect the sysvinit feature when installing the
> init script.
> 
> (thanks to Jukka Rissanen for the unit file)
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  .../neard/neard/neard.service.in                   |   13 +++++++++
>  meta/recipes-connectivity/neard/neard_0.9.bb       |   28 +++++++++++++-------
>  2 files changed, 31 insertions(+), 10 deletions(-)
>  create mode 100644 meta/recipes-connectivity/neard/neard/neard.service.in
> 
> diff --git a/meta/recipes-connectivity/neard/neard/neard.service.in b/meta/recipes-connectivity/neard/neard/neard.service.in
> new file mode 100644
> index 0000000..90e5302
> --- /dev/null
> +++ b/meta/recipes-connectivity/neard/neard/neard.service.in
> @@ -0,0 +1,13 @@
> +[Unit]
> +Description=NFC service
> +After=syslog.target
> +
> +[Service]
> +Type=dbus
> +BusName=org.neard
> +Restart=on-failure
> +ExecStart=@installpath@/neard -n
> +StandardOutput=null
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb
> index 2c4acb3..1442d00 100644
> --- a/meta/recipes-connectivity/neard/neard_0.9.bb
> +++ b/meta/recipes-connectivity/neard/neard_0.9.bb
> @@ -7,6 +7,7 @@ DEPENDS = "dbus glib-2.0 libnl"
>  
>  SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
>             file://neard.in \
> +	file://neard.service.in \

Please use consistent indentation - no tabs in multiline variables.

>            "
>  
>  LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> @@ -18,7 +19,7 @@ SRCREV = "eb486bf35e24d7d1db61350f5ab393a0c880523d"
>  PV = "0.10+git${SRCPV}"
>  PR = "r0"
>  
> -inherit autotools pkgconfig update-rc.d
> +inherit autotools pkgconfig systemd update-rc.d
>  
>  EXTRA_OECONF += "--enable-tools"
>  
> @@ -28,15 +29,20 @@ do_install() {
>  
>  # This would copy neard start-stop shell and test scripts
>  do_install_append() {
> -	# start/stop
> -	install -d ${D}${sysconfdir}/init.d/
> -
> -	sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
> -		> ${D}${sysconfdir}/init.d/neard
> -
> -	chmod 0755 ${D}${sysconfdir}/init.d/neard
> -
> -	#test files
> +	if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
> +		install -d ${D}${sysconfdir}/init.d/
> +		sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
> +		  > ${D}${sysconfdir}/init.d/neard
> +		chmod 0755 ${D}${sysconfdir}/init.d/neard
> +	fi
> +
> +	if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
> +		install -d ${D}${systemd_unitdir}/system
> +		sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \
> +		  > ${D}${systemd_unitdir}/system/neard.service
> +	fi
> +
> +	# Install the tests for neard-tests
>  	install -d ${D}${libdir}/neard
>  	install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
>  	install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
> @@ -59,3 +65,5 @@ RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
>  
>  INITSCRIPT_NAME = "neard"
>  INITSCRIPT_PARAMS = "defaults 64"
> +
> +SYSTEMD_SERVICE_${PN} = "neard.service"
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-29 14:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-29 11:57 [PATCH 1/2] neard: re-order recipe so the statement order is logical Ross Burton
2013-04-29 11:57 ` [PATCH 2/2] neard: add systemd unit file Ross Burton
2013-04-29 13:42   ` Martin Jansa

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox