V4 [PATCH 0/4] Add meta-skeleton and a skeleton for init scripts
Changes of V4:
* Fix the indent in ${sysconfdir}/init.d/functions
* Fix the coding style in skeleton_test.c
Thanks for Darren's detailed review, and he is happy now.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: robert/init_scripts
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/init_scripts
Thanks,
Robert Yang <[email protected]>
---
Robert Yang (4):
Add the layer meta-skeleton
Cleanup the whitespace in functions
Add pidofproc to ${sysconfdir}/init.d/functions
Add a skeleton for init scripts
meta-skeleton/conf/layer.conf | 10 + .../recipes-skeleton/service/service/COPYRIGHT | 15 ++ .../recipes-skeleton/service/service/skeleton | 193 ++++++++++++++++++++ .../service/service/skeleton_test.c | 12 ++ .../recipes-skeleton/service/service_0.1.bb | 32 ++++ .../initscripts/initscripts-1.0/functions | 39 ++++- 6 files changed, 296 insertions(+), 5 deletions(-) create mode 100644 meta-skeleton/conf/layer.conf create mode 100644 meta-skeleton/recipes-skeleton/service/service/COPYRIGHT create mode 100644 meta-skeleton/recipes-skeleton/service/service/skeleton create mode 100644 meta-skeleton/recipes-skeleton/service/service/skeleton_test.c create mode 100644 meta-skeleton/recipes-skeleton/service/service_0.1.bb
V4 [PATCH 1/4] Add the layer meta-skeleton
Add the layer meta-skeleton, it will be used to place the various canonical examples.
--- meta-skeleton/conf/layer.conf | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) create mode 100644 meta-skeleton/conf/layer.conf
meta-skeleton/conf/layer.conf new file +10 -0
@@ -0,0 +1,10 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH := "${BBPATH}:${LAYERDIR}" + +# We have a packages directory, add to BBFILES +BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb" + +BBFILE_COLLECTIONS += "skeleton" +BBFILE_PATTERN_skeleton := "^${LAYERDIR}/" +BBFILE_PRIORITY_skeleton = "1" +
Signature · 1 line
1.7.1
V4 [PATCH 2/4] Cleanup the whitespace in functions
In reply to Robert YangCleanup the whitespace in functions, replace the 4 whitespaces indent with tab.
--- .../initscripts/initscripts-1.0/functions | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
meta/recipes-core/initscripts/initscripts-1.0/functions +6 -5
@@ -4,11 +4,12 @@ # shell scripts in the /etc/init.d directory. # -machine_id() { # return the machine ID - awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo +machine_id() { # return the machine ID + awk 'BEGIN { FS=": " } /Hardware/ \ + { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo } -killproc() { # kill the named process(es) - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid +killproc() { # kill the named process(es) + pid=`/bin/pidof $1` + [ "$pid" != "" ] && kill $pid }
Signature · 1 line
1.7.1
V4 [PATCH 3/4] Add pidofproc to ${sysconfdir}/init.d/functions
In reply to Robert YangAdd pidofproc to ${sysconfdir}/init.d/functions, this is used for getting the pid of the process. It uses pidof to implement currently, it may also use the pidfile or ps to implement in the future.
--- .../initscripts/initscripts-1.0/functions | 32 ++++++++++++++++++- 1 files changed, 30 insertions(+), 2 deletions(-)
meta/recipes-core/initscripts/initscripts-1.0/functions +30 -2
@@ -3,6 +3,35 @@ # functions This file contains functions to be used by most or all # shell scripts in the /etc/init.d directory. # +# NOTE: The pidofproc () doesn't support the process which is a script unless +# the pidof supports "-x" option. If you want to use it for such a +# process: +# 1) If there is no "pidof -x", replace the "pidof $1" with another +# command like(for core-image-minimal): +# ps | awk '/'"$1"'/ {print $1}' +# Or +# 2) If there is "pidof -x", replace "pidof" with "pidof -x". +# +# pidofproc - print the pid of a process +# $1: the name of the process +pidofproc () { + + # pidof output null when no program is running, so no "2>/dev/null". + pid=`pidof $1` + case $? in + 0) + echo $pid + return 0 + ;; + 127) + echo "ERROR: command pidof not found" >&2 + exit 127 + ;; + *) + return $? + ;; + esac +} machine_id() { # return the machine ID awk 'BEGIN { FS=": " } /Hardware/ \
@@ -10,6 +39,5 @@ machine_id() { # return the machine ID } killproc() { # kill the named process(es) - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid + pid=`pidofproc $1` && kill $pid }
Signature · 1 line
1.7.1
V4 [PATCH 4/4] Add a skeleton for init scripts
In reply to Robert YangAdd a skeleton for init scripts, the original structure is from /etc/init.d/skeleton of Ubuntu 10.10, it is in sysvinit_2.87dsf, so add the COPYRIGHT(GPLv2) of sysvinit_2.87dsf. Modified the original skeleton a lot to make it as easy as possible, just use posix shell command, and have tested it with core-image-minimal.
* The skeleton implements the following actions:
- start, stop, restart, status, try-restart and force-reload.
# force-reload is a alias of try-restart.
- not implements reload, since only a few programs have it, just leave it as placeholder.
* Add /usr/sbin/skeleton-test to test /etc/init.d/skeleton
* The /etc/init.d/skeleton can be run and output the example messages:
1) #./skeleton start (test start)
Starting skeleton ...
2) #./skeleton start (test start again when running) skeleton already running (1078).
3) #./skeleton status (test status when running)
skeleton is running (1078).
4) #./skeleton stop (test stop)
Stopped skeleton (1078).
5) #./skeleton stop (test stop again)
skeleton is not running; none killed.
6) #./skeleton status (test status when stopped) skeleton is not running.
7) #./skeleton restart (test restart when running) Stopped skeleton (1128).
Starting skeleton ...
8) #./skeleton restart (test restart when stopped) skeleton is not running; none killed. Starting skeleton ...
9) try-restart (or force-reload) means restart the service if the service is already running
#./skeleton try-restart (test try-restart when stopped) skeleton is not running; none killed.
#./skeleton try-restart (test try-restart when running)
Stopped skeleton (1181).
Starting skeleton ...
* Have used syslogd to test it in a real world(with both core-image-minimal and core-image-sato)
--- .../recipes-skeleton/service/service/COPYRIGHT | 15 ++ .../recipes-skeleton/service/service/skeleton | 193 ++++++++++++++++++++ .../service/service/skeleton_test.c | 12 ++ .../recipes-skeleton/service/service_0.1.bb | 32 ++++ 4 files changed, 252 insertions(+), 0 deletions(-) create mode 100644 meta-skeleton/recipes-skeleton/service/service/COPYRIGHT create mode 100644 meta-skeleton/recipes-skeleton/service/service/skeleton create mode 100644 meta-skeleton/recipes-skeleton/service/service/skeleton_test.c create mode 100644 meta-skeleton/recipes-skeleton/service/service_0.1.bb
meta-skeleton/recipes-skeleton/service/service/COPYRIGHT new file +15 -0
@@ -0,0 +1,15 @@ +Sysvinit is Copyright (C) 1991-2004 Miquel van Smoorenburg + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
meta-skeleton/recipes-skeleton/service/service/skeleton new file +193 -0
193 lines not on this page · raw message
meta-skeleton/recipes-skeleton/service/service/skeleton_test.c new file +12 -0
@@ -0,0 +1,12 @@ +#include <unistd.h> + +/* This demo does nothing except for testing /etc/init.d/skeleton */ + +int main (int argc,char *argv[]) +{ +daemon (0 ,0 ); +while (1 ) { +sleep (1 ); + } +return 0 ; +}
meta-skeleton/recipes-skeleton/service/service_0.1.bb new file +32 -0
@@ -0,0 +1,32 @@ +DESCRIPTION = "The canonical example of init scripts" +SECTION = "base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYRIGHT;md5=349c872e0066155e1818b786938876a4" +RDEPENDS_${PN} = "initscripts" +PR = "r0" + +SRC_URI = "file://skeleton \ + file://skeleton_test.c \ + file://COPYRIGHT \ + " + +CONFFILES_${PN} += "${sysconfdir}/init.d/skeleton" + +do_compile () { + ${CC} ${WORKDIR}/skeleton_test.c -o ${WORKDIR}/skeleton-test +} + +do_install () { + install -d ${D}${sysconfdir}/init.d + cat ${WORKDIR}/skeleton | \ + sed -e 's,/etc,${sysconfdir},g' \ + -e 's,/usr/sbin,${sbindir},g' \ + -e 's,/var,${localstatedir},g' \ + -e 's,/usr/bin,${bindir},g' \ + -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/skeleton + chmod a+x ${D}${sysconfdir}/init.d/skeleton + + install -d ${D}${sbindir} + install -m 0755 ${WORKDIR}/skeleton-test ${D}${sbindir}/ +} +
Signature · 1 line
1.7.1
Darren Hart
Acked-byQuoted 5 lines · Robert Yang
Changes of V4:
* Fix the indent in ${sysconfdir}/init.d/functions
* Fix the coding style inskeleton_test.cThanks for Darren's detailed review, and he is happy now.
Indeed,
For the entire series.
Quoted 29 lines
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: robert/init_scripts
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/init_scriptsThanks,
Robert Yang <[email protected]>
---Robert Yang (4):
Add the layer meta-skeleton
Cleanup the whitespace in functions
Add pidofproc to ${sysconfdir}/init.d/functions
Add a skeleton for init scriptsmeta-skeleton/conf/layer.conf | 10 + .../recipes-skeleton/service/service/COPYRIGHT | 15 ++ .../recipes-skeleton/service/service/skeleton | 193 ++++++++++++++++++++ .../service/service/skeleton_test.c | 12 ++ .../recipes-skeleton/service/service_0.1.bb | 32 ++++ .../initscripts/initscripts-1.0/functions | 39 ++++- 6 files changed, 296 insertions(+), 5 deletions(-) create mode 100644 meta-skeleton/conf/layer.conf create mode 100644 meta-skeleton/recipes-skeleton/service/service/COPYRIGHT create mode 100644 meta-skeleton/recipes-skeleton/service/service/skeleton create mode 100644 meta-skeleton/recipes-skeleton/service/service/skeleton_test.c create mode 100644 meta-skeleton/recipes-skeleton/service/service_0.1.bb
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Saul Wold
AppliedQuoted 28 lines · Robert Yang
Changes of V4:
* Fix the indent in ${sysconfdir}/init.d/functions
* Fix the coding style inskeleton_test.cThanks for Darren's detailed review, and he is happy now.
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: robert/init_scripts
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/init_scriptsThanks,
Robert Yang<[email protected]>
---Robert Yang (4):
Add the layer meta-skeleton
Cleanup the whitespace in functions
Add pidofproc to ${sysconfdir}/init.d/functions Add a skeleton for init scriptsmeta-skeleton/conf/layer.conf | 10 + .../recipes-skeleton/service/service/COPYRIGHT | 15 ++ .../recipes-skeleton/service/service/skeleton | 193 ++++++++++++++++++++ .../service/service/skeleton_test.c | 12 ++ .../recipes-skeleton/service/service_0.1.bb | 32 ++++ .../initscripts/initscripts-1.0/functions | 39 ++++- 6 files changed, 296 insertions(+), 5 deletions(-)
Quoted 6 lines
create mode 100644
meta-skeleton/conf/layer.conf
create mode 100644 meta-skeleton/recipes-skeleton/service/service/COPYRIGHT create mode 100644 meta-skeleton/recipes-skeleton/service/service/skeleton create mode 100644meta-skeleton/recipes-skeleton/service/service/skeleton_test.ccreate mode 100644 meta-skeleton/recipes-skeleton/service/service_0.1.bb
Merged into oe-core and master
Thanks for your work on this effort.
Sau!