* [PATCH v2] neard: Update reference commit sha1 and script path
@ 2013-03-07 16:09 Olivier Guiter
2013-03-07 16:24 ` Burton, Ross
0 siblings, 1 reply; 6+ messages in thread
From: Olivier Guiter @ 2013-03-07 16:09 UTC (permalink / raw)
To: openembedded-core
---
meta/recipes-connectivity/neard/neard/neard | 2 +-
meta/recipes-connectivity/neard/neard_0.9.bb | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-connectivity/neard/neard/neard b/meta/recipes-connectivity/neard/neard/neard
index 5f36174..34f47f1 100644
--- a/meta/recipes-connectivity/neard/neard/neard
+++ b/meta/recipes-connectivity/neard/neard/neard
@@ -1,6 +1,6 @@
#!/bin/sh
-DAEMON=/usr/sbin/neard
+DAEMON=/usr/lib/neard/nfc/neard
PIDFILE=/var/run/neard.pid
DESC="Linux NFC daemon"
diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb
index 61ea58c..6dc346a 100644
--- a/meta/recipes-connectivity/neard/neard_0.9.bb
+++ b/meta/recipes-connectivity/neard/neard_0.9.bb
@@ -13,9 +13,11 @@ INITSCRIPT_PARAMS = "defaults 64"
# This would copy neard start-stop shell and test scripts
do_install_append() {
+ # start/stop
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/neard ${D}${sysconfdir}/init.d/neard
+ #test files
install -d ${D}${libdir}/neard
install -m 0755 ${S}/test/* ${D}${libdir}/neard/
install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/neard/
@@ -33,9 +35,9 @@ RRECOMMENDS_${PN} = "\
PACKAGES =+ "${PN}-tests"
FILES_${PN}-tests = "${libdir}/neard/*-test"
-RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
+FILES_${PN}-dbg += "${libdir}/neard/*/.debug"
-FILES_${PN}-dbg += "${bindir}/neard/*/.debug"
+RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
##=============================
# This is valid for 0.9+
@@ -43,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
"
S = "${WORKDIR}/git"
-SRCREV = "7abdb13d106d496e1115fab49e6448a249dfb3c8"
+SRCREV = "1e20e396cb837017b7e5ef822bfdab6ce060d2cf"
PV = "0.9-git${SRCPV}"
PR = "r1"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] neard: Update reference commit sha1 and script path
2013-03-07 16:09 [PATCH v2] neard: Update reference commit sha1 and script path Olivier Guiter
@ 2013-03-07 16:24 ` Burton, Ross
2013-03-08 11:45 ` [PATCH v3] neard:Update reference commit sha1 and install script Olivier Guiter
0 siblings, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2013-03-07 16:24 UTC (permalink / raw)
To: Olivier Guiter; +Cc: openembedded-core
Hi Olivier,
On 7 March 2013 16:09, Olivier Guiter <olivier.guiter@linux.intel.com> wrote:
> -DAEMON=/usr/sbin/neard
> +DAEMON=/usr/lib/neard/nfc/neard
Instead of doing this, have a neard.in that uses some variable
(@libexecdir@, or whatever path you install to) and replace it with
sed. A hard-coded path like this will break is someone changes the
file locations in their distro (which plenty of people do).
Ross
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] neard:Update reference commit sha1 and install script
2013-03-07 16:24 ` Burton, Ross
@ 2013-03-08 11:45 ` Olivier Guiter
2013-03-11 22:48 ` Saul Wold
2013-03-12 7:44 ` [PATCH v3] neard:Update " Koen Kooi
0 siblings, 2 replies; 6+ messages in thread
From: Olivier Guiter @ 2013-03-08 11:45 UTC (permalink / raw)
To: openembedded-core
This patch installs neard daemon in /usr/lib/neard.
---
meta/recipes-connectivity/neard/neard/neard | 42 ------------------------
meta/recipes-connectivity/neard/neard/neard.in | 42 ++++++++++++++++++++++++
meta/recipes-connectivity/neard/neard_0.9.bb | 27 ++++++++++-----
3 files changed, 61 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-connectivity/neard/neard/neard
create mode 100644 meta/recipes-connectivity/neard/neard/neard.in
diff --git a/meta/recipes-connectivity/neard/neard/neard b/meta/recipes-connectivity/neard/neard/neard
deleted file mode 100644
index 5f36174..0000000
--- a/meta/recipes-connectivity/neard/neard/neard
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-DAEMON=/usr/sbin/neard
-PIDFILE=/var/run/neard.pid
-DESC="Linux NFC daemon"
-
-if [ -f /etc/default/neard ] ; then
- . /etc/default/neard
-fi
-
-set -e
-
-do_start() {
- $DAEMON
-}
-
-do_stop() {
- start-stop-daemon --stop --name neard --quiet
-}
-
-case "$1" in
- start)
- echo "Starting $DESC"
- do_start
- ;;
- stop)
- echo "Stopping $DESC"
- do_stop
- ;;
- restart|force-reload)
- echo "Restarting $DESC"
- do_stop
- sleep 1
- do_start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/meta/recipes-connectivity/neard/neard/neard.in b/meta/recipes-connectivity/neard/neard/neard.in
new file mode 100644
index 0000000..38361c8
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/neard.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DAEMON=@installpath@/neard
+PIDFILE=/var/run/neard.pid
+DESC="Linux NFC daemon"
+
+if [ -f /etc/default/neard ] ; then
+ . /etc/default/neard
+fi
+
+set -e
+
+do_start() {
+ $DAEMON
+}
+
+do_stop() {
+ start-stop-daemon --stop --name neard --quiet
+}
+
+case "$1" in
+ start)
+ echo "Starting $DESC"
+ do_start
+ ;;
+ stop)
+ echo "Stopping $DESC"
+ do_stop
+ ;;
+ restart|force-reload)
+ echo "Restarting $DESC"
+ do_stop
+ sleep 1
+ do_start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb
index 61ea58c..afd6597 100644
--- a/meta/recipes-connectivity/neard/neard_0.9.bb
+++ b/meta/recipes-connectivity/neard/neard_0.9.bb
@@ -11,14 +11,25 @@ inherit autotools pkgconfig update-rc.d
INITSCRIPT_NAME = "neard"
INITSCRIPT_PARAMS = "defaults 64"
+do_install() {
+ oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install
+}
+
# This would copy neard start-stop shell and test scripts
do_install_append() {
+
+ # start/stop
install -d ${D}${sysconfdir}/init.d/
- install -m 0755 ${WORKDIR}/neard ${D}${sysconfdir}/init.d/neard
+ sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
+ > ${D}${sysconfdir}/init.d/neard
+
+ chmod 0755 ${D}${sysconfdir}/init.d/neard
+
+ #test files
install -d ${D}${libdir}/neard
- install -m 0755 ${S}/test/* ${D}${libdir}/neard/
- install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/neard/
+ install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
+ install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
}
RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
@@ -32,10 +43,10 @@ RRECOMMENDS_${PN} = "\
#Additional
PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${libdir}/neard/*-test"
-RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
+FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
+FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
-FILES_${PN}-dbg += "${bindir}/neard/*/.debug"
+RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
##=============================
# This is valid for 0.9+
@@ -43,12 +54,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
"
S = "${WORKDIR}/git"
-SRCREV = "7abdb13d106d496e1115fab49e6448a249dfb3c8"
+SRCREV = "1e20e396cb837017b7e5ef822bfdab6ce060d2cf"
PV = "0.9-git${SRCPV}"
PR = "r1"
SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
- file://neard \
+ file://neard.in \
"
EXTRA_OECONF += "--enable-tools \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3] neard:Update reference commit sha1 and install script
2013-03-08 11:45 ` [PATCH v3] neard:Update reference commit sha1 and install script Olivier Guiter
@ 2013-03-11 22:48 ` Saul Wold
2013-03-12 20:33 ` [PATCH v4] neard: Update " Olivier Guiter
2013-03-12 7:44 ` [PATCH v3] neard:Update " Koen Kooi
1 sibling, 1 reply; 6+ messages in thread
From: Saul Wold @ 2013-03-11 22:48 UTC (permalink / raw)
To: Olivier Guiter; +Cc: openembedded-core
On 03/08/2013 03:45 AM, Olivier Guiter wrote:
> This patch installs neard daemon in /usr/lib/neard.
Please add a Signed-off: line
Thanks
Sau!
> ---
> meta/recipes-connectivity/neard/neard/neard | 42 ------------------------
> meta/recipes-connectivity/neard/neard/neard.in | 42 ++++++++++++++++++++++++
> meta/recipes-connectivity/neard/neard_0.9.bb | 27 ++++++++++-----
> 3 files changed, 61 insertions(+), 50 deletions(-)
> delete mode 100644 meta/recipes-connectivity/neard/neard/neard
> create mode 100644 meta/recipes-connectivity/neard/neard/neard.in
>
> diff --git a/meta/recipes-connectivity/neard/neard/neard b/meta/recipes-connectivity/neard/neard/neard
> deleted file mode 100644
> index 5f36174..0000000
> --- a/meta/recipes-connectivity/neard/neard/neard
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -#!/bin/sh
> -
> -DAEMON=/usr/sbin/neard
> -PIDFILE=/var/run/neard.pid
> -DESC="Linux NFC daemon"
> -
> -if [ -f /etc/default/neard ] ; then
> - . /etc/default/neard
> -fi
> -
> -set -e
> -
> -do_start() {
> - $DAEMON
> -}
> -
> -do_stop() {
> - start-stop-daemon --stop --name neard --quiet
> -}
> -
> -case "$1" in
> - start)
> - echo "Starting $DESC"
> - do_start
> - ;;
> - stop)
> - echo "Stopping $DESC"
> - do_stop
> - ;;
> - restart|force-reload)
> - echo "Restarting $DESC"
> - do_stop
> - sleep 1
> - do_start
> - ;;
> - *)
> - echo "Usage: $0 {start|stop|restart|force-reload}" >&2
> - exit 1
> - ;;
> -esac
> -
> -exit 0
> diff --git a/meta/recipes-connectivity/neard/neard/neard.in b/meta/recipes-connectivity/neard/neard/neard.in
> new file mode 100644
> index 0000000..38361c8
> --- /dev/null
> +++ b/meta/recipes-connectivity/neard/neard/neard.in
> @@ -0,0 +1,42 @@
> +#!/bin/sh
> +
> +DAEMON=@installpath@/neard
> +PIDFILE=/var/run/neard.pid
> +DESC="Linux NFC daemon"
> +
> +if [ -f /etc/default/neard ] ; then
> + . /etc/default/neard
> +fi
> +
> +set -e
> +
> +do_start() {
> + $DAEMON
> +}
> +
> +do_stop() {
> + start-stop-daemon --stop --name neard --quiet
> +}
> +
> +case "$1" in
> + start)
> + echo "Starting $DESC"
> + do_start
> + ;;
> + stop)
> + echo "Stopping $DESC"
> + do_stop
> + ;;
> + restart|force-reload)
> + echo "Restarting $DESC"
> + do_stop
> + sleep 1
> + do_start
> + ;;
> + *)
> + echo "Usage: $0 {start|stop|restart|force-reload}" >&2
> + exit 1
> + ;;
> +esac
> +
> +exit 0
> diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb
> index 61ea58c..afd6597 100644
> --- a/meta/recipes-connectivity/neard/neard_0.9.bb
> +++ b/meta/recipes-connectivity/neard/neard_0.9.bb
> @@ -11,14 +11,25 @@ inherit autotools pkgconfig update-rc.d
> INITSCRIPT_NAME = "neard"
> INITSCRIPT_PARAMS = "defaults 64"
>
> +do_install() {
> + oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install
> +}
> +
> # This would copy neard start-stop shell and test scripts
> do_install_append() {
> +
> + # start/stop
> install -d ${D}${sysconfdir}/init.d/
> - install -m 0755 ${WORKDIR}/neard ${D}${sysconfdir}/init.d/neard
>
> + sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
> + > ${D}${sysconfdir}/init.d/neard
> +
> + chmod 0755 ${D}${sysconfdir}/init.d/neard
> +
> + #test files
> install -d ${D}${libdir}/neard
> - install -m 0755 ${S}/test/* ${D}${libdir}/neard/
> - install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/neard/
> + install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
> + install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
> }
>
> RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
> @@ -32,10 +43,10 @@ RRECOMMENDS_${PN} = "\
> #Additional
> PACKAGES =+ "${PN}-tests"
>
> -FILES_${PN}-tests = "${libdir}/neard/*-test"
> -RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
> +FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
> +FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
>
> -FILES_${PN}-dbg += "${bindir}/neard/*/.debug"
> +RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
>
> ##=============================
> # This is valid for 0.9+
> @@ -43,12 +54,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
> "
> S = "${WORKDIR}/git"
> -SRCREV = "7abdb13d106d496e1115fab49e6448a249dfb3c8"
> +SRCREV = "1e20e396cb837017b7e5ef822bfdab6ce060d2cf"
> PV = "0.9-git${SRCPV}"
> PR = "r1"
>
> SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
> - file://neard \
> + file://neard.in \
> "
>
> EXTRA_OECONF += "--enable-tools \
>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v4] neard: Update reference commit sha1 and install script
2013-03-11 22:48 ` Saul Wold
@ 2013-03-12 20:33 ` Olivier Guiter
0 siblings, 0 replies; 6+ messages in thread
From: Olivier Guiter @ 2013-03-12 20:33 UTC (permalink / raw)
To: openembedded-core
This patch installs neard daemon in /usr/lib/neard.
Signed-off-by: Olivier Guiter <olivier.guiter@linux.intel.com>
---
meta/recipes-connectivity/neard/neard/neard | 42 ------------------
meta/recipes-connectivity/neard/neard/neard.in | 54 ++++++++++++++++++++++++
meta/recipes-connectivity/neard/neard_0.9.bb | 32 ++++++++------
3 files changed, 74 insertions(+), 54 deletions(-)
delete mode 100644 meta/recipes-connectivity/neard/neard/neard
create mode 100644 meta/recipes-connectivity/neard/neard/neard.in
diff --git a/meta/recipes-connectivity/neard/neard/neard b/meta/recipes-connectivity/neard/neard/neard
deleted file mode 100644
index 5f36174..0000000
--- a/meta/recipes-connectivity/neard/neard/neard
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-DAEMON=/usr/sbin/neard
-PIDFILE=/var/run/neard.pid
-DESC="Linux NFC daemon"
-
-if [ -f /etc/default/neard ] ; then
- . /etc/default/neard
-fi
-
-set -e
-
-do_start() {
- $DAEMON
-}
-
-do_stop() {
- start-stop-daemon --stop --name neard --quiet
-}
-
-case "$1" in
- start)
- echo "Starting $DESC"
- do_start
- ;;
- stop)
- echo "Stopping $DESC"
- do_stop
- ;;
- restart|force-reload)
- echo "Restarting $DESC"
- do_stop
- sleep 1
- do_start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/meta/recipes-connectivity/neard/neard/neard.in b/meta/recipes-connectivity/neard/neard/neard.in
new file mode 100644
index 0000000..a47d4d9
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/neard.in
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# start/stop neard daemon.
+
+### BEGIN INIT INFO
+# Provides: neard
+# Required-Start: $network
+# Required-Stop: $network
+# Default-Start: S 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: NFC daemon
+# Description: neard is a daemon used to enable NFC features
+### END INIT INFO
+
+DAEMON=@installpath@/neard
+PIDFILE=/var/run/neard.pid
+DESC="Linux NFC daemon"
+
+if [ -f /etc/default/neard ] ; then
+ . /etc/default/neard
+fi
+
+set -e
+
+do_start() {
+ $DAEMON
+}
+
+do_stop() {
+ start-stop-daemon --stop --name neard --quiet
+}
+
+case "$1" in
+ start)
+ echo "Starting $DESC"
+ do_start
+ ;;
+ stop)
+ echo "Stopping $DESC"
+ do_stop
+ ;;
+ restart|force-reload)
+ echo "Restarting $DESC"
+ do_stop
+ sleep 1
+ do_start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb
index 61ea58c..8e33a9d 100644
--- a/meta/recipes-connectivity/neard/neard_0.9.bb
+++ b/meta/recipes-connectivity/neard/neard_0.9.bb
@@ -11,14 +11,24 @@ inherit autotools pkgconfig update-rc.d
INITSCRIPT_NAME = "neard"
INITSCRIPT_PARAMS = "defaults 64"
+do_install() {
+ oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install
+}
+
# This would copy neard start-stop shell and test scripts
do_install_append() {
- install -d ${D}${sysconfdir}/init.d/
- install -m 0755 ${WORKDIR}/neard ${D}${sysconfdir}/init.d/neard
+ # 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
- install -d ${D}${libdir}/neard
- install -m 0755 ${S}/test/* ${D}${libdir}/neard/
- install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/neard/
+ #test files
+ install -d ${D}${libdir}/neard
+ install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
+ install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
}
RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
@@ -32,26 +42,24 @@ RRECOMMENDS_${PN} = "\
#Additional
PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${libdir}/neard/*-test"
-RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
+FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
+FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
-FILES_${PN}-dbg += "${bindir}/neard/*/.debug"
+RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
-##=============================
# This is valid for 0.9+
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
"
S = "${WORKDIR}/git"
-SRCREV = "7abdb13d106d496e1115fab49e6448a249dfb3c8"
+SRCREV = "1e20e396cb837017b7e5ef822bfdab6ce060d2cf"
PV = "0.9-git${SRCPV}"
PR = "r1"
SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
- file://neard \
+ file://neard.in \
"
EXTRA_OECONF += "--enable-tools \
"
-
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3] neard:Update reference commit sha1 and install script
2013-03-08 11:45 ` [PATCH v3] neard:Update reference commit sha1 and install script Olivier Guiter
2013-03-11 22:48 ` Saul Wold
@ 2013-03-12 7:44 ` Koen Kooi
1 sibling, 0 replies; 6+ messages in thread
From: Koen Kooi @ 2013-03-12 7:44 UTC (permalink / raw)
To: Olivier Guiter; +Cc: openembedded-core
Op 8 mrt. 2013, om 12:45 heeft Olivier Guiter <olivier.guiter@linux.intel.com> het volgende geschreven:
> This patch installs neard daemon in /usr/lib/neard.
> ---
> meta/recipes-connectivity/neard/neard/neard | 42 ------------------------
> meta/recipes-connectivity/neard/neard/neard.in | 42 ++++++++++++++++++++++++
> meta/recipes-connectivity/neard/neard_0.9.bb | 27 ++++++++++-----
> 3 files changed, 61 insertions(+), 50 deletions(-)
> delete mode 100644 meta/recipes-connectivity/neard/neard/neard
> create mode 100644 meta/recipes-connectivity/neard/neard/neard.in
>
>
> diff --git a/meta/recipes-connectivity/neard/neard/neard.in b/meta/recipes-connectivity/neard/neard/neard.in
> new file mode 100644
> index 0000000..38361c8
> --- /dev/null
> +++ b/meta/recipes-connectivity/neard/neard/neard.in
> @@ -0,0 +1,42 @@
> +#!/bin/sh
> +
> +DAEMON=@installpath@/neard
> +PIDFILE=/var/run/neard.pid
> +DESC="Linux NFC daemon"
> +
> +if [ -f /etc/default/neard ] ; then
> + . /etc/default/neard
> +fi
> +
> +set -e
> +
> +do_start() {
> + $DAEMON
> +}
> +
> +do_stop() {
> + start-stop-daemon --stop --name neard --quiet
> +}
> +
> +case "$1" in
> + start)
> + echo "Starting $DESC"
> + do_start
> + ;;
> + stop)
> + echo "Stopping $DESC"
> + do_stop
> + ;;
> + restart|force-reload)
> + echo "Restarting $DESC"
> + do_stop
> + sleep 1
> + do_start
> + ;;
> + *)
> + echo "Usage: $0 {start|stop|restart|force-reload}" >&2
> + exit 1
> + ;;
> +esac
> +
> +exit 0
That initscript is missing LSB headers.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-03-12 20:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-07 16:09 [PATCH v2] neard: Update reference commit sha1 and script path Olivier Guiter
2013-03-07 16:24 ` Burton, Ross
2013-03-08 11:45 ` [PATCH v3] neard:Update reference commit sha1 and install script Olivier Guiter
2013-03-11 22:48 ` Saul Wold
2013-03-12 20:33 ` [PATCH v4] neard: Update " Olivier Guiter
2013-03-12 7:44 ` [PATCH v3] neard:Update " Koen Kooi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox