From e7691255d120422c61e6152364746c2d5644ddfa Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 9 Jul 2017 20:56:59 +0300
Subject: [PATCH 01/31] raspberrypi: update firmware, kernel and userland

---
 configs/raspberrypi_defconfig        | 2 +-
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 package/rpi-userland/rpi-userland.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 56da64e808..436df7c94d 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/be2540e540f5442d7b372208787fb64100af0c54.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 401a69f322..43bd68d658 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = b51046a2b2bb69771579a549d157205d9982f858
+RPI_FIRMWARE_VERSION = 6ba0dabbe76ce02d261cc4658c3484fa12b10385
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 804010ab69..ae03f74566 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = cdb5da59f939eb4078e90ed0e3c231c498ba9957
+RPI_USERLAND_VERSION = aa3977538b04038628ff5b3a39a8e42ddcbc9176
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

From 0fcb9c22f22ac43f79e9d32b4d65ed1886c94f95 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 9 Jul 2017 21:07:59 +0300
Subject: [PATCH 02/31] odroids: update kernel

---
 configs/odroidc1_defconfig  | 2 +-
 configs/odroidc2_defconfig  | 2 +-
 configs/odroidxu4_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig
index 4f1b1b5240..79b437d9fa 100644
--- a/configs/odroidc1_defconfig
+++ b/configs/odroidc1_defconfig
@@ -24,7 +24,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc1/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/647316d8199babad4cd22309849842e035494f2b.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/395190984bce09f63b93a7f71bcf362a72ec8018.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="odroidc"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig
index 982872d3ad..3076cd8ba8 100644
--- a/configs/odroidc2_defconfig
+++ b/configs/odroidc2_defconfig
@@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/1b4fefdf20a84b17d5b666c0686a12a29adcb848.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/6ead4210bf3235f0c11526afd1c077a07c5d1478.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="odroidc2"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson64_odroidc2"
diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig
index 81fa595059..890c454192 100644
--- a/configs/odroidxu4_defconfig
+++ b/configs/odroidxu4_defconfig
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidxu4/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/d3d2fb3a7aa850aea3033b6b342d28dba1a4499f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/de1a48357a7b9cff8ba07176fc9b8aac632f8ff6.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="odroidxu3"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"

From 0104523f7fe03975711c04bc18cb15f4cef7fd9f Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Thu, 13 Jul 2017 00:30:28 +0300
Subject: [PATCH 03/31] pine64: add initramfs defconfig

---
 configs/pine64_initramfs_defconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 configs/pine64_initramfs_defconfig

diff --git a/configs/pine64_initramfs_defconfig b/configs/pine64_initramfs_defconfig
new file mode 100644
index 0000000000..69e6d406c5
--- /dev/null
+++ b/configs/pine64_initramfs_defconfig
@@ -0,0 +1,15 @@
+BR2_aarch64=y
+BR2_DL_DIR="$(TOPDIR)/.download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-pine64-initramfs"
+BR2_OPTIMIZE_2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs"
+BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/pine64/overlay-initramfs"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
+# BR2_TARGET_ROOTFS_TAR is not set
+

From 8b97ee73795b88f97504a3177457aa1366e48e98 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Thu, 13 Jul 2017 22:41:25 +0300
Subject: [PATCH 04/31] raspberrypi2,3: update kernel

---
 configs/raspberrypi2_defconfig | 2 +-
 configs/raspberrypi3_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 98260b42c5..9703b22a9d 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/be2540e540f5442d7b372208787fb64100af0c54.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 07be432c8d..3b2fd157f2 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/be2540e540f5442d7b372208787fb64100af0c54.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"

From 0c8fbbf24cd545e526aaca69c40d0e887899e9f8 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Thu, 13 Jul 2017 22:45:02 +0300
Subject: [PATCH 05/31] raspberrypi: update kernel headers to 4.9

---
 configs/raspberrypi_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 436df7c94d..0baa73ccc5 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -5,7 +5,7 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi"
 BR2_OPTIMIZE_2=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_GCC_VERSION_4_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_OPTIMIZATION="-pipe"

From 105a5c6b30be04992f2bd754edda13cff00ef8ab Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Fri, 14 Jul 2017 18:53:36 +0300
Subject: [PATCH 06/31] pulseaudio depends on bluez5 as well

---
 package/pulseaudio/pulseaudio.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 74a028be45..6083bde20e 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -32,6 +32,7 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
 	$(if $(BR2_PACKAGE_DBUS),dbus) \
 	$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
+	$(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)

From d680f4080e2df0c5e25551512805b1238133bf26 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Wed, 19 Jul 2017 21:30:29 +0300
Subject: [PATCH 07/31] bluetooth init script: persist device cache on data
 partition

---
 board/common/overlay/etc/init.d/S37bluetooth | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/board/common/overlay/etc/init.d/S37bluetooth b/board/common/overlay/etc/init.d/S37bluetooth
index c70568fb38..c68cd9c8d6 100755
--- a/board/common/overlay/etc/init.d/S37bluetooth
+++ b/board/common/overlay/etc/init.d/S37bluetooth
@@ -18,9 +18,13 @@ test -n "$os_version" || source /etc/init.d/base
 
 hci=hci0
 bluetoothd=/usr/libexec/bluetooth/bluetoothd
-run_conf="/var/lib/bluetooth.conf"
+data_dir=/var/lib/bluetooth
+run_data_dir=/data/bluetooth
+run_conf=/var/lib/bluetooth.conf
 
 configure() {
+    mkdir -p $run_data_dir
+    ln -sf $run_data_dir $data_dir
     cp $conf $run_conf
 
     # if no specific name configured, use hostname

From 9d02ade3b1f25117d1a2d618ee50be7c4bcad054 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Wed, 19 Jul 2017 21:32:11 +0300
Subject: [PATCH 08/31] pulseaudio: enable/disable bluetooth based on bluez
 package selection

---
 package/pulseaudio/pulseaudio.mk | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 6083bde20e..0ab23707c9 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -31,8 +31,6 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
 	$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
 	$(if $(BR2_PACKAGE_DBUS),dbus) \
-	$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
-	$(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
@@ -81,6 +79,20 @@ else
 PULSEAUDIO_CONF_OPTS += --without-soxr
 endif
 
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_SBC),yy)
+PULSEAUDIO_CONF_OPTS += --enable-bluez4
+PULSEAUDIO_DEPENDENCIES += bluez_utils sbc
+else
+PULSEAUDIO_CONF_OPTS += --disable-bluez4
+endif
+
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy)
+PULSEAUDIO_CONF_OPTS += --enable-bluez5
+PULSEAUDIO_DEPENDENCIES += bluez5_utils sbc
+else
+PULSEAUDIO_CONF_OPTS += --disable-bluez5
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 PULSEAUDIO_CONF_OPTS += --enable-udev
 PULSEAUDIO_DEPENDENCIES += udev

From 8556a04e97fd164b30c7aa0acc77e5ca429251de Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 6 Aug 2017 11:12:47 +0300
Subject: [PATCH 09/31] remove Windows/Mac newlines from wpa_supplicant.conf

---
 board/common/overlay/etc/init.d/S35wifi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/board/common/overlay/etc/init.d/S35wifi b/board/common/overlay/etc/init.d/S35wifi
index a7c032f669..357ee80b56 100755
--- a/board/common/overlay/etc/init.d/S35wifi
+++ b/board/common/overlay/etc/init.d/S35wifi
@@ -32,6 +32,9 @@ fi
 
 test -f $conf || exit 0
 
+# we want only Unix newlines here
+sed -i 's/\r//g' $conf
+
 ssid=$(cat $conf | grep ssid | grep -v scan_ssid | cut -d '"' -f 2)
 test -n "$ssid" || exit 0
 

From 217053f76f84ce2099026a306c8e9372f1fb4403 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 6 Aug 2017 12:06:44 +0300
Subject: [PATCH 10/31] add adminpasswd script to conveniently update
 admin/root password

---
 board/common/overlay/etc/init.d/S00datapart |  4 ++
 board/common/overlay/etc/init.d/S21passwd   | 48 ---------------------
 board/common/overlay/etc/init.d/adminpw     |  4 --
 board/common/overlay/usr/sbin/adminpasswd   | 31 +++++++++++++
 4 files changed, 35 insertions(+), 52 deletions(-)
 delete mode 100755 board/common/overlay/etc/init.d/S21passwd
 delete mode 100755 board/common/overlay/etc/init.d/adminpw
 create mode 100755 board/common/overlay/usr/sbin/adminpasswd

diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart
index d8da86778b..603bc6fd7b 100755
--- a/board/common/overlay/etc/init.d/S00datapart
+++ b/board/common/overlay/etc/init.d/S00datapart
@@ -51,6 +51,10 @@ case "$1" in
         touch /data/etc/adjtime
         sync
         msg_done
+        
+        msg_begin "Setting empty root password"
+        PASSWORD="" adminpasswd
+        msg_done
 
         # mount other partitions depending on data
         mount -T /etc/fstab.disk -a
diff --git a/board/common/overlay/etc/init.d/S21passwd b/board/common/overlay/etc/init.d/S21passwd
deleted file mode 100755
index 542aaecc1d..0000000000
--- a/board/common/overlay/etc/init.d/S21passwd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-test -n "$os_version" || source /etc/init.d/base
-
-case "$1" in
-    start)
-        # make sure root and admin users exist in shadow file
-        touch /data/etc/shadow
-        chmod go-rwx /data/etc/shadow
-        if ! grep root /data/etc/shadow &>/dev/null; then
-            echo 'root::::::::' >> /data/etc/shadow
-        fi
-        if ! grep admin /data/etc/shadow &>/dev/null; then
-            echo 'admin::::::::' >> /data/etc/shadow
-        fi
-
-        # remove shadow backups
-        rm -f /data/etc/shadow+
-        rm -f /data/etc/shadow-
-
-        if [ -x /etc/init.d/adminpw ]; then
-            # set root and admin passwords (admin is just an alias for root)
-            password=$(/etc/init.d/adminpw)
-            msg_begin "Setting root password"
-
-            echo -en "$password\n$password\n" | passwd &>/dev/null # root
-            echo -en "$password\n$password\n" | passwd admin &>/dev/null # admin
-            
-            sed -r -i 's/root:([^:]+):[[:digit:]]+:/root:\1::/' /data/etc/shadow # removes pwd expiration
-            sed -r -i 's/admin:([^:]+):[[:digit:]]+:/admin:\1::/' /data/etc/shadow # removes pwd expiration
-            msg_done
-        fi
-
-        sync
-
-        ;;
-
-    stop)
-        true
-        ;;
-
-    *)
-        echo "Usage: $0 {start}"
-        exit 1
-esac
-
-exit $?
-
diff --git a/board/common/overlay/etc/init.d/adminpw b/board/common/overlay/etc/init.d/adminpw
deleted file mode 100755
index 2dbbc137ca..0000000000
--- a/board/common/overlay/etc/init.d/adminpw
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# echo your admin password here
-
diff --git a/board/common/overlay/usr/sbin/adminpasswd b/board/common/overlay/usr/sbin/adminpasswd
new file mode 100755
index 0000000000..d259d2edbe
--- /dev/null
+++ b/board/common/overlay/usr/sbin/adminpasswd
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# we verify the presence of the PASSWORD variable using env,
+# as it can also have an empty string value
+if ! env | grep PASSWORD &>/dev/null; then
+    echo "You must set the PASSWORD environment variable."
+    exit 1
+fi
+
+# make sure root and admin users exist in shadow file
+touch /data/etc/shadow
+chmod go-rwx /data/etc/shadow
+if ! grep root /data/etc/shadow &>/dev/null; then
+    echo 'root::::::::' >> /data/etc/shadow
+fi
+if ! grep admin /data/etc/shadow &>/dev/null; then
+    echo 'admin::::::::' >> /data/etc/shadow
+fi
+
+# remove shadow backups
+rm -f /data/etc/shadow+
+rm -f /data/etc/shadow-
+
+# set root and admin passwords (admin is just an alias for root)
+
+echo -en "$PASSWORD\n$PASSWORD\n" | passwd &>/dev/null # root
+echo -en "$PASSWORD\n$PASSWORD\n" | passwd admin &>/dev/null # admin
+
+sed -r -i 's/root:([^:]+):[[:digit:]]+:/root:\1::/' /data/etc/shadow # removes pwd expiration
+sed -r -i 's/admin:([^:]+):[[:digit:]]+:/admin:\1::/' /data/etc/shadow # removes pwd expiration
+

From 00a6a11c8b4070b4e165d80716013434c975a27f Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 6 Aug 2017 12:11:29 +0300
Subject: [PATCH 11/31] update motioneye

---
 package/motioneye/motioneye.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk
index 29fe62e585..f6d6c9fb64 100644
--- a/package/motioneye/motioneye.mk
+++ b/package/motioneye/motioneye.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MOTIONEYE_VERSION = b88712683382db22efbebaa643f65d8f4b9ec704
+MOTIONEYE_VERSION = 59a0d4e7a1eed09753db00d2f9be5c2e16dcd5f9
 MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
 MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
 MOTIONEYE_LICENSE = GPLv3

From 20efa99d613fa0d159b4f380a45636d3eb8972d7 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 6 Aug 2017 12:18:54 +0300
Subject: [PATCH 12/31] add password hook for motioneye

---
 board/common/overlay/etc/motioneye.conf     | 1 +
 board/common/overlay/usr/libexec/meyepasswd | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100755 board/common/overlay/usr/libexec/meyepasswd

diff --git a/board/common/overlay/etc/motioneye.conf b/board/common/overlay/etc/motioneye.conf
index 774921b3c1..4a633dc097 100644
--- a/board/common/overlay/etc/motioneye.conf
+++ b/board/common/overlay/etc/motioneye.conf
@@ -21,4 +21,5 @@ enable_update true
 smtp_timeout 60
 zip_timeout 500
 add_remove_cameras true
+password_hook /usr/libexec/meyepasswd
 
diff --git a/board/common/overlay/usr/libexec/meyepasswd b/board/common/overlay/usr/libexec/meyepasswd
new file mode 100755
index 0000000000..b59b1314ed
--- /dev/null
+++ b/board/common/overlay/usr/libexec/meyepasswd
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+test "$MEYE_USERNAME" == "admin" || exit 0
+PASSWORD="$MEYE_PASSWORD" /usr/sbin/adminpasswd
+

From 5e776bee93142285be0f55a029a8a381fb3e6ca5 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 6 Aug 2017 12:36:04 +0300
Subject: [PATCH 13/31] rcS: use /tmp/_boot.log as temporary boot log

---
 board/common/overlay/etc/init.d/rcS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/common/overlay/etc/init.d/rcS b/board/common/overlay/etc/init.d/rcS
index a7061a2b14..5f0d70cc09 100755
--- a/board/common/overlay/etc/init.d/rcS
+++ b/board/common/overlay/etc/init.d/rcS
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 boot_log=/var/log/boot.log
-tmp_boot_log=/tmp/boot.log
+tmp_boot_log=/tmp/_boot.log
 pid_file=/tmp/rc.pid
 
 source /etc/init.d/base

From b2e6a1ea6031265426fb4e4a3315b521822ebd81 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 6 Aug 2017 18:37:17 +0300
Subject: [PATCH 14/31] enable bluez packages by default

---
 board/common/overlay/etc/init.d/S04syslog | 2 +-
 configs/bananapi_defconfig                | 4 +++-
 configs/odroidc1_defconfig                | 1 +
 configs/odroidc2_defconfig                | 4 +++-
 configs/odroidxu4_defconfig               | 4 +++-
 configs/pine64_defconfig                  | 4 +++-
 configs/raspberrypi2_defconfig            | 4 +++-
 configs/raspberrypi3_defconfig            | 4 +++-
 configs/raspberrypi_defconfig             | 5 +++--
 9 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/board/common/overlay/etc/init.d/S04syslog b/board/common/overlay/etc/init.d/S04syslog
index e4fb1b4450..b7a1eb3ac4 100755
--- a/board/common/overlay/etc/init.d/S04syslog
+++ b/board/common/overlay/etc/init.d/S04syslog
@@ -9,7 +9,7 @@ case "$1" in
         msg_begin "Starting syslogd"
         syslogd
         test $? == 0 && msg_done || msg_fail
-        echo "---- booting $os_name $os_version----" >> $dmesg_log
+        echo "---- booting $os_name $os_version ----" >> $dmesg_log
         dmesg -T -w >> $dmesg_log &
         ;;
 
diff --git a/configs/bananapi_defconfig b/configs/bananapi_defconfig
index 1f2f5c7c48..c798038415 100644
--- a/configs/bananapi_defconfig
+++ b/configs/bananapi_defconfig
@@ -67,8 +67,10 @@ BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig
index 79b437d9fa..9dc6c343d2 100644
--- a/configs/odroidc1_defconfig
+++ b/configs/odroidc1_defconfig
@@ -65,6 +65,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
+BR2_PACKAGE_DBUS=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_NETTLE=y
diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig
index 3076cd8ba8..8ddbb21eb2 100644
--- a/configs/odroidc2_defconfig
+++ b/configs/odroidc2_defconfig
@@ -59,8 +59,10 @@ BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig
index 890c454192..c978649f61 100644
--- a/configs/odroidxu4_defconfig
+++ b/configs/odroidxu4_defconfig
@@ -61,8 +61,10 @@ BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index 477d225296..c7fdbf292a 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -58,8 +58,10 @@ BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 9703b22a9d..5b7221d2bb 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -64,8 +64,10 @@ BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 3b2fd157f2..b32eb28268 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -64,8 +64,10 @@ BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 0baa73ccc5..04c1c37d9c 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -5,7 +5,6 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi"
 BR2_OPTIMIZE_2=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_GCC_VERSION_4_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_OPTIMIZATION="-pipe"
@@ -67,8 +66,10 @@ BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCAP=y
-BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y

From 92ac82622795927d0147905100f90d8ae126f7f2 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 6 Aug 2017 19:11:32 +0300
Subject: [PATCH 15/31] bump version to 20170807

---
 board/common/overlay/etc/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version
index 1d666246ea..a7bf205b94 100644
--- a/board/common/overlay/etc/version
+++ b/board/common/overlay/etc/version
@@ -1,4 +1,4 @@
 os_name="motionEyeOS"
 os_short_name="motioneyeos"
 os_prefix="meye"
-os_version="20170502"
+os_version="20170807"

From 55dc2bae194994b462ac3f3c43bb9da88c70e7a4 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Fri, 25 Aug 2017 22:20:12 +0300
Subject: [PATCH 16/31] raspberrypi(all): update kernel, firmware & userland

---
 configs/raspberrypi2_defconfig       | 2 +-
 configs/raspberrypi3_defconfig       | 2 +-
 configs/raspberrypi_defconfig        | 2 +-
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 package/rpi-userland/rpi-userland.mk | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 2734cda5af..52b7a8d6bb 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/be2540e540f5442d7b372208787fb64100af0c54.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 278b1c5064..8fdaf3e5f7 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/be2540e540f5442d7b372208787fb64100af0c54.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 0d40f495c3..37e7cccf39 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/be2540e540f5442d7b372208787fb64100af0c54.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 43bd68d658..7ffd6babcb 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 6ba0dabbe76ce02d261cc4658c3484fa12b10385
+RPI_FIRMWARE_VERSION = b2420fc150ae4616f5d9ec24bdaedc630586a529
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index ae03f74566..7bd17826fe 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = aa3977538b04038628ff5b3a39a8e42ddcbc9176
+RPI_USERLAND_VERSION = 3caf0cd4a61f46b71eff49422c36e1cd2727ab45
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

From d1198a9beb76f06b6e13f70f7617c8b1fb5f77a1 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 12:58:58 +0300
Subject: [PATCH 17/31] S00datapart: always exit with a successful status

---
 board/common/overlay/etc/init.d/S00datapart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart
index 603bc6fd7b..f31fae8b21 100755
--- a/board/common/overlay/etc/init.d/S00datapart
+++ b/board/common/overlay/etc/init.d/S00datapart
@@ -70,5 +70,5 @@ case "$1" in
         exit 1
 esac
 
-exit $?
-
+# always exit with a successful status
+exit 0

From b61dc1073d59fbba816b5aacc955817743547a60 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 13:18:47 +0300
Subject: [PATCH 18/31] add data directory skeleton support

---
 board/common/overlay/etc/init.d/S00datapart         | 4 +---
 board/common/overlay/usr/share/dataskel/etc/.keep   | 0
 board/common/overlay/usr/share/dataskel/log/.keep   | 0
 board/common/overlay/usr/share/dataskel/media/.keep | 0
 4 files changed, 1 insertion(+), 3 deletions(-)
 create mode 100644 board/common/overlay/usr/share/dataskel/etc/.keep
 create mode 100644 board/common/overlay/usr/share/dataskel/log/.keep
 create mode 100644 board/common/overlay/usr/share/dataskel/media/.keep

diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart
index f31fae8b21..63582b5fe7 100755
--- a/board/common/overlay/etc/init.d/S00datapart
+++ b/board/common/overlay/etc/init.d/S00datapart
@@ -43,9 +43,7 @@ case "$1" in
         test $? == 0 && msg_done || msg_fail
 
         msg_begin "Creating required data files"
-        mkdir /data/etc
-        mkdir /data/log
-        mkdir -m 775 /data/media
+        cp -pur /usr/share/dataskel/* /data
         cp /etc/version /data/etc/version
         ln -s /usr/share/zoneinfo/UTC /data/etc/localtime
         touch /data/etc/adjtime
diff --git a/board/common/overlay/usr/share/dataskel/etc/.keep b/board/common/overlay/usr/share/dataskel/etc/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/board/common/overlay/usr/share/dataskel/log/.keep b/board/common/overlay/usr/share/dataskel/log/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/board/common/overlay/usr/share/dataskel/media/.keep b/board/common/overlay/usr/share/dataskel/media/.keep
new file mode 100644
index 0000000000..e69de29bb2

From 4ea65aaf7a3f8779b5903ff2ada0dab1df1fc7e7 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 13:20:52 +0300
Subject: [PATCH 19/31] add dataskel/output directory

---
 board/common/overlay/usr/share/dataskel/output/.keep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 board/common/overlay/usr/share/dataskel/output/.keep

diff --git a/board/common/overlay/usr/share/dataskel/output/.keep b/board/common/overlay/usr/share/dataskel/output/.keep
new file mode 100644
index 0000000000..e69de29bb2

From 2ad46909dfca0ace8f8b87613bac4c3fb5a2a51f Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 15:01:00 +0300
Subject: [PATCH 20/31] add adminpaswd.d hook directory support

---
 board/common/overlay/etc/adminpasswd.d/.keep | 0
 board/common/overlay/usr/sbin/adminpasswd    | 7 +++++++
 2 files changed, 7 insertions(+)
 create mode 100644 board/common/overlay/etc/adminpasswd.d/.keep

diff --git a/board/common/overlay/etc/adminpasswd.d/.keep b/board/common/overlay/etc/adminpasswd.d/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/board/common/overlay/usr/sbin/adminpasswd b/board/common/overlay/usr/sbin/adminpasswd
index d259d2edbe..bea2456ebd 100755
--- a/board/common/overlay/usr/sbin/adminpasswd
+++ b/board/common/overlay/usr/sbin/adminpasswd
@@ -29,3 +29,10 @@ echo -en "$PASSWORD\n$PASSWORD\n" | passwd admin &>/dev/null # admin
 sed -r -i 's/root:([^:]+):[[:digit:]]+:/root:\1::/' /data/etc/shadow # removes pwd expiration
 sed -r -i 's/admin:([^:]+):[[:digit:]]+:/admin:\1::/' /data/etc/shadow # removes pwd expiration
 
+# call admin password hooks in /etc/adminpasswd.d
+if [ -d /etc/adminpasswd.d ]; then
+    for script in /etc/adminpasswd.d/*; do
+        test -x $script && $script
+    done
+fi
+

From 218ad5aa44afc3b16477ed2ac162584850050a4c Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 15:17:37 +0300
Subject: [PATCH 21/31] add /data/varlib directory

---
 board/common/overlay/usr/share/dataskel/varlib/.keep | 0
 board/common/postscript.sh                           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 board/common/overlay/usr/share/dataskel/varlib/.keep

diff --git a/board/common/overlay/usr/share/dataskel/varlib/.keep b/board/common/overlay/usr/share/dataskel/varlib/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/board/common/postscript.sh b/board/common/postscript.sh
index ec3d4446ed..a24f1d9e90 100755
--- a/board/common/postscript.sh
+++ b/board/common/postscript.sh
@@ -11,7 +11,7 @@ mkdir -p $BOOT_DIR
 
 test -x $BOARD_DIR/postscript.sh && $BOARD_DIR/postscript.sh
 
-# transform /var contents into symlinks
+# transform /var contents as needed
 rm -rf $TARGET/var/cache
 rm -rf $TARGET/var/lib
 rm -rf $TARGET/var/lock
@@ -21,7 +21,7 @@ rm -rf $TARGET/var/spool
 rm -rf $TARGET/var/tmp
 
 ln -s /tmp $TARGET/var/cache
-ln -s /tmp $TARGET/var/lib
+ln -s /data/varlib $TARGET/var/lib
 ln -s /tmp $TARGET/var/lock
 ln -s /data/log $TARGET/var/log
 ln -s /tmp $TARGET/var/run

From 3638c8da1d4ec00c31048c57421006b77207b566 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 15:22:56 +0300
Subject: [PATCH 22/31] samba: use /var/lib/samba/secrets

---
 board/common/overlay/etc/adminpasswd.d/samba | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 board/common/overlay/etc/adminpasswd.d/samba

diff --git a/board/common/overlay/etc/adminpasswd.d/samba b/board/common/overlay/etc/adminpasswd.d/samba
new file mode 100755
index 0000000000..4c5d67eb06
--- /dev/null
+++ b/board/common/overlay/etc/adminpasswd.d/samba
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo -e "$PASSWORD\n$PASSWORD\n" | /usr/bin/smbpasswd -a admin -s > /dev/null

From aed29bee21083f0ac19be22329ff7354823325db Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 16:48:07 +0300
Subject: [PATCH 23/31] update motioneye

---
 package/motioneye/motioneye.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk
index f6d6c9fb64..0dd1276392 100644
--- a/package/motioneye/motioneye.mk
+++ b/package/motioneye/motioneye.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MOTIONEYE_VERSION = 59a0d4e7a1eed09753db00d2f9be5c2e16dcd5f9
+MOTIONEYE_VERSION = fc55fffc43e190a8f6baa4a857094d365271bc0e
 MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
 MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
 MOTIONEYE_LICENSE = GPLv3

From ec959849c1e039576567600d4cf684a48acf400c Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 16:49:03 +0300
Subject: [PATCH 24/31] bump version to 20170827

---
 board/common/overlay/etc/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version
index a7bf205b94..ab73e3cfa3 100644
--- a/board/common/overlay/etc/version
+++ b/board/common/overlay/etc/version
@@ -1,4 +1,4 @@
 os_name="motionEyeOS"
 os_short_name="motioneyeos"
 os_prefix="meye"
-os_version="20170807"
+os_version="20170827"

From 660861188a74aa1723c51e1682016b2239d3b6b1 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 22:10:49 +0300
Subject: [PATCH 25/31] samba password fixes

---
 board/common/overlay/etc/adminpasswd.d/samba | 2 ++
 board/common/overlay/etc/init.d/S62smb       | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/board/common/overlay/etc/adminpasswd.d/samba b/board/common/overlay/etc/adminpasswd.d/samba
index 4c5d67eb06..ecf15c6a02 100755
--- a/board/common/overlay/etc/adminpasswd.d/samba
+++ b/board/common/overlay/etc/adminpasswd.d/samba
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+mkdir -p /var/lib/samba/private
 echo -e "$PASSWORD\n$PASSWORD\n" | /usr/bin/smbpasswd -a admin -s > /dev/null
+
diff --git a/board/common/overlay/etc/init.d/S62smb b/board/common/overlay/etc/init.d/S62smb
index f7d3ebd102..061ee3cb35 100755
--- a/board/common/overlay/etc/init.d/S62smb
+++ b/board/common/overlay/etc/init.d/S62smb
@@ -8,15 +8,9 @@ test -n "$os_debug" || source /etc/init.d/conf
 test "$os_networkless" == "true" && exit 0
 
 start() {
-    msg_begin "Setting smb admin password"
-    
     mkdir -p /var/log/samba
     mkdir -p /var/lib/samba/private
 
-    password=$(/etc/init.d/adminpw)
-    echo -e "$password\n$password\n" | /usr/bin/smbpasswd -a admin -s > /dev/null
-    test $? == 0 && msg_done || msg_fail
-
     msg_begin "Starting smbd"
     smbd -D
     test $? == 0 && msg_done || msg_fail

From 5f0594e088049e0b1e8385e6085b83d024bcbcfd Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 22:22:09 +0300
Subject: [PATCH 26/31] samba: don't bind interfaces

---
 board/common/overlay/etc/samba/smb.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/board/common/overlay/etc/samba/smb.conf b/board/common/overlay/etc/samba/smb.conf
index 652b03952e..a10b0444f0 100644
--- a/board/common/overlay/etc/samba/smb.conf
+++ b/board/common/overlay/etc/samba/smb.conf
@@ -12,8 +12,6 @@
    printing = bsd
    printcap name = /dev/null
    disable spoolss = yes
-   bind interfaces only = yes
-   interfaces = eth0 wlan0
    log level = 0
    syslog = 0
    preferred master = no

From 5d4cad58607c43d2a92508688fe5a9cd93c08af3 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 22:53:12 +0300
Subject: [PATCH 27/31] add post-upgrade script for password_hook

---
 board/common/overlay/usr/share/post-upgrade/20170827.sh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 board/common/overlay/usr/share/post-upgrade/20170827.sh

diff --git a/board/common/overlay/usr/share/post-upgrade/20170827.sh b/board/common/overlay/usr/share/post-upgrade/20170827.sh
new file mode 100644
index 0000000000..fc28fd2c2a
--- /dev/null
+++ b/board/common/overlay/usr/share/post-upgrade/20170827.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# add password_hook motioneye setting
+grep password_hook /data/etc/motioneye.conf &>/dev/null || echo -e 'password_hook /usr/libexec/meyepasswd' >> /data/etc/motioneye.conf
+

From 29792708106b2e425bc570d0ad2ff794ab6b15eb Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 26 Aug 2017 23:03:12 +0300
Subject: [PATCH 28/31] remove all .empty files from target filesystem

---
 board/common/cleanups.sh                                        | 2 +-
 board/common/overlay/etc/adminpasswd.d/{.keep => .empty}        | 0
 board/common/overlay/usr/share/dataskel/etc/{.keep => .empty}   | 0
 board/common/overlay/usr/share/dataskel/log/{.keep => .empty}   | 0
 board/common/overlay/usr/share/dataskel/media/{.keep => .empty} | 0
 .../common/overlay/usr/share/dataskel/varlib/{.keep => .empty}  | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename board/common/overlay/etc/adminpasswd.d/{.keep => .empty} (100%)
 rename board/common/overlay/usr/share/dataskel/etc/{.keep => .empty} (100%)
 rename board/common/overlay/usr/share/dataskel/log/{.keep => .empty} (100%)
 rename board/common/overlay/usr/share/dataskel/media/{.keep => .empty} (100%)
 rename board/common/overlay/usr/share/dataskel/varlib/{.keep => .empty} (100%)

diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh
index 609200eb7c..720243afc6 100755
--- a/board/common/cleanups.sh
+++ b/board/common/cleanups.sh
@@ -5,7 +5,7 @@ if [ -z "$TARGET" ]; then
     exit 1
 fi
 
-rm -f $TARGET/boot/.gitkeep
+find $TARGET -name '.empty' | xargs -r rm
 
 # /etc stuff
 rm -rf $TARGET/etc/network/
diff --git a/board/common/overlay/etc/adminpasswd.d/.keep b/board/common/overlay/etc/adminpasswd.d/.empty
similarity index 100%
rename from board/common/overlay/etc/adminpasswd.d/.keep
rename to board/common/overlay/etc/adminpasswd.d/.empty
diff --git a/board/common/overlay/usr/share/dataskel/etc/.keep b/board/common/overlay/usr/share/dataskel/etc/.empty
similarity index 100%
rename from board/common/overlay/usr/share/dataskel/etc/.keep
rename to board/common/overlay/usr/share/dataskel/etc/.empty
diff --git a/board/common/overlay/usr/share/dataskel/log/.keep b/board/common/overlay/usr/share/dataskel/log/.empty
similarity index 100%
rename from board/common/overlay/usr/share/dataskel/log/.keep
rename to board/common/overlay/usr/share/dataskel/log/.empty
diff --git a/board/common/overlay/usr/share/dataskel/media/.keep b/board/common/overlay/usr/share/dataskel/media/.empty
similarity index 100%
rename from board/common/overlay/usr/share/dataskel/media/.keep
rename to board/common/overlay/usr/share/dataskel/media/.empty
diff --git a/board/common/overlay/usr/share/dataskel/varlib/.keep b/board/common/overlay/usr/share/dataskel/varlib/.empty
similarity index 100%
rename from board/common/overlay/usr/share/dataskel/varlib/.keep
rename to board/common/overlay/usr/share/dataskel/varlib/.empty

From e8811289e0b83033e0a1e0020121bb31f0eb2a19 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 27 Aug 2017 12:25:50 +0300
Subject: [PATCH 29/31] update motioneye

---
 package/motioneye/motioneye.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk
index 0dd1276392..30995b71ad 100644
--- a/package/motioneye/motioneye.mk
+++ b/package/motioneye/motioneye.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MOTIONEYE_VERSION = fc55fffc43e190a8f6baa4a857094d365271bc0e
+MOTIONEYE_VERSION = 0d54fa9e693a85c3b3867ca0bac6c19ce3111b54
 MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
 MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
 MOTIONEYE_LICENSE = GPLv3

From 3304617aa7923fc13fe479def63f256ba4c6a36d Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 27 Aug 2017 12:35:02 +0300
Subject: [PATCH 30/31] update motioneye

---
 package/motioneye/motioneye.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk
index 30995b71ad..158ecdc054 100644
--- a/package/motioneye/motioneye.mk
+++ b/package/motioneye/motioneye.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MOTIONEYE_VERSION = 0d54fa9e693a85c3b3867ca0bac6c19ce3111b54
+MOTIONEYE_VERSION = 9d546ec1aa8da1fe27ad5c0ad212bdb2baf8dce1
 MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
 MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
 MOTIONEYE_LICENSE = GPLv3

From 7d06971e5988f57d39b6ed3c30b1443d62fbfe13 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 27 Aug 2017 13:40:36 +0300
Subject: [PATCH 31/31] enable libssh2 package

---
 configs/bananapi_defconfig     | 1 +
 configs/odroidc1_defconfig     | 1 +
 configs/odroidc2_defconfig     | 1 +
 configs/odroidxu4_defconfig    | 1 +
 configs/pine64_defconfig       | 1 +
 configs/raspberrypi2_defconfig | 1 +
 configs/raspberrypi3_defconfig | 1 +
 configs/raspberrypi_defconfig  | 1 +
 8 files changed, 8 insertions(+)

diff --git a/configs/bananapi_defconfig b/configs/bananapi_defconfig
index c798038415..73080df6d7 100644
--- a/configs/bananapi_defconfig
+++ b/configs/bananapi_defconfig
@@ -62,6 +62,7 @@ BR2_PACKAGE_SUNXI_BOARDS=y
 BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/Bananapi.fex"
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig
index 9dc6c343d2..d4f3870d98 100644
--- a/configs/odroidc1_defconfig
+++ b/configs/odroidc1_defconfig
@@ -68,6 +68,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
 BR2_PACKAGE_DBUS=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig
index 8ddbb21eb2..6f6d3dc616 100644
--- a/configs/odroidc2_defconfig
+++ b/configs/odroidc2_defconfig
@@ -54,6 +54,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig
index c978649f61..2032b4fc32 100644
--- a/configs/odroidxu4_defconfig
+++ b/configs/odroidxu4_defconfig
@@ -56,6 +56,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index c7fdbf292a..35986fe15e 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -53,6 +53,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 5b7221d2bb..390e3d44b5 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -59,6 +59,7 @@ BR2_PACKAGE_RPI_FIRMWARE_X=y
 BR2_PACKAGE_RPI_USERLAND=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index b32eb28268..158c0d52cf 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -59,6 +59,7 @@ BR2_PACKAGE_RPI_FIRMWARE_X=y
 BR2_PACKAGE_RPI_USERLAND=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 04c1c37d9c..019b10db5b 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -61,6 +61,7 @@ BR2_PACKAGE_RPI_ARMMEM=y
 BR2_PACKAGE_RPI_USERLAND=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y