neard: Update reference commit sha1 and script path
PATCH v2 1/1 neard: Update reference commit sha1 and script path
--- meta/recipes-connectivity/neard/neard/neard | 2 +- meta/recipes-connectivity/neard/neard_0.9.bb | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
meta/recipes-connectivity/neard/neard/neard +1 -1
@@ -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"
meta/recipes-connectivity/neard/neard_0.9.bb +5 -3
@@ -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"
Signature · 1 line
1.7.9.5
Hi Olivier,
meta/recipes-connectivity/neard/neard/neard line 3
Quoted 2 lines · Olivier Guiter
meta/recipes-connectivity/neard/neard/neard +1
-1-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
PATCH v3 1/1 neard:Update reference commit sha1 and install script
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
meta/recipes-connectivity/neard/neard/neard deleted +0 -42
@@ -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
meta/recipes-connectivity/neard/neard/neard.in new file +42 -0
42 lines not on this page · raw message
meta/recipes-connectivity/neard/neard_0.9.bb +19 -8
@@ -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 \
Signature · 1 line
1.7.9.5
Re: [PATCH v3] neard:Update reference commit sha1 and install script
Quoted 1 line · Olivier Guiter
This patch installs neard daemon in
/usr/lib/neard.
Please add a Signed-off: line
Thanks
Sau!
Quoted 167 lines
--- 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
meta/recipes-connectivity/neard/neard/neard deleted +0
-42@@ -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 0meta/recipes-connectivity/neard/neard/neard.in new file +42
-0@@ -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 0meta/recipes-connectivity/neard/neard_0.9.bb +19
-8@@ -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 \
PATCH v4 1/1 neard: Update reference commit sha1 and install script
This patch installs neard daemon in /usr/lib/neard.
--- 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
meta/recipes-connectivity/neard/neard/neard deleted +0 -42
@@ -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
meta/recipes-connectivity/neard/neard/neard.in new file +54 -0
54 lines not on this page · raw message
meta/recipes-connectivity/neard/neard_0.9.bb +20 -12
@@ -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 \ " -
Signature · 1 line
1.7.9.5
Re: [PATCH v3] neard:Update reference commit sha1 and install script
In reply to Olivier GuiterOp 8 mrt. 2013, om 12:45 heeft Olivier Guiter <[email protected]> het volgende geschreven:
Quoted 48 lines
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
meta/recipes-connectivity/neard/neard/neard.in new file +32
-0@@ -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
meta/recipes-connectivity/neard/neard/neard.in line 42
Quoted 10 lines
meta/recipes-connectivity/neard/neard/neard.in new file +10
-0+ sleep 1 + do_start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0
That initscript is missing LSB headers.