Apply 20170827 changes excluding password changes

jasaw · Sep 21, 2017 · de7e020 · de7e020
1 parent 0ca2acb
commit de7e020
Show file tree

Hide file tree

Showing 22 changed files with 93 additions and 211 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,5 @@
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y bc
+
+script: ./build.sh raspberrypi all > /dev/null
diff --git 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
 

diff --git 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

diff --git a/board/common/overlay/etc/issue b/board/common/overlay/etc/issue
@@ -1,5 +1 @@
 Welcome to \n!
-
-If you want to see a friendly user interface,
-point your web browser to the IP address of this board.
-
diff --git a/board/common/overlay/etc/samba/smb.conf b/board/common/overlay/etc/samba/smb.conf
@@ -1,6 +1,6 @@
 [global]
-   workgroup = WORKGROUP
-   server string = %h motionEye
+   workgroup = MOTIONEYE
+   server string = motionEye
    security = user
    map to guest = bad user
    encrypt passwords = yes

diff --git a/build.sh b/build.sh
@@ -13,7 +13,7 @@ cd $(dirname $0)
 basedir=$(pwd)
 osname=$(source $basedir/board/common/overlay/etc/version && echo $os_short_name)
 osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version)
-gzip=$(which pigz 2> /dev/null || which gzip 2> /dev/null)
+gzip=$(which pigz || which gzip)
 
 if [ "$board" == "all" ]; then
     boards=$(ls $basedir/configs/*_defconfig | grep -v initramfs | grep -oE '\w+_defconfig$' | cut -d '_' -f 1)

diff --git a/configs/bananapi_defconfig b/configs/bananapi_defconfig
@@ -78,6 +78,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG=y
@@ -90,8 +91,10 @@ BR2_PACKAGE_X265=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
@@ -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
@@ -71,6 +71,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_PYTHON_SSL=y
 BR2_PACKAGE_PYTHON_HASHLIB=y
@@ -82,6 +83,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG=y

diff --git 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"
@@ -70,6 +70,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG=y
@@ -82,8 +83,10 @@ BR2_PACKAGE_X265=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
@@ -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"
@@ -72,6 +72,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG=y
@@ -84,8 +85,10 @@ BR2_PACKAGE_X265=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
@@ -69,6 +69,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG=y
@@ -81,8 +82,10 @@ BR2_PACKAGE_X265=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_initramfs_defconfig 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
+
diff --git 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/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
@@ -79,6 +79,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG=y
@@ -91,8 +92,10 @@ BR2_PACKAGE_X265=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
@@ -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/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
@@ -79,6 +79,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG=y
@@ -91,8 +92,10 @@ BR2_PACKAGE_X265=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
@@ -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_4=y
 BR2_GCC_VERSION_4_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_OPTIMIZATION="-pipe"
@@ -16,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/04c8e47067d4873c584395e5cb260b4f170a99ea.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"
@@ -82,6 +81,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG=y
@@ -95,8 +95,10 @@ BR2_PACKAGE_X265=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/package/motion/motion.mk b/package/motion/motion.mk
@@ -14,5 +14,12 @@ define MOTION_INSTALL_TARGET_CMDS
     cp $(@D)/motion $(TARGET_DIR)/usr/bin/motion
 endef
 
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+MOTION_DEPENDENCIES += rpi-userland
+MOTION_CONF_OPTS += \
+        --with-mmal-include=$(STAGING_DIR)/usr/include \
+        --with-mmal-lib=$(STAGING_DIR)/lib
+endif
+
 $(eval $(autotools-package))