9 files changed, 26 insertions, 91 deletions
diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
index 4221344..74fb040 100644
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,5 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR = "m2"
+PR = "m3"
 
 CONFFILES_${PN}_remove = "${sysconfdir}/fstab"
 FILES_${PN}_remove = "${sysconfdir}/fstab"
@@ -14,7 +14,8 @@ do_install_append() {
        rm ${D}/${sysconfdir}/fstab
    fi
    set +x
-
+   rm -rf ${D}/tmp
+   ln -snf /var/tmp ${D}/tmp
 
    cat >> ${D}${sysconfdir}/profile << 'EOT'
 for g in $(groups) ; do
diff --git a/recipes-core/initscripts/initscripts-1.0/umountfs b/recipes-core/initscripts/initscripts-1.0/umountfs
index 07379c4..b044a4a 100644
--- a/recipes-core/initscripts/initscripts-1.0/umountfs
+++ b/recipes-core/initscripts/initscripts-1.0/umountfs
@@ -78,6 +78,24 @@ err_leds() {
 
 
 flash_upgrade() {
+  supercap=$(mts-io-sysfs show capability/supercap 2>/dev/null)
+  if ((supercap == 1)) ; then
+    count=0
+    while ((count < 180)) ; do
+      powerfail=$(mts-io-sysfs show power-fail)
+      if ((powerfail == 1)) ; then
+	 logger -s -t 'flash_upgrade' -p daemon.err 'Power has failed. Skipping flash upgrade. Try again later'
+	 return
+      fi
+      full=$(mts-io-sysfs show supercap-full)
+      if ((full == 1)); then
+	break  # Continue with flash
+      fi
+      logger -s -t 'flash_upgrade' -p daemon.err 'Supercap is not yet full. Wait for flash upgrade.'
+      ((count++))
+      sleep 1
+    done # Looping on 3 minute timeout
+  fi
   if [ $# -ne 1 ]; then
     echo "need to specify flash-root"
     return
diff --git a/recipes-core/initscripts/initscripts_1.0.bbappend b/recipes-core/initscripts/initscripts_1.0.bbappend
index c5bd486..537fbee 100644
--- a/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -3,4 +3,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 # flash on reboot/umountfs needs regular umount (not busybox)
 RDEPENDS_${PN} += "util-linux-umount util-linux-mount bash"
 
-PR .= ".44"
+PR .= ".46"
diff --git a/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
deleted file mode 100644
index b88440d..0000000
--- a/recipes-core/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 2 Apr 2015 19:18:45 -0700
-Subject: [PATCH] usb.h: Include sys/types.h
-
-We need the definitions for things like u_intX_t
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libusb/usb.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libusb/usb.h b/libusb/usb.h
-index 84e730f..caffae2 100644
---- a/libusb/usb.h
-+++ b/libusb/usb.h
-@@ -31,6 +31,8 @@
- 
- #include <dirent.h>
- 
-+#include <sys/types.h>
-+
- /*
-  * USB spec information
-  *
--- 
-2.1.4
-
diff --git a/recipes-core/libusb/libusb1/no-dll.patch b/recipes-core/libusb/libusb1/no-dll.patch
deleted file mode 100644
index 6e6bb83..0000000
--- a/recipes-core/libusb/libusb1/no-dll.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-As all invokes all-recursive which uses sub-makes to invoke all-am, the
-resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds
-the second attempt is skipped as the target already exists, but in highly
-parallel builds it's likely that two makes will be building libusb-1.0.la at the
-same time.
-
-Solve this by removing the explicit all target, which as libusb-1.0.dll isn't
-built under Linux is redundant anyway.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/libusb/Makefile.am b/libusb/Makefile.am
-index 0cab0a0..c880213 100644
---- a/libusb/Makefile.am
-+++ b/libusb/Makefile.am
-@@ -1,2 +0,0 @@
--all: libusb-1.0.la libusb-1.0.dll
--
diff --git a/recipes-core/libusb/libusb1_1.0.21.bb b/recipes-core/libusb/libusb1_1.0.21.bb
deleted file mode 100644
index 1fefd14..0000000
--- a/recipes-core/libusb/libusb1_1.0.21.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "Userspace library to access USB (version 1.0)"
-HOMEPAGE = "http://libusb.sf.net"
-BUGTRACKER = "http://www.libusb.org/report"
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
-           file://no-dll.patch \
-          "
-
-SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44"
-SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b"
-
-S = "${WORKDIR}/libusb-${PV}"
-
-inherit autotools pkgconfig
-
-# Don't configure udev by default since it will cause a circular
-# dependecy with udev package, which depends on libusb
-EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev"
-
-do_install_append() {
-	install -d ${D}${libdir}
-	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
-		mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
-	fi
-}
-
-FILES_${PN} += "${base_libdir}/*.so.*"
-
-FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"
diff --git a/recipes-core/multitech/commissioning_1.0.1.bb b/recipes-core/multitech/commissioning_1.0.1.bb
index 4cee01a..4322906 100644
--- a/recipes-core/multitech/commissioning_1.0.1.bb
+++ b/recipes-core/multitech/commissioning_1.0.1.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=593c81e8a2bd8b4c4e310d8792372b13"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-DEPENDS = "fcgi jsoncpp shadow"
-RDEPENDS_${PN} += "jsoncpp lighttpd lighttpd-module-fastcgi lighttpd-module-openssl lighttpd-module-redirect bash openssl-bin"
+DEPENDS = "fcgi jsoncpp16 shadow"
+RDEPENDS_${PN} += "jsoncpp16 lighttpd lighttpd-module-fastcgi lighttpd-module-openssl lighttpd-module-redirect bash openssl-bin"
 RDEPENDS_${PN}-php-fpm += "php-fpm ${PN}"
 PACKAGES =+ "${PN}-php-fpm"
 
diff --git a/recipes-core/udev/eudev/init b/recipes-core/udev/eudev/init
index bd716b0..d941401 100644
--- a/recipes-core/udev/eudev/init
+++ b/recipes-core/udev/eudev/init
@@ -57,7 +57,7 @@ case "$1" in
     # the automount rule for udev needs /tmp directory available, as /tmp is a symlink
     # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure
     # /var/volatile/tmp directory to be available.
-    mkdir -p /var/volatile/tmp
+    mkdir -m 1777 -p /var/volatile/tmp
 
     # Cache handling.
     # A list of files which are used as a criteria to judge whether the udev cache could be reused.
diff --git a/recipes-core/useradd/useradd.bb b/recipes-core/useradd/useradd.bb
index d229a2f..653c597 100644
--- a/recipes-core/useradd/useradd.bb
+++ b/recipes-core/useradd/useradd.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Add mtadm user for security purposes"
 SECTION = "mtadm"
 PR = "r4"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=b97a012949927931feb7793eee5ed924 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 S = "${WORKDIR}"