[meta-webserver][PATCH 1/2] hiawatha-init: create log directory during init

[meta-webserver][PATCH 1/2] hiawatha-init: create log directory during init

[Derek Straka]

Signed-off-by: Derek Straka <derek@asterius.io>
---
 meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init
index 47fc087..7427fcb 100644
--- a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init
+++ b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init
@@ -19,6 +19,7 @@ OPTS=""
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
+	mkdir -p /var/log/hiawatha &> /dev/null
 	start-stop-daemon --start -x "$DAEMON" -- $OPTS
 	echo "$NAME."
 	;;
-- 
1.9.1

[meta-webserver][PATCH 2/2] hiawatha: update to version 10.3

[Derek Straka]

Signed-off-by: Derek Straka <derek@asterius.io>
---
 .../hiawatha/{hiawatha_9.2.bb => hiawatha_10.3.bb}          | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 rename meta-webserver/recipes-httpd/hiawatha/{hiawatha_9.2.bb => hiawatha_10.3.bb} (84%)

diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb
similarity index 84%
rename from meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb
rename to meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb
index 7062174..7b6ab26 100644
--- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb
+++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb
@@ -10,8 +10,8 @@ SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \
            file://hiawatha-init \
            file://hiawatha.service "
 
-SRC_URI[md5sum] = "a77f044634884c4cc5d21dab44e822a3"
-SRC_URI[sha256sum] = "5d9cdec51c618bb3efab747030e593d9bd49dfaf3236254c8e0cb60715716dbf"
+SRC_URI[md5sum] = "31567dfc18d435bd419be279f7970019"
+SRC_URI[sha256sum] = "99d185fb16bb1ab706724494d3cac86464f1485ed4b0fff09a192eca6da5ff8e"
 
 INITSCRIPT_NAME = "hiawatha"
 INITSCRIPT_PARAMS = "defaults 70"
@@ -33,10 +33,7 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
                   -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 "
+                  -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=${localstatedir}"
 
 do_install_append() {
     # Copy over init script and sed in the correct sbin path
@@ -53,7 +50,7 @@ do_install_append() {
         install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system
     fi
 
-    rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+    rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" "${D}${localstatedir}/run"
 }
 
 CONFFILES_${PN} = " \
@@ -63,3 +60,5 @@ CONFFILES_${PN} = " \
     ${sysconfdir}/hiawatha/mimetype.conf \
     ${sysconfdir}/hiawatha/php-fcgi.conf \
 "
+
+FILES_${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}"
-- 
1.9.1