classes/update-rc.d.bbclass: move update-rc after postinst
PATCH 1/2 classes/update-rc.d.bbclass: move update-rc after postinst
without this, launching a daemon can fail if postinst is supposed, for example, to fix permissions of directories used by the daemon.
--- classes/update-rc.d.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
classes/update-rc.d.bbclass +1 -1
@@ -60,11 +60,11 @@ python populate_packages_prepend () { bb.data.update_data(localdata) postinst = '#!/bin/sh\n' - postinst += bb.data.getVar('updatercd_postinst', localdata, 1) try: postinst += bb.data.getVar('pkg_postinst', localdata, 1) except: pass + postinst += bb.data.getVar('updatercd_postinst', localdata, 1) bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) prerm = bb.data.getVar('pkg_prerm', localdata, 1) if not prerm:
Signature · 1 line
1.6.3.3
PATCH 2/2 nostromo: add new recipe for this web server
* description taken from its website :
nhttpd is a simple, fast and secure HTTP server.
It runs as a single process, handling connections with select(2). For CGIs and directory listing it does fork(2). nhttpd has the minimum of HTTP/1.1 and CGI/1.1 implemented. Also supported are; chroot, setuid, basic authentication, SSL, IPv6, custom repsonses, aliases, and virtual hosts. To stop the server send a SIGTERM singal to the PID. The access log is written in standard CLF format.
--- recipes/nostromo/files/cross.diff | 119 ++++++++++++++++++++++++++++++++++++ recipes/nostromo/files/nhttpd.conf | 55 +++++++++++++++++ recipes/nostromo/files/nostromo | 34 ++++++++++ recipes/nostromo/files/volatiles | 2 + recipes/nostromo/nostromo_1.9.3.bb | 54 ++++++++++++++++ 5 files changed, 264 insertions(+), 0 deletions(-) create mode 100644 recipes/nostromo/files/cross.diff create mode 100644 recipes/nostromo/files/nhttpd.conf create mode 100644 recipes/nostromo/files/nostromo create mode 100644 recipes/nostromo/files/volatiles create mode 100644 recipes/nostromo/nostromo_1.9.3.bb
recipes/nostromo/files/cross.diff new file +119 -0
@@ -0,0 +1,119 @@ +diff --git a/src/libbsd/GNUmakefile b/src/libbsd/GNUmakefile +index e2d01a3..b380e1d 100644 +--- a/src/libbsd/GNUmakefile ++++ b/src/libbsd/GNUmakefile +@@ -1,12 +1,12 @@ +-CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c ++CCFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes -c + + libbsd.a: strlcpy.o strlcat.o +- ar -r libbsd.a strlcpy.o strlcat.o +- ranlib libbsd.a ++ $(AR) -r libbsd.a strlcpy.o strlcat.o ++ $(RANLIB) libbsd.a + + strlcpy.o: strlcpy.c +- cc ${CCFLAGS} strlcpy.c ++ $(CC) $(CCFLAGS) strlcpy.c + strlcat.o: strlcat.c +- cc ${CCFLAGS} strlcat.c ++ $(CC) $(CCFLAGS) strlcat.c + clean: + rm -f libbsd.a *.o +diff --git a/src/libmy/GNUmakefile b/src/libmy/GNUmakefile +index ce90dd9..674ffe3 100644 +--- a/src/libmy/GNUmakefile ++++ b/src/libmy/GNUmakefile +@@ -1,30 +1,30 @@ +-CCFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -c ++CCFLAGS := -O2 -Wall -Werror -Wstrict-prototypes -c + + libmy.a: strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o +- ar -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o +- ranlib libmy.a ++ $(AR) -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o ++ $(RANLIB) libmy.a + + strcutl.o: strcutl.c +- cc ${CCFLAGS} strcutl.c ++ $(CC) $(CCFLAGS) strcutl.c + strcutw.o: strcutw.c +- cc ${CCFLAGS} strcutw.c ++ $(CC) $(CCFLAGS) strcutw.c + strcuts.o: strcuts.c +- cc ${CCFLAGS} strcuts.c ++ $(CC) $(CCFLAGS) strcuts.c + strcuti.o: strcuti.c +- cc ${CCFLAGS} strcuti.c ++ $(CC) $(CCFLAGS) strcuti.c + strcutf.o: strcutf.c +- cc ${CCFLAGS} strcutf.c ++ $(CC) $(CCFLAGS) strcutf.c + strlower.o: strlower.c +- cc ${CCFLAGS} strlower.c ++ $(CC) $(CCFLAGS) strlower.c + strb64d.o: strb64d.c +- cc ${CCFLAGS} strb64d.c ++ $(CC) $(CCFLAGS) strb64d.c + + flog.o: flog.c +- cc ${CCFLAGS} flog.c ++ $(CC) $(CCFLAGS) flog.c + flogd.o: flogd.c +- cc ${CCFLAGS} flogd.c ++ $(CC) $(CCFLAGS) flogd.c + fparse.o: fparse.c +- cc ${CCFLAGS} fparse.c ++ $(CC) $(CCFLAGS) fparse.c + + clean: + rm -f libmy.a *.o +diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile +index c1887cf..9febc5b 100644 +--- a/src/nhttpd/GNUmakefile ++++ b/src/nhttpd/GNUmakefile +@@ -1,18 +1,18 @@ +-CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c ++CCFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes -c + + nhttpd: main.o http.o sys.o +- cc -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt +- strip nhttpd ++ $(CC) -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt ++ $(STRIP) nhttpd + nroff -Tascii -c -mandoc nhttpd.8 > nhttpd.cat8 + + main.o: main.c +- cc ${CCFLAGS} main.c ++ $(CC) $(CCFLAGS) main.c + + http.o: http.c +- cc ${CCFLAGS} http.c ++ $(CC) $(CCFLAGS) http.c + + sys.o: sys.c +- cc ${CCFLAGS} sys.c ++ $(CC) $(CCFLAGS) sys.c + + clean: + rm -f nhttpd nhttpd.cat8 *.o +diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile +index 15bea61..a6e28c6 100644 +--- a/src/tools/GNUmakefile ++++ b/src/tools/GNUmakefile +@@ -1,11 +1,11 @@ +-CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c ++CCFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes + + crypt: crypt.o +- cc -o crypt crypt.o -lcrypt +- strip crypt ++ $(CC) $(CCFLAGS) -o crypt crypt.o -lcrypt ++ $(STRIP) crypt + + crypt.o: crypt.c +- cc ${CCFLAGS} crypt.c ++ $(CC) $(CCFLAGS) -c crypt.c + + clean: + rm -f crypt *.o
recipes/nostromo/files/nhttpd.conf new file +55 -0
55 lines not on this page · raw message
recipes/nostromo/files/nostromo new file +34 -0
@@ -0,0 +1,34 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=nhttpd +NAME=nhttpd +DESC="Nostromo Web Server" +OPTS="-c /etc/nhttpd.conf" + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop -x "$DAEMON" + sleep 1 + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0
recipes/nostromo/files/volatiles new file +2 -0
@@ -0,0 +1,2 @@ +d www-data www-data 0775 /var/run/nostromo none +d www-data www-data 0775 /var/log/nostromo none
recipes/nostromo/nostromo_1.9.3.bb new file +54 -0
55 lines not on this page · raw message
Signature · 1 line
1.6.3.3
Quoted 4 lines · Eric Bénard
without this, launching a daemon can fail if postinst is supposed, for example, to fix permissions of directories used by the daemon.
Signed-off-by Eric Bénard <[email protected]>
FYI: this maybe somehow broke syslog-ng postinst:
Configuring syslog-ng.
update-rc.d: /etc/init.d/syslog exists during rc.d purge (continuing)
Removing any system startup links for syslog ...
update-rc.d: /etc/init.d/syslog-ng exists during rc.d purge (use -f to force)
from syslog-ng package:
OE om-gta02@shr ~/test $ cat postinst #!/bin/sh
update-rc.d -f syslog remove
if test "x$D" != "x"; then
OPT="-r $D"
else
OPT="-s"fi
update-rc.d $OPT syslog-ng remove OE om-gta02@shr ~/test $ cat prerm #!/bin/sh
if test "x$D" = "x"; then
if test "$1" = "upgrade" -o "$1" = "remove"; then
/etc/init.d/syslog-ng stop
fifi
OE om-gta02@shr ~/test $ cat postrm update-rc.d syslog add 5
if test "x$D" != "x"; then
OPT="-r $D"
else
OPT=""fi
if test "$1" = "remove" -o "$1" = "purge"; then
if ! test -e "/etc/init.d/syslog-ng"; then
update-rc.d $OPT syslog-ng remove
fi
fi
Quoted 6 lines · Martin Jansa
Quoted 4 lines · Eric Bénard
without this, launching a daemon can fail if postinst is supposed, for example, to fix permissions of directories used by the daemon.
Signed-off-by Eric Bénard <[email protected]>
Quoted 7 lines
FYI: this maybe somehow broke syslog-ng postinst:
Configuring syslog-ng.
update-rc.d:/etc/init.d/syslogexists during rc.d purge (continuing)
Removing any system startup links for syslog ...
update-rc.d:/etc/init.d/syslog-ngexists during rc.d purge (use -f to force)
...
BTW: This would be a good chance to add syslog-ng to the update-alternatives handling for the various syslogs (see <http://thread.gmane.org/gmane.comp.handhelds.openembedded/32390>).
Steffen