Merge branch 'dora'

recipes-support/swupdate/swupdate/defconfig

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# swupdate version: 2014.07.0-rc1
-# Wed Jul  9 11:50:30 2014
+# swupdate version: 2014.07.0
+# Tue Dec 30 15:37:21 2014
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -13,8 +13,8 @@ CONFIG_HAVE_DOT_CONFIG=y
 # General Configuration
 #
 CONFIG_SCRIPTS=y
-# CONFIG_HW_COMPATIBILITY is not set
-CONFIG_HW_COMPATIBILITY_FILE=""
+CONFIG_HW_COMPATIBILITY=y
+CONFIG_HW_COMPATIBILITY_FILE="/etc/hwrevision"
 CONFIG_LUA=y
 # CONFIG_FEATURE_SYSLOG is not set
 
@@ -35,12 +35,21 @@ CONFIG_EXTRA_LDLIBS=""
 # CONFIG_DEBUG_PESSIMIZE is not set
 # CONFIG_WERROR is not set
 # CONFIG_NOCLEANUP is not set
-# CONFIG_WEBSERVER is not set
-# CONFIG_MONGOOSE is not set
-# CONFIG_MONGOOSELUA is not set
+# CONFIG_DOWNLOAD is not set
+CONFIG_WEBSERVER=y
+
+#
+# Webserver Features
+#
+CONFIG_MONGOOSE=y
+
+#
+# Mongoose Feature
+#
+CONFIG_MONGOOSELUA=y
 # CONFIG_MONGOOSESQL is not set
-# CONFIG_MONGOOSEIPV6 is not set
-# CONFIG_MONGOOSESSL is not set
+CONFIG_MONGOOSEIPV6=y
+CONFIG_MONGOOSESSL=y
 
 #
 # Archival Features
@@ -64,10 +73,10 @@ CONFIG_SWDESCRIPTION=""
 # CONFIG_UBIVOL is not set
 CONFIG_UBIBLACKLIST=""
 CONFIG_UBIVIDOFFSET=0
-# CONFIG_CFI is not set
-# CONFIG_RAW is not set
-# CONFIG_LUASCRIPTHANDLER is not set
-# CONFIG_SHELLSCRIPTHANDLER is not set
-# CONFIG_HANDLER_IN_LUA is not set
-# CONFIG_UBOOT is not set
-CONFIG_UBOOT_FWENV=""
+CONFIG_CFI=y
+CONFIG_RAW=y
+CONFIG_LUASCRIPTHANDLER=y
+CONFIG_SHELLSCRIPTHANDLER=y
+CONFIG_HANDLER_IN_LUA=y
+CONFIG_UBOOT=y
+CONFIG_UBOOT_FWENV="/etc/fw_env.config"

recipes-support/swupdate/swupdate/swupdate

@@ -31,7 +31,6 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="swupdate"
 NAME="swupdate"
 DAEMON=/usr/bin/swupdate
-DAEMON_ARGS="-w '-document_root /www'"
 PIDFILE=/var/run/$NAME.pid
 
 . /etc/init.d/functions || exit 1
@@ -58,7 +57,7 @@ do_start() {
 	*)
 		echo "Starting $DESC ..."
 		cd /home/root
-		exec $DAEMON $DAEMON_ARGS >/dev/null 2>&1 &
+		exec $DAEMON -v -w "-document_root /www" &
 		exit 0
 		;;
 	esac