From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com ([143.182.124.37]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TOr9N-0003fo-NT for openembedded-devel@lists.openembedded.org; Thu, 18 Oct 2012 16:32:41 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 18 Oct 2012 07:19:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,607,1344236400"; d="scan'208";a="206085732" Received: from unknown (HELO helios.localnet) ([10.252.122.102]) by azsmga001.ch.intel.com with ESMTP; 18 Oct 2012 07:19:20 -0700 From: Paul Eggleton To: Jack Mitchell Date: Thu, 18 Oct 2012 15:19:19 +0100 Message-ID: <2621987.kJZKGLFW6N@helios> Organization: Intel Corporation User-Agent: KMail/4.9.2 (Linux/3.2.0-32-generic-pae; KDE/4.9.2; i686; ; ) In-Reply-To: <1350569296-23663-1-git-send-email-ml@communistcode.co.uk> References: <1350569296-23663-1-git-send-email-ml@communistcode.co.uk> MIME-Version: 1.0 Cc: Jack Mitchell , openembedded-devel@lists.openembedded.org Subject: Re: [meta-webserver][PATCH v5] hiawatha: add initial 8.5 recipe and associated files X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2012 14:32:42 -0000 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" On Thursday 18 October 2012 15:08:16 Jack Mitchell wrote: > From: Jack Mitchell > > Signed-off-by: Jack Mitchell > -- > > v1: > - hiawatha: add initial 8.5 recipe and associated files > > v2: > - update hiawatha init file with LSB headers > - use sed to put in correct sbin path > --- > .../recipes-httpd/hiawatha/files/hiawatha-init | 44 > +++++++++++++++++++++ .../recipes-httpd/hiawatha/hiawatha_8.5.bb | > 45 ++++++++++++++++++++++ 2 files changed, 89 insertions(+) > create mode 100644 > meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init create mode > 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb > > diff --git a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init > b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init new file mode > 100644 > index 0000000..47fc087 > --- /dev/null > +++ b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init > @@ -0,0 +1,44 @@ > +#!/bin/sh > + > +### BEGIN INIT INFO > +# Provides: hiawatha httpd httpd-cgi > +# Required-Start: $syslog $network $remote_fs > +# Required-Stop: $syslog $network $remote_fs > +# Default-Start: 2 3 4 5 > +# Default-Stop: 0 1 6 > +# Short-Description: Hiawatha webserver > +# Description: Hiawatha, a secure and advanced webserver. > +### END INIT INFO > + > +PATH=/sbin:/bin:/usr/sbin:/usr/bin > +DAEMON=sed_sbin_path/hiawatha > +NAME=hiawatha > +DESC="Hiawatha Web Server" > +OPTS="" > + > +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 > diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb > b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb new file mode > 100644 > index 0000000..b4462bb > --- /dev/null > +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb > @@ -0,0 +1,45 @@ > +DESCRIPTION = "Lightweight secure web server" > +HOMEPAGE = "http://www.hiawatha-webserver.org" > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" > +DEPENDS = "libxml2 libxslt" > + > +SECTION = "net" > + > +SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \ > + file://hiawatha-init" > + > +SRC_URI[md5sum] = "71d3903657953c93fc930758d158097d" > +SRC_URI[sha256sum] = > "2567e6b4b4c6666388087b586238e6e91a4afd80e10a879920020a097fcdc946" + > +inherit cmake update-rc.d > + > +INITSCRIPT_NAME = "hiawatha" > +INITSCRIPT_PARAMS = "defaults 70" > + > +EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ > + -DENABLE_CACHE=ON \ > + -DENABLE_DEBUG=OFF \ > + -DENABLE_SSL=OFF \ > + -DENABLE_TOOLKIT=OFF \ > + -DENABLE_CHROOT=OFF \ > + -DENABLE_XSLT=ON \ > + -DENABLE_TOMAHAWK=OFF \ > + -DCMAKE_INSTALL_MANDIR=${mandir} \ > + -DCMAKE_INSTALL_BINDIR=${bindir} \ > + -DCMAKE_INSTALL_SBINDIR=${sbindir} \ > + -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ > + -DCMAKE_INSTALL_LIBDIR=${libdir} \ > + -DLOG_DIR=/var/log/hiawatha \ > + -DPID_DIR=/var/run \ > + -DWEBROOT_DIR=/var/www/hiawatha \ > + -DWORK_DIR=/var/lib/hiawatha " > + > +do_install_append() { > + > + # Copy over init script and sed in the correct sbin path > + sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init > + mkdir -p ${D}${sysconfdir}/init.d > + install -m 0755 ${WORKDIR}/hiawatha-init > ${D}${sysconfdir}/init.d/hiawatha + > +} I merged this with a trivial whitespace fix (indenting of SRC_URI). Thanks! Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre