pcsc-lite: clean recipe
PATCH v2 1/4 pcsc-lite: clean recipe
we get the following log at boot :
Configuring pcsc-lite.
update-rc.d: /etc/init.d/pcscd: file does not exist
as the init script is no more nedded (autoload feature of the daemon by the clients), we can remove the previously unused init script and clean the recipe in order not to have any update-rc interaction.
--- meta-oe/recipes-support/pcsc-lite/files/pcscd.init | 32 -------------------- .../recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb | 7 +--- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-support/pcsc-lite/files/pcscd.init
meta-oe/recipes-support/pcsc-lite/files/pcscd.init deleted +0 -32
@@ -1,32 +0,0 @@ -#!/bin/sh -DAEMON=/usr/sbin/pcscd -NAME=pcscd -DESC="PCSC Daemon" -PIDFILE=/var/run/pcscd/pcscd.pid -ARGS="" - -test -f $DAEMON || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: $NAME" - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $ARGS - echo "." - ;; - stop) - echo -n "Stopping $DESC: $NAME" - start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON - echo "." - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -exit 0
meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.7.2.bb +2 -5
@@ -4,14 +4,14 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=c8e551349dc346258274f0007679e149" DEPENDS = "udev" RDEPENDS += "ccid" -PR = "r1" +PR = "r2" SRC_URI = "https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${PV}.tar.bz2" SRC_URI[md5sum] = "47e7055cfc14399fdaa1b7a4aa06e5aa" SRC_URI[sha256sum] = "41f13d552eaa2c3978fbb6f2125e81903a0767011d999052fd1a6ee03880b398" -inherit autotools update-rc.d +inherit autotools EXTRA_OECONF = " \ --disable-libusb \
@@ -23,7 +23,4 @@ S = "${WORKDIR}/pcsc-lite-${PV}" PACKAGES =+ "${PN}-lib" -INITSCRIPT_NAME = "pcscd" -INITSCRIPT_PARAMS = "defaults" - FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
Signature · 1 line
1.7.6.4
PATCH v2 2/4 atftp: correctly handle init script
else it's affected to atftp package which is the client and not the server, but the init file is only in the server package thus leading to the following log at boot :
Configuring atftp.
update-rc.d: /etc/init.d/atftpd: file does not exist
while at it, there is a cosmetic change from _atftpd to _${PN}d to make the recipe consistent
--- meta-oe/recipes-extended/atftp/atftp_0.7.bb | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
meta-oe/recipes-extended/atftp/atftp_0.7.bb +6 -4
@@ -3,6 +3,7 @@ SECTION = "network" HOMEPAGE = "http://packages.debian.org/atftp" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg.orig.tar.gz;name=archive \ ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-11.diff.gz;name=patch \
@@ -16,11 +17,12 @@ inherit autotools update-rc.d systemd useradd SYSTEMD_PACKAGES = "atftpd-systemd" SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service" -INITSCRIPT_NAME = "atftpd" -INITSCRIPT_PARAMS = "defaults 80" +INITSCRIPT_PACKAGES = "${PN}d" +INITSCRIPT_NAME_${PN}d = "atftpd" +INITSCRIPT_PARAMS_${PN}d = "defaults 80" -USERADD_PACKAGES = "atftpd" -USERADD_PARAM_atftpd = "--system --no-create-home --shell /bin/false \ +USERADD_PACKAGES = "${PN}d" +USERADD_PARAM_${PN}d = "--system --no-create-home --shell /bin/false \ --user-group nobody" do_install_append() {
Signature · 1 line
1.7.6.4
PATCH v2 3/4 add net-snmp-5.7.1
In reply to Eric Bénardthe recipe was imported from OE-classic and upgraded to latest stable.
--- meta-oe/recipes-extended/net-snmp/files/init | 63 +++ meta-oe/recipes-extended/net-snmp/files/snmpd.conf | 422 ++++++++++++++++++++ .../recipes-extended/net-snmp/files/snmptrapd.conf | 18 + meta-oe/recipes-extended/net-snmp/net-snmp.inc | 66 +++ .../recipes-extended/net-snmp/net-snmp_5.7.1.bb | 26 ++ 5 files changed, 595 insertions(+), 0 deletions(-) create mode 100755 meta-oe/recipes-extended/net-snmp/files/init create mode 100644 meta-oe/recipes-extended/net-snmp/files/snmpd.conf create mode 100644 meta-oe/recipes-extended/net-snmp/files/snmptrapd.conf create mode 100644 meta-oe/recipes-extended/net-snmp/net-snmp.inc create mode 100644 meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb
meta-oe/recipes-extended/net-snmp/files/init new file +63 -0
@@ -0,0 +1,63 @@ +#! /bin/sh +# /etc/init.d/snmpd: start snmp daemon. + +test -x /usr/sbin/snmpd || exit 0 +test -x /usr/sbin/snmptrapd || exit 0 + +# Defaults +export MIBDIRS=/usr/share/snmp/mibs +SNMPDRUN=yes +SNMPDOPTS='-Lsd -Lf /dev/null -p /var/run/snmpd.pid' +TRAPDRUN=no +TRAPDOPTS='-Lsd -p /var/run/snmptrapd.pid' + +# Cd to / before starting any daemons. +cd / + +case "$1" in + start) + echo -n "Starting network management services:" + if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then + start-stop-daemon -S -x /usr/sbin/snmpd \ + -- $SNMPDOPTS + echo -n " snmpd" + fi + if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then + start-stop-daemon -S -x /usr/sbin/snmptrapd \ + -- $TRAPDOPTS + echo -n " snmptrapd" + fi + echo "." + ;; + stop) + echo -n "Stopping network management services:" + start-stop-daemon -K -x /usr/sbin/snmpd + echo -n " snmpd" + start-stop-daemon -K -x /usr/sbin/snmptrapd + echo -n " snmptrapd" + echo "." + ;; + restart|reload|force-reload) + echo -n "Restarting network management services:" + start-stop-daemon -K -x /usr/sbin/snmpd + start-stop-daemon -K -x /usr/sbin/snmptrapd + # Allow the daemons time to exit completely. + sleep 2 + if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then + start-stop-daemon -S -x /usr/sbin/snmpd -- $SNMPDOPTS + echo -n " snmpd" + fi + if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then + # Allow snmpd time to start up. + sleep 1 + start-stop-daemon -S -x /usr/sbin/snmptrapd -- $TRAPDOPTS + echo -n " snmptrapd" + fi + echo "." + ;; + *) + echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload}" + exit 1 +esac + +exit 0
meta-oe/recipes-extended/net-snmp/files/snmpd.conf new file +422 -0
422 lines not on this page · raw message
meta-oe/recipes-extended/net-snmp/files/snmptrapd.conf new file +18 -0
@@ -0,0 +1,18 @@ +############################################################################### +# +# EXAMPLE.conf: +# An example configuration file for configuring the ucd-snmp snmptrapd agent. +# +############################################################################### +# +# This file is intended to only be an example. If, however, you want +# to use it, it should be placed in /etc/snmp/snmptrapd.conf. +# When the snmptrapd agent starts up, this is where it will look for it. +# +# All lines beginning with a '#' are comments and are intended for you +# to read. All other lines are configuration commands for the agent. + +# +# PLEASE: read the snmptrapd.conf(5) manual page as well! +# +
meta-oe/recipes-extended/net-snmp/net-snmp.inc new file +66 -0
66 lines not on this page · raw message
meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb new file +26 -0
@@ -0,0 +1,26 @@ +require net-snmp.inc +PR = "${INC_PR}.0" +LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5a622ea24634e" + +SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ + file://init \ + file://snmpd.conf \ + file://snmptrapd.conf" + +EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no" +EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" + +do_configure_prepend() { + gnu-configize -f + # We better change sources and re-autoconf here, but + # required autoconf is too new for us. + sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \ + -e 's/tail -1/tail -n 1/g' \ + -i configure +} + +PARALLEL_MAKE = "" +CCACHE = "" + +SRC_URI[md5sum] = "c95d08fd5d93df0c11a2e1bdf0e01e0b" +SRC_URI[sha256sum] = "7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f"
Signature · 1 line
1.7.6.4
PATCH v2 4/4 add nostromo webserver
In reply to Eric Bénardthis recipe was imported from OE-classic and upgraded to latest version
--- meta-oe/recipes-extended/nostromo/files/cross.diff | 119 ++++++++++++++++++++ .../recipes-extended/nostromo/files/nhttpd.conf | 55 +++++++++ meta-oe/recipes-extended/nostromo/files/nostromo | 34 ++++++ meta-oe/recipes-extended/nostromo/files/volatiles | 2 + .../recipes-extended/nostromo/nostromo_1.9.5.bb | 55 +++++++++ 5 files changed, 265 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/nostromo/files/cross.diff create mode 100644 meta-oe/recipes-extended/nostromo/files/nhttpd.conf create mode 100644 meta-oe/recipes-extended/nostromo/files/nostromo create mode 100644 meta-oe/recipes-extended/nostromo/files/volatiles create mode 100644 meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
meta-oe/recipes-extended/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 -Wstrict-prototypes -c ++CCFLAGS := -O2 -pipe -Wall -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
meta-oe/recipes-extended/nostromo/files/nhttpd.conf new file +55 -0
55 lines not on this page · raw message
meta-oe/recipes-extended/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
meta-oe/recipes-extended/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
meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb new file +55 -0
55 lines not on this page · raw message
Signature · 1 line
1.7.6.4
Re: [meta-oe v2 4/4] add nostromo webserver
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 02-12-11 16:09, Eric Bénard schreef:
Quoted 15 lines
this recipe was imported from OE-classic and upgraded to latest version
Signed-off-by Eric Bénard <[email protected]> ---
meta-oe/recipes-extended/nostromo/files/cross.diff| 119
++++++++++++++++++++.../recipes-extended/nostromo/files/nhttpd.conf|
55 +++++++++ meta-oe/recipes-extended/nostromo/files/nostromo | 34
++++++ meta-oe/recipes-extended/nostromo/files/volatiles | 2 +
.../recipes-extended/nostromo/nostromo_1.9.5.bb | 55 +++++++++ 5
files changed, 265 insertions(+), 0 deletions(-) create mode 100644meta-oe/recipes-extended/nostromo/files/cross.diffcreate mode 100644meta-oe/recipes-extended/nostromo/files/nhttpd.confcreate mode 100644 meta-oe/recipes-extended/nostromo/files/nostromo create mode 100644 meta-oe/recipes-extended/nostromo/files/volatiles create mode 100644 meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
Quoted 4 lines
(quoted diff) +0
-0
b/meta-oe/recipes-extended/nostromo/files/cross.diffnew file mode 100644 index 0000000..d93ddb7 ---/dev/null+++b/meta-oe/recipes-extended/nostromo/files/cross.diff@@ -0,0 +1,119 @@
Can you please add a patch header with the purpose and upstream status of the patches? Bonus points for making them git-amable :)
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk7ZJCIACgkQMkyGM64RGpEVWACghc+52XWW5LR0RmW1Yr0kLrtx s3EAoKYtrtzi1ZVyZau50/TUSSePoPyE
=Pm0P
-----END PGP SIGNATURE-----
PATCH v2 1/1 add nostromo webserver
this recipe was imported from OE-classic and upgraded to latest version
--- .../recipes-extended/nostromo/files/nhttpd.conf | 55 ++++++++++++++++++++ meta-oe/recipes-extended/nostromo/files/nostromo | 34 ++++++++++++ meta-oe/recipes-extended/nostromo/files/volatiles | 2 + .../recipes-extended/nostromo/nostromo_1.9.5.bb | 54 +++++++++++++++++++ 4 files changed, 145 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/nostromo/files/nhttpd.conf create mode 100644 meta-oe/recipes-extended/nostromo/files/nostromo create mode 100644 meta-oe/recipes-extended/nostromo/files/volatiles create mode 100644 meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
meta-oe/recipes-extended/nostromo/files/nhttpd.conf new file +55 -0
@@ -0,0 +1,55 @@ +# MAIN [MANDATORY] + +servername localhost +#servername www.nazgul.ch:8080 +serverlisten * +#serverlisten 81.221.21.250 127.0.0.1 ::1 +serveradmin webmaster@localhost +serverroot /var/nostromo +servermimes /var/nostromo/conf/mimes +docroot /var/nostromo/htdocs +docindex index.html + +# LOGS [OPTIONAL] + +logpid /var/run/nostromo/nhttpd.pid +#logaccess /var/log/nostromo/access_log + +# SETUID [RECOMMENDED] + +user www-data + +# BASIC AUTHENTICATION [OPTIONAL] + +#htaccess .htaccess +#htpasswd /var/nostromo/conf/.htpasswd +#htpasswd +bsdauth +#htpasswd +bsdauthnossl + +# SSL [OPTIONAL] + +#sslport 443 +#sslcert /etc/ssl/server.crt +#sslcertkey /etc/ssl/server.key + +# CUSTOM RESPONSES [OPTIONAL] +# +# The custom responses are searched in the corresponding document root. + +#custom_401 custom_401.html +#custom_403 custom_403.html +#custom_404 custom_404.html + +# ALIASES [OPTIONAL] + +/icons /var/nostromo/icons + +# VIRTUAL HOSTS [OPTIONAL] + +#www.rahel.ch /var/nostromo/htdocs/www.rahel.ch +#www.rahel.ch:8080 /var/nostromo/htdocs/www.rahel.ch + +# HOMEDIRS [OPTIONAL] + +#homedirs /home +#homedirs_public public_www
meta-oe/recipes-extended/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
meta-oe/recipes-extended/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
meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
1.7.6.4
Re: [meta-oe v2 4/4] add nostromo webserver
In reply to Koen KooiQuoted 3 lines · Koen Kooi
Can you please add a patch header with the purpose and upstream status of the patches? Bonus points for making them git-amable :)
even better : this patch is not needed.
Eric
Re: [meta-oe v2 4/4] add nostromo webserver
Quoted 6 lines · Eric Bénard
Quoted 3 lines · Koen Kooi
Can you please add a patch header with the purpose and upstream status of the patches? Bonus points for making them git-amable :)
even better : this patch is not needed.
which was wrong ... I should never test a recipe with the same recipe in an other layer ... v4 is following
Eric
PATCH v3 1/1 add nostromo webserver
In reply to Koen Kooithis recipe was imported from OE-classic and upgraded to latest version
--- .../recipes-extended/nostromo/files/nhttpd.conf | 55 ++++++++++++++++++++ meta-oe/recipes-extended/nostromo/files/nostromo | 34 ++++++++++++ meta-oe/recipes-extended/nostromo/files/volatiles | 2 + .../recipes-extended/nostromo/nostromo_1.9.5.bb | 54 +++++++++++++++++++ 4 files changed, 145 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/nostromo/files/nhttpd.conf create mode 100644 meta-oe/recipes-extended/nostromo/files/nostromo create mode 100644 meta-oe/recipes-extended/nostromo/files/volatiles create mode 100644 meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
meta-oe/recipes-extended/nostromo/files/nhttpd.conf new file +55 -0
@@ -0,0 +1,55 @@ +# MAIN [MANDATORY] + +servername localhost +#servername www.nazgul.ch:8080 +serverlisten * +#serverlisten 81.221.21.250 127.0.0.1 ::1 +serveradmin webmaster@localhost +serverroot /var/nostromo +servermimes /var/nostromo/conf/mimes +docroot /var/nostromo/htdocs +docindex index.html + +# LOGS [OPTIONAL] + +logpid /var/run/nostromo/nhttpd.pid +#logaccess /var/log/nostromo/access_log + +# SETUID [RECOMMENDED] + +user www-data + +# BASIC AUTHENTICATION [OPTIONAL] + +#htaccess .htaccess +#htpasswd /var/nostromo/conf/.htpasswd +#htpasswd +bsdauth +#htpasswd +bsdauthnossl + +# SSL [OPTIONAL] + +#sslport 443 +#sslcert /etc/ssl/server.crt +#sslcertkey /etc/ssl/server.key + +# CUSTOM RESPONSES [OPTIONAL] +# +# The custom responses are searched in the corresponding document root. + +#custom_401 custom_401.html +#custom_403 custom_403.html +#custom_404 custom_404.html + +# ALIASES [OPTIONAL] + +/icons /var/nostromo/icons + +# VIRTUAL HOSTS [OPTIONAL] + +#www.rahel.ch /var/nostromo/htdocs/www.rahel.ch +#www.rahel.ch:8080 /var/nostromo/htdocs/www.rahel.ch + +# HOMEDIRS [OPTIONAL] + +#homedirs /home +#homedirs_public public_www
meta-oe/recipes-extended/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
meta-oe/recipes-extended/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
meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
1.7.6.4
Re: [meta-oe v3] add nostromo webserver
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 04-12-11 17:20, Eric Bénard schreef:
Quoted 4 lines
+pkg_postinst_${PN}_prepend() { + chown -R www-data:www-data
${localstatedir}/nostromo ${localstatedir}/log/nostromo
${localstatedir}/run/nostromo +/etc/init.d/populate-volatile.sh
update
The chown can be done in during build IIRC, the volation call needs to check if /etc/init.d/populate-volatile.sh is actually available since it's a sysvinit ism.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk7btUkACgkQMkyGM64RGpGSKwCfcUN5iUmbzX1R7rsGlTMLIIS2 xKIAn0A9PT/UrgCAVRWKokhKh8BnLgHM
=hXmg
-----END PGP SIGNATURE-----
PATCH v4 1/1 add nostromo webserver
this recipe was imported from OE-classic and upgraded to latest version
--- ...ile-add-possibility-to-override-variables.patch | 141 ++++++++++++++++++++ .../recipes-extended/nostromo/files/nhttpd.conf | 55 ++++++++ meta-oe/recipes-extended/nostromo/files/nostromo | 34 +++++ meta-oe/recipes-extended/nostromo/files/volatiles | 2 + .../recipes-extended/nostromo/nostromo_1.9.5.bb | 51 +++++++ 5 files changed, 283 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch create mode 100644 meta-oe/recipes-extended/nostromo/files/nhttpd.conf create mode 100644 meta-oe/recipes-extended/nostromo/files/nostromo create mode 100644 meta-oe/recipes-extended/nostromo/files/volatiles create mode 100644 meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
meta-oe/recipes-extended/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch new file +141 -0
@@ -0,0 +1,141 @@ +From 7fa0d31ec5c0be9dca84a03851b2d44f61527ec8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]> +Date: Sun, 4 Dec 2011 16:01:04 +0100 +Subject: [PATCH] GNUmakefile: add possibility to override variables +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +this is useful for cross compilation + +Signed-off-by: Eric Bénard <[email protected]> +--- +Upstream-Status: Inappropriate [embedded specific] + src/libbsd/GNUmakefile | 10 +++++----- + src/libmy/GNUmakefile | 26 +++++++++++++------------- + src/nhttpd/GNUmakefile | 12 ++++++------ + src/tools/GNUmakefile | 8 ++++---- + 4 files changed, 28 insertions(+), 28 deletions(-) + +diff --git a/src/libbsd/GNUmakefile b/src/libbsd/GNUmakefile +index e2d01a3..b034bc6 100644 +--- a/src/libbsd/GNUmakefile ++++ b/src/libbsd/GNUmakefile +@@ -1,12 +1,12 @@ +-CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c ++CFLAGS := -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) $(CFLAGS) strlcpy.c + strlcat.o: strlcat.c +- cc ${CCFLAGS} strlcat.c ++ $(CC) $(CFLAGS) strlcat.c + clean: + rm -f libbsd.a *.o +diff --git a/src/libmy/GNUmakefile b/src/libmy/GNUmakefile +index ce90dd9..891ffea 100644 +--- a/src/libmy/GNUmakefile ++++ b/src/libmy/GNUmakefile +@@ -1,30 +1,30 @@ +-CCFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -c ++CFLAGS := -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) $(CFLAGS) strcutl.c + strcutw.o: strcutw.c +- cc ${CCFLAGS} strcutw.c ++ $(CC) $(CFLAGS) strcutw.c + strcuts.o: strcuts.c +- cc ${CCFLAGS} strcuts.c ++ $(CC) $(CFLAGS) strcuts.c + strcuti.o: strcuti.c +- cc ${CCFLAGS} strcuti.c ++ $(CC) $(CFLAGS) strcuti.c + strcutf.o: strcutf.c +- cc ${CCFLAGS} strcutf.c ++ $(CC) $(CFLAGS) strcutf.c + strlower.o: strlower.c +- cc ${CCFLAGS} strlower.c ++ $(CC) $(CFLAGS) strlower.c + strb64d.o: strb64d.c +- cc ${CCFLAGS} strb64d.c ++ $(CC) $(CFLAGS) strb64d.c + + flog.o: flog.c +- cc ${CCFLAGS} flog.c ++ $(CC) $(CFLAGS) flog.c + flogd.o: flogd.c +- cc ${CCFLAGS} flogd.c ++ $(CC) $(CFLAGS) flogd.c + fparse.o: fparse.c +- cc ${CCFLAGS} fparse.c ++ $(CC) $(CFLAGS) fparse.c + + clean: + rm -f libmy.a *.o +diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile +index f6d12de..9524911 100644 +--- a/src/nhttpd/GNUmakefile ++++ b/src/nhttpd/GNUmakefile +@@ -1,18 +1,18 @@ +-CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c ++CFLAGS := -O2 -pipe -Wall -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) $(CFLAGS) main.c + + http.o: http.c +- cc ${CCFLAGS} http.c ++ $(CC) $(CFLAGS) http.c + + sys.o: sys.c +- cc ${CCFLAGS} sys.c ++ $(CC) $(CFLAGS) sys.c + + clean: + rm -f nhttpd nhttpd.cat8 *.o +diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile +index 15bea61..663ddb5 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) $(CFLAGS) -o crypt crypt.o -lcrypt ++# $(STRIP) crypt + + crypt.o: crypt.c +- cc ${CCFLAGS} crypt.c ++ $(CC) $(CFLAGS) -c crypt.c + + clean: + rm -f crypt *.o +-- +1.7.6.4 +
meta-oe/recipes-extended/nostromo/files/nhttpd.conf new file +55 -0
55 lines not on this page · raw message
meta-oe/recipes-extended/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
meta-oe/recipes-extended/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
meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb new file +51 -0
51 lines not on this page · raw message
Signature · 1 line
1.7.6.4
Re: [meta-oe v4] add nostromo webserver
Dear Eric,
Am Sonntag, den 04.12.2011, 21:30 +0100 schrieb Eric Bénard:
Quoted 2 lines
this recipe was imported from OE-classic and upgraded to latest version
could you add the version number to the commit summary? That would be great. Also the OE-classic commit SHA sum would be useful.
Quoted 13 lines
Signed-off-by Eric Bénard <[email protected]>--- ...ile-add-possibility-to-override-variables.patch | 141 ++++++++++++++++++++ .../recipes-extended/nostromo/files/nhttpd.conf | 55 ++++++++ meta-oe/recipes-extended/nostromo/files/nostromo | 34 +++++ meta-oe/recipes-extended/nostromo/files/volatiles | 2 + .../recipes-extended/nostromo/nostromo_1.9.5.bb | 51 +++++++ 5 files changed, 283 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch create mode 100644 meta-oe/recipes-extended/nostromo/files/nhttpd.conf create mode 100644 meta-oe/recipes-extended/nostromo/files/nostromo create mode 100644 meta-oe/recipes-extended/nostromo/files/volatiles create mode 100644 meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
[…]
Thanks,
Paul
Re: [meta-oe v4] add nostromo webserver
Hi Paul,
Quoted 7 lines · Paul Menzel
Am Sonntag, den 04.12.2011, 21:30 +0100 schrieb Eric Bénard:
Quoted 2 lines
this recipe was imported from OE-classic and upgraded to latest version
could you add the version number to the commit summary? That would be great. Also the OE-classic commit SHA sum would be useful.
useful for what ?
in case someone wants details on this recipe in OE-classic he can simply do :
cd recipes/nostromo
git log
and he gets all the details.
Eric
Re: [meta-oe v4] add nostromo webserver
Dear Eric,
Am Montag, den 05.12.2011, 10:07 +0100 schrieb Eric Bénard:
Quoted 9 lines · Paul Menzel
Quoted 6 lines
Am Sonntag, den 04.12.2011, 21:30 +0100 schrieb Eric Bénard:
Quoted 2 lines
this recipe was imported from OE-classic and upgraded to latest version
could you add the version number to the commit summary? That would be great. Also the OE-classic commit SHA sum would be useful.
useful for what ?
an as precise as possible commit summary is useful especially when viewing commit logs with one line.
Quoted 4 lines
in case someone wants details on this recipe in OE-classic he can simply do :
cd recipes/nostromo
git log
and he gets all the details.
You assume everybody has a checkout of OE-classic. And besides that it is required by the the (OE-core) guidelines [1].
Thanks,
Paul
[1] http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
PATCH v5 1/1 nostromo-1.9.5: add recipe
Nostromo is a simple, fast and secure webserver.
The patch was imported from the OpenEmbedded git server
(git://git.openembedded.org/openembedded) as of commit id 2218504b0413efaf2b1f643a802176eb803a9bf6 and updated to the latest stable version available.
--- ...ile-add-possibility-to-override-variables.patch | 141 ++++++++++++++++++++ .../recipes-extended/nostromo/files/nhttpd.conf | 55 ++++++++ meta-oe/recipes-extended/nostromo/files/nostromo | 34 +++++ meta-oe/recipes-extended/nostromo/files/volatiles | 2 + .../recipes-extended/nostromo/nostromo_1.9.5.bb | 51 +++++++ 5 files changed, 283 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch create mode 100644 meta-oe/recipes-extended/nostromo/files/nhttpd.conf create mode 100644 meta-oe/recipes-extended/nostromo/files/nostromo create mode 100644 meta-oe/recipes-extended/nostromo/files/volatiles create mode 100644 meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
meta-oe/recipes-extended/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch new file +141 -0
@@ -0,0 +1,141 @@ +From 7fa0d31ec5c0be9dca84a03851b2d44f61527ec8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]> +Date: Sun, 4 Dec 2011 16:01:04 +0100 +Subject: [PATCH] GNUmakefile: add possibility to override variables +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +this is useful for cross compilation + +Signed-off-by: Eric Bénard <[email protected]> +--- +Upstream-Status: Inappropriate [embedded specific] + src/libbsd/GNUmakefile | 10 +++++----- + src/libmy/GNUmakefile | 26 +++++++++++++------------- + src/nhttpd/GNUmakefile | 12 ++++++------ + src/tools/GNUmakefile | 8 ++++---- + 4 files changed, 28 insertions(+), 28 deletions(-) + +diff --git a/src/libbsd/GNUmakefile b/src/libbsd/GNUmakefile +index e2d01a3..b034bc6 100644 +--- a/src/libbsd/GNUmakefile ++++ b/src/libbsd/GNUmakefile +@@ -1,12 +1,12 @@ +-CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c ++CFLAGS := -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) $(CFLAGS) strlcpy.c + strlcat.o: strlcat.c +- cc ${CCFLAGS} strlcat.c ++ $(CC) $(CFLAGS) strlcat.c + clean: + rm -f libbsd.a *.o +diff --git a/src/libmy/GNUmakefile b/src/libmy/GNUmakefile +index ce90dd9..891ffea 100644 +--- a/src/libmy/GNUmakefile ++++ b/src/libmy/GNUmakefile +@@ -1,30 +1,30 @@ +-CCFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -c ++CFLAGS := -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) $(CFLAGS) strcutl.c + strcutw.o: strcutw.c +- cc ${CCFLAGS} strcutw.c ++ $(CC) $(CFLAGS) strcutw.c + strcuts.o: strcuts.c +- cc ${CCFLAGS} strcuts.c ++ $(CC) $(CFLAGS) strcuts.c + strcuti.o: strcuti.c +- cc ${CCFLAGS} strcuti.c ++ $(CC) $(CFLAGS) strcuti.c + strcutf.o: strcutf.c +- cc ${CCFLAGS} strcutf.c ++ $(CC) $(CFLAGS) strcutf.c + strlower.o: strlower.c +- cc ${CCFLAGS} strlower.c ++ $(CC) $(CFLAGS) strlower.c + strb64d.o: strb64d.c +- cc ${CCFLAGS} strb64d.c ++ $(CC) $(CFLAGS) strb64d.c + + flog.o: flog.c +- cc ${CCFLAGS} flog.c ++ $(CC) $(CFLAGS) flog.c + flogd.o: flogd.c +- cc ${CCFLAGS} flogd.c ++ $(CC) $(CFLAGS) flogd.c + fparse.o: fparse.c +- cc ${CCFLAGS} fparse.c ++ $(CC) $(CFLAGS) fparse.c + + clean: + rm -f libmy.a *.o +diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile +index f6d12de..9524911 100644 +--- a/src/nhttpd/GNUmakefile ++++ b/src/nhttpd/GNUmakefile +@@ -1,18 +1,18 @@ +-CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c ++CFLAGS := -O2 -pipe -Wall -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) $(CFLAGS) main.c + + http.o: http.c +- cc ${CCFLAGS} http.c ++ $(CC) $(CFLAGS) http.c + + sys.o: sys.c +- cc ${CCFLAGS} sys.c ++ $(CC) $(CFLAGS) sys.c + + clean: + rm -f nhttpd nhttpd.cat8 *.o +diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile +index 15bea61..663ddb5 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) $(CFLAGS) -o crypt crypt.o -lcrypt ++# $(STRIP) crypt + + crypt.o: crypt.c +- cc ${CCFLAGS} crypt.c ++ $(CC) $(CFLAGS) -c crypt.c + + clean: + rm -f crypt *.o +-- +1.7.6.4 +
meta-oe/recipes-extended/nostromo/files/nhttpd.conf new file +55 -0
55 lines not on this page · raw message
meta-oe/recipes-extended/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
meta-oe/recipes-extended/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
meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb new file +51 -0
51 lines not on this page · raw message
Signature · 1 line
1.7.6.4
Re: [meta-oe v4] add nostromo webserver
In reply to Paul MenzelHi Paul,
Quoted 10 lines · Paul Menzel
Am Montag, den 05.12.2011, 10:07 +0100 schrieb Eric Bénard:
Quoted 5 lines · Paul Menzel
Quoted 2 lines
could you add the version number to the commit summary? That would be great. Also the OE-classic commit SHA sum would be useful.
useful for what ?
an as precise as possible commit summary is useful especially when viewing commit logs with one line.
And you manage to see the sha sum in a one line commit ? Here my screen is not large enough.
Quoted 6 lines
Quoted 4 lines
in case someone wants details on this recipe in OE-classic he can simply do :
cd recipes/nostromo
git log
and he gets all the details.You assume everybody has a checkout of OE-classic.
Without a checkout of oe-classic, the sum of the initial commit is even more useless (unles you have time to spend to search for the commit using a web browser).
Quoted 2 lines
And besides that it is required by the the (OE-core) guidelines [1].
here we are talking of meta-openembedded and not oe-core so this rule doesn't seems to apply as you can see in a03a4083df90184fc1083b2f01952a50cfa51bca or in 09105b947abe5142dc21095664e0fca8fa0d4163
Eric
Re: [meta-oe v3] add nostromo webserver
In reply to Koen KooiHi Koen,
is there anything left preventing pushing these 4 patches (pcsc-lite, atftp, net-snmp, nostromo) ?
Thanks
Eric
Re: [meta-oe v3] add nostromo webserver
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 06-12-11 14:22, Eric Bénard schreef:
Quoted 4 lines
Hi Koen,
is there anything left preventing pushing these 4 patches (pcsc-lite, atftp, net-snmp, nostromo) ?
No, I'll pull them in from patchwork now.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk7eNmcACgkQMkyGM64RGpHgZgCeKCaVS2BRqlV8ZRjLEmQwe+7B OlwAoKVpNdyEIavJ2kVQ2NZZCTatXaAp
=bDQD
-----END PGP SIGNATURE-----
Re: [meta-oe v3] add nostromo webserver
Quoted 11 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Op 06-12-11 14:22, Eric Bénard schreef:
Quoted 4 lines
Hi Koen,
is there anything left preventing pushing these 4 patches (pcsc-lite, atftp, net-snmp, nostromo) ?
No, I'll pull them in from patchwork now.
thanks
Eric