Merge pull request #85 from home-assistant/dev

Beta 2.0

Documentation/bluetooth.md

@@ -1,12 +0,0 @@
-# Bluetooth
-
-We support `bluetoothctl` on host. Later we want also support bluetooth trought UI.
-All pairs and settings are persistent over reboots and updates.
-
-If you want setup bluetooth on host, use the *bluetoothctl* utility.
-
-## Scan devices
-
-```
-[bluetooth]# scan on
-```

Documentation/boards/raspberrypi.md

@@ -1,23 +1,5 @@
 # Raspberry PI
 
-Supported Hardware:
-
-| Device | Board | 
-|--------|-----------|
-| Raspberry Pi A+/B/B+| rpi |
-| Raspberry Pi Zero | rpi |
-| Raspberry Pi Zero W | rpi0-w |
-| Raspberry Pi 2 B | rpi2 |
-| Raspberry Pi 3 B/B+ | rpi3 / rpi3-64 |
-
-## Limitation 64bit
-
-The 64bit version is under development by RPi-Team. It work very nice but it could have some impacts. Actual we see that the SDcard access with ext4 are a bit slower than on 32bit.
-
 ## Serial console
 
 For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1` into `config.txt`.
-
-## Tweaks
-
-If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.

Documentation/configuration.md

@@ -2,23 +2,19 @@
 
 ## Automatic
 
-You can use an USB drive with HassOS to configure network options, SSH access to the host and to install updates.
+You can use a USB drive with HassOS to configure network options, ssh access to the host, and to install updates.
-Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
+Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Use the following directory structure within the USB drive:
 
 ```
 network/
 modules/
-udev/
 authorized_keys
-timesyncd.conf
 hassos-xy.raucb
 ```
 
 - The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md]. 
 - The `modules` folder is for modules-load configuration files.
-- The `udev` folder is for udev rules files.
 - The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
-- The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
 - The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page. 
 
 You can put this USB stick into the device and it will be read on startup. You can also trigger this process later over the
@@ -34,10 +30,6 @@ You can edit or create a `cmdline.txt` into your boot partition. That will be re
 
 The kernel module folder `/etc/modules-load.d` is persistent and you can add your config files there. See [Systemd modules load][systemd-modules].
 
-### Udev rules
-
-The udev rules folder `/etc/udev/rules.d` is persistent and you can add your configuration files there.
-
 ### Network
 
 You can manual add, edit or remove connections configs from `/etc/NetworkManager/system-connections`.

Documentation/deployment.md

@@ -21,7 +21,3 @@ The branch `dev` ist the actual development branch and from there we never make
 version from they we build a beta release.
 
 If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the hole cycle of this release.
-
-## Upload release files
-
-We use [ghr](https://github.com/tcnksm/ghr) to upload files to our repository. A binary version is available inside `scripts`.

Documentation/kernel.md

@@ -1,7 +0,0 @@
-
-# Kernel Version
-
-| Board | Version |
-|-------|---------|
-| Open Virtual Applicance | 4.14.82 |
-| Raspberry Pi | 4.14.81 |

Documentation/network.md

@@ -1,10 +1,11 @@
 # Network
 
-HassOS uses NetworkManager to control the host network. In future releases, you will be able to set up the configuration using the API/UI. Currently only manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive as described in [Configuration][configuration-usb].
+HassOS uses NetworkManager to control the host network. In future releases, you can set up the configuration using the API/UI.
+Currently only manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive as described in [Configuration][configuration-usb].
 
 ## Configuration Examples
 
-You can also read the [Official Manual][keyfile] or there are a lot of examples accross internet. The system is read only, if you don't want the IP address to change every boot, you should set the uuid property with a generic [UUID4][uuid]. Inside the `network` folder create the file `my-network` and add the appropriate contents below:
+You can look also into [Official Manual][keyfile] or there are a lot of examples accross internet. The system is read only, if you not want change the IP address every boot, you should set the uuid property with a generic [UUID4][uuid].
 
 ### Default
 
@@ -45,11 +46,11 @@ id=hassos-network
 uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
 type=802-11-wireless
 
-[802-11-wireless]
+[wifi]
 mode=infrastructure
 ssid=MY_SSID
 
-[802-11-wireless-security]
+[wifi-security]
 auth-alg=open
 key-mgmt=wpa-psk
 psk=MY_WLAN_SECRED_KEY

buildroot-external/Config.in

@@ -1,4 +1,3 @@
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hassos/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"

buildroot-external/board/ova/kernel.config

@@ -1,18 +1 @@
-CONFIG_EFI_STUB=y
+CONFIG_EFI_STUB=y
-
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_ACM=m
-
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_BLK=m
-
-CONFIG_USB_XHCI_HCD=y

buildroot-external/board/raspberrypi/kernel.config

@@ -1 +0,0 @@
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

buildroot-external/board/raspberrypi/rpi3-64/uboot-boot.sh

@@ -11,8 +11,7 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
 
 # Preserve origin bootargs
 setenv bootargs_rpi
-setenv fdt_org ${fdt_addr}
+fdt addr ${fdt_addr}
-fdt addr ${fdt_org}
 fdt get value bootargs_rpi /chosen bootargs
 
 setenv bootargs
@@ -36,7 +35,6 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
   fi
 done
 
-setenv fdt_addr
 if test -n "${bootargs}"; then
   saveenv
 else
@@ -50,7 +48,7 @@ fi
 echo "Loading kernel"
 run load_kernel
 echo " Starting kernel"
-booti ${kernel_addr_r} - ${fdt_org}
+booti ${kernel_addr_r} - ${fdt_addr}
 
 echo "Fails on boot"
 reset

buildroot-external/board/raspberrypi/uboot-boot.sh

@@ -11,8 +11,7 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
 
 # Preserve origin bootargs
 setenv bootargs_rpi
-setenv fdt_org ${fdt_addr}
+fdt addr ${fdt_addr}
-fdt addr ${fdt_org}
 fdt get value bootargs_rpi /chosen bootargs
 
 setenv bootargs
@@ -36,7 +35,6 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
   fi
 done
 
-setenv fdt_addr
 if test -n "${bootargs}"; then
   saveenv
 else
@@ -50,7 +48,7 @@ fi
 echo "Loading kernel"
 run load_kernel
 echo " Starting kernel"
-bootz ${kernel_addr_r} - ${fdt_org}
+bootz ${kernel_addr_r} - ${fdt_addr}
 
 echo "Fails on boot"
 reset

buildroot-external/bootloader/barebox/boot/system0

@@ -3,6 +3,6 @@
 global linux.bootargs.dyn.root="root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
 
 mkdir -p /mnt/system
-mount -t ext4 /dev/disk*.hassos-kernel0 /mnt/system
+mount -t ext4 /dev/disk0.hassos-kernel0 /mnt/system
 
 global bootm.image="/mnt/system/bzImage"

buildroot-external/bootloader/barebox/boot/system1

@@ -3,6 +3,6 @@
 global linux.bootargs.dyn.root="root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
 
 mkdir -p /mnt/system
-mount -t ext4 /dev/disk*.hassos-kernel1 /mnt/system
+mount -t ext4 /dev/disk0.hassos-kernel1 /mnt/system
 
 global bootm.image="/mnt/system/bzImage"

buildroot-external/bootloader/barebox/menu/10-boot-A/action

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-global linux.bootargs.bootchooser="bootchooser.active=A"
-
 boot system0

buildroot-external/bootloader/barebox/menu/20-boot-B/action

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-global linux.bootargs.bootchooser="bootchooser.active=B"
-
 boot system1

buildroot-external/busybox.config

@@ -398,7 +398,7 @@ CONFIG_SHOWKEY=y
 CONFIG_AWK=y
 CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
-CONFIG_CMP=y
+# CONFIG_CMP is not set
 # CONFIG_DIFF is not set
 # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
 # CONFIG_FEATURE_DIFF_DIR is not set

buildroot-external/configs/ova_defconfig

@@ -18,7 +18,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/post-image.s
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.82"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.41"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -40,8 +40,6 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_BLUEZ5_UTILS=y
-BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -77,12 +75,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="140"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="7"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi0_w_defconfig

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6878de4d2818c2256b2a340eaeeabfb0b24c71b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w"
@@ -48,8 +48,6 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_BLUEZ5_UTILS=y
-BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -86,14 +84,13 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="140"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="7"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi2_defconfig

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6878de4d2818c2256b2a340eaeeabfb0b24c71b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
@@ -47,8 +47,6 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_BLUEZ5_UTILS=y
-BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -85,12 +83,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="140"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="7"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/configs/rpi3_64_defconfig

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6878de4d2818c2256b2a340eaeeabfb0b24c71b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus"
@@ -35,8 +35,8 @@ BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -48,8 +48,6 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_BLUEZ5_UTILS=y
-BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -86,14 +84,13 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="140"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="7"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi3_defconfig

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6878de4d2818c2256b2a340eaeeabfb0b24c71b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
@@ -35,8 +35,8 @@ BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -48,8 +48,6 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_BLUEZ5_UTILS=y
-BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -86,14 +84,13 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="140"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="7"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi_defconfig

@@ -21,9 +21,9 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6878de4d2818c2256b2a340eaeeabfb0b24c71b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
@@ -47,8 +47,6 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_BLUEZ5_UTILS=y
-BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -85,12 +83,12 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="140"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="115"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="7"
+BR2_PACKAGE_HASSOS_CLI_VERSION="6"
 BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"

buildroot-external/info

@@ -1,7 +1,7 @@
-VERSION_MAJOR=1
+VERSION_MAJOR=2
-VERSION_BUILD=13
+VERSION_BUILD=0
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="production"
+DEPLOYMENT="development"

buildroot-external/misc/rauc-hook

@@ -1,8 +1,5 @@
 #!/bin/sh
 
-##
-# Hooks
-
 # Handle boot hocks
 if [ "${RAUC_SLOT_CLASS}" = "boot" ]; then
     if [ "${1}" = "slot-post-install" ]; then
@@ -12,17 +9,4 @@ if [ "${RAUC_SLOT_CLASS}" = "boot" ]; then
     fi
 fi
 
-##
-# Fixups
-
-# timesyncd
-if [ -L /var/lib/systemd/timesync ]; then
-    rm -f /var/lib/systemd/timesync
-fi
-
-# u-boot first stage device tree
-if [ -e /usr/sbin/fw_setenv ]; then
-    fw_setenv fdt_addr
-fi
-
 exit 0

buildroot-external/package/bluetooth-bcm43xx/Config.in

@@ -1,6 +0,0 @@
-config BR2_PACKAGE_BLUETOOTH_BCM43XX
-	bool "bluetooth bcm43xx"
-	depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
-	select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
-	help
-	  Install bluetooth for bcm43xx. 

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-HCIATTACH=/usr/bin/hciattach
-SERIAL=`cat /proc/device-tree/serial-number | cut -c9-`
-B1=`echo $SERIAL | cut -c3-4`
-B2=`echo $SERIAL | cut -c5-6`
-B3=`echo $SERIAL | cut -c7-8`
-BDADDR=`printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa))`
-
-if [ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ] ; then
-    if [ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ] ; then
-        $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
-    else
-		$HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
-    fi
-else
-    $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
-fi

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk

@@ -1,31 +0,0 @@
-################################################################################
-#
-# Bluetooth BCM43xx
-#
-################################################################################
-
-BLUETOOTH_BCM43XX_VERSION = 1.0.0
-BLUETOOTH_BCM43XX_LICENSE = Apache License 2.0
-BLUETOOTH_BCM43XX_LICENSE_FILES = $(BR2_EXTERNAL_HASSOS_PATH)/../LICENSE
-BLUETOOTH_BCM43XX_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/bluetooth-bcm43xx
-BLUETOOTH_BCM43XX_SITE_METHOD = local
-
-define BLUETOOTH_BCM43XX_BUILD_CMDS
-	curl -o $(@D)/BCM43430A1.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/ade2bae1aaaebede09abb8fb546f767a0e4c7804/broadcom/BCM43430A1.hcd
-	curl -o $(@D)/BCM4345C0.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/ade2bae1aaaebede09abb8fb546f767a0e4c7804/broadcom/BCM4345C0.hcd
-endef
-
-define BLUETOOTH_BCM43XX_INSTALL_TARGET_CMDS
-	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
-	$(INSTALL) -m 0755 $(@D)/bluetooth-bcm43xx $(TARGET_DIR)/usr/sbin/
-	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.service $(TARGET_DIR)/usr/lib/systemd/system/
-	ln -fs /usr/lib/systemd/system/bluetooth-bcm43xx.service $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants/
-
-	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
-	$(INSTALL) -m 0644 $(@D)/*.hcd $(TARGET_DIR)/lib/firmware/brcm/
-
-	$(INSTALL) -d $(TARGET_DIR)/usr/lib/udev/rules.d
-	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.rules $(TARGET_DIR)/usr/lib/udev/rules.d/
-endef
-
-$(eval $(generic-package))

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.rules

@@ -1,22 +0,0 @@
-KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
-        ALIASES=/proc/device-tree/aliases; \
-        if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
-                echo 0;\
-        elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
-                echo 1; \
-        else \
-                exit 1; \
-        fi\
-'", SYMLINK+="serial%c"
-
-KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
-        ALIASES=/proc/device-tree/aliases; \
-        if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
-                echo 0; \
-        elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
-                echo 1; \
-        else \
-                exit 1; \
-        fi \
-'", SYMLINK+="serial%c"
-

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Bluetooth for BCM43xx
-Before=bluetooth.service
-After=dev-ttyAMA0.device
-ConditionFileNotEmpty=/proc/device-tree/soc/gpio@7e200000/bt_pins/brcm,pins
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/bluetooth-bcm43xx
-
-[Install]
-WantedBy=hassos-hardware.target

buildroot-external/rootfs-overlay/etc/acpi/PWRF/00000080

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# This script is exec()d by acpid when an ACPI event signals the power button
-# to have been pressed.
-
-echo "System power button was pressed - shutting down..."
-exec /bin/systemctl poweroff

buildroot-external/rootfs-overlay/etc/bluetooth/main.conf

@@ -1,2 +0,0 @@
-[Policy]
-AutoEnable=true

buildroot-external/rootfs-overlay/etc/resolv.conf

@@ -1 +1 @@
-/run/resolv.conf
+/run/NetworkManager/resolv.conf

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-systemd-timesyncd.conf.mount

@@ -1 +0,0 @@
-/usr/lib/systemd/system/etc-systemd-timesyncd.conf.mount

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-udev-rules.d.mount

@@ -1 +0,0 @@
-/usr/lib/systemd/system/etc-udev-rules.d.mount

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-bluetooth.mount

@@ -1 +0,0 @@
-/usr/lib/systemd/system/var-lib-bluetooth.mount

buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/busybox-acpid.service

@@ -1 +0,0 @@
-/usr/lib/systemd/system/busybox-acpid.service

buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-hardware.target

@@ -1 +0,0 @@
-/usr/lib/systemd/system/hassos-hardware.target

buildroot-external/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/hassos.conf

@@ -1,2 +0,0 @@
-[Unit]
-RequiresMountsFor=/var/lib/systemd

buildroot-external/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/ro.conf

@@ -1,2 +0,0 @@
-[Service]
-DynamicUser=no

buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf

@@ -1,4 +1,3 @@
 # Cleanup lease files
 e /var/lib/NetworkManager/*.lease - - - 14d
 C /mnt/overlay/etc/NetworkManager/system-connections - - - - /usr/share/system-connections
-f /run/resolv.conf - - - -

buildroot-external/rootfs-overlay/etc/tmpfiles.d/timesyncd.conf

@@ -1 +0,0 @@
-C /mnt/overlay/etc/systemd/timesyncd.conf - - - - /etc/systemd/timesyncd.conf

buildroot-external/rootfs-overlay/usr/lib/systemd/system/busybox-acpid.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=acpid (busybox)
-RefuseManualStop=true
-After=sysinit.target
-ConditionPathIsDirectory=/proc/acpi
-
-[Service]
-Type=simple
-ExecStart=/sbin/acpid -d
-
-[Install]
-WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-systemd-timesyncd.conf.mount

@@ -1,14 +0,0 @@
-[Unit]
-Description=Timesyncd persistent configuration
-Requires=mnt-overlay.mount
-After=mnt-overlay.mount systemd-tmpfiles-setup.service
-Before=systemd-timesyncd.service
-
-[Mount]
-What=/mnt/overlay/etc/systemd/timesyncd.conf
-Where=/etc/systemd/timesyncd.conf
-Type=none
-Options=bind
-
-[Install]
-WantedBy=hassos-bind.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-udev-rules.d.mount

@@ -1,14 +0,0 @@
-[Unit]
-Description=Udev persistent rules.d
-Requires=mnt-overlay.mount
-After=mnt-overlay.mount
-Before=systemd-udevd.service hassos-config.service
-
-[Mount]
-What=/mnt/overlay/etc/udev/rules.d
-Where=/etc/udev/rules.d
-Type=None
-Options=bind
-
-[Install]
-WantedBy=hassos-bind.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-hardware.target

@@ -1,3 +0,0 @@
-[Unit]
-Description=HassOS hardware targets
-Documentation=man:systemd.target(5)

buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-bluetooth.mount

@@ -1,14 +0,0 @@
-[Unit]
-Description=Bluetooth persistent state
-Requires=mnt-overlay.mount
-After=mnt-overlay.mount
-Before=bluetooth.service
-
-[Mount]
-What=/mnt/overlay/var/lib/bluetooth
-Where=/var/lib/bluetooth
-Type=None
-Options=bind
-
-[Install]
-WantedBy=hassos-bind.target

buildroot-external/rootfs-overlay/usr/lib/udev/rules.d/hmip-rfusb.rules

@@ -1 +0,0 @@
-ACTION=="add", ATTRS{idVendor}=="1b1f", ATTRS{idProduct}=="c020", RUN+="/sbin/modprobe cp210x" RUN+="/bin/sh -c 'echo 1b1f c020 >/sys/bus/usb-serial/drivers/cp210x/new_id'"

buildroot-external/rootfs-overlay/usr/sbin/hassos-config

@@ -1,97 +1,60 @@
 #!/bin/sh
 
-BOOT_CONFIG="/mnt/boot/CONFIG"
+if ! findfs LABEL="CONFIG" > /dev/null; then
-USB_CONFIG="/mnt/config"
-CONFIG_DIR=""
-USE_USB=0
-
-# Check and mount usb CONFIG to folder
-if findfs LABEL="CONFIG" > /dev/null 2>&1; then
-    echo "[Info] Use USB stick for import CONFIG"
-
-    systemctl start mnt-config.mount
-    if ! systemctl -q is-active mnt-config.mount; then
-        echo "[Error] Can't mount config partition"
-        exit 1
-    fi
-
-    USE_USB=1
-    CONFIG_DIR=${USB_CONFIG}
-fi
-
-# Use boot CONFIG folder
-if [ ${USE_USB} = 0 ] && [ -d ${BOOT_CONFIG} ]; then
-    echo "[Info] Use boot partition for import CONFIG"
-    CONFIG_DIR=${BOOT_CONFIG}
-elif [ ${USE_USB} = 0 ]; then
     echo "[Warning] No config partition found"
     exit 0
 fi
 
+# Mount config folder
+systemctl start mnt-config.mount
+if ! systemctl -q is-active mnt-config.mount; then
+    echo "[Error] Can't mount config partition"
+    exit 1
+fi
 
 ##
 # NetworkManager
-if [ -d "${CONFIG_DIR}/network" ]; then
+if [ -d /mnt/config/network ]; then
     echo "[Info] Update NetworkManager connections!"
 
     rm -rf /etc/NetworkManager/system-connections/*
-    cp -f ${CONFIG_DIR}/network/* /etc/NetworkManager/system-connections/
+    cp -f /mnt/config/network/* /etc/NetworkManager/system-connections/
     chmod 600 /etc/NetworkManager/system-connections/*
 
-    nmcli con reload > /dev/null 2>&1
+    nmcli con reload
 fi
 
 ##
 # Modules
-if [ -d "${CONFIG_DIR}/modules" ]; then
+if [ -d /mnt/config/modules ]; then
     echo "[Info] Update Modules configuration!"
 
     rm -rf /etc/modules-load.d/*
-    cp -f ${CONFIG_DIR}/modules/* /etc/modules-load.d/*
+    cp -f /mnt/config/modules/* /etc/modules-load.d/*
-fi
-
-##
-# Udev
-if [ -d "${CONFIG_DIR}/udev" ]; then
-    echo "[Info] Update Udev configuration!"
-
-    rm -rf /etc/udev/rules.d/*
-    cp -f ${CONFIG_DIR}/udev/* /etc/udev/rules.d/
 fi
 
 ##
 # SSH know hosts
-if [ -f "${CONFIG_DIR}/authorized_keys" ]; then
+if [ -f /mnt/config/authorized_keys ]; then
     echo "[Info] Update SSH authorized_keys!"
 
-    cp -f ${CONFIG_DIR}/authorized_keys /root/.ssh/authorized_keys
+    cp -f /mnt/config/authorized_keys /root/.ssh/authorized_keys
     chmod 600 /root/.ssh/authorized_keys
 
-    systemctl start dropbear > /dev/null 2>&1
+    systemctl start dropbear
 else
-    echo "[Info] Stop SSH debug access"
-
     rm -f /root/.ssh/authorized_keys
-    systemctl stop dropbear > /dev/null 2>&1
+    systemctl stop dropbear
 fi
 
 ##
-# timesyncd
+# Firmware update
-if [ -f "${CONFIG_DIR}/timesyncd.conf" ]; then
-    echo "[Info] Update timesyncd config"
-
-    cat "${CONFIG_DIR}/timesyncd.conf" > /etc/systemd/timesyncd.conf
-    systemctl restart systemd-timesyncd.service > /dev/null 2>&1
-fi
-
-##
-# Firmware update / Only USB
 UPTIME=$(awk '{printf "%0.f", $1}' /proc/uptime)
-if ls ${USB_CONFIG}/*.raucb > /dev/null 2>&1 && [ ${UPTIME} -ge 180 ]; then
+if ls /mnt/config/*.raucb > /dev/null && [ ${UPTIME} -ge 180 ]; then
     echo "[Info] Performe a firmware update"
 
-    rauc_filename=$(ls ${USB_CONFIG}/*.raucb | head -n 1)
+    rauc_filename=$(ls /mnt/config/*.raucb | head -n 1)
-    if rauc install "${rauc_filename}"; then
+    if rauc install ${rauc_filename}; then
         echo "[Info] Firmware update success"
         systemctl reboot
     else
@@ -100,8 +63,4 @@ if ls ${USB_CONFIG}/*.raucb > /dev/null 2>&1 && [ ${UPTIME} -ge 180 ]; then
 fi
 
 # Cleanup config partition
-if [ ${USE_USB} = 1 ]; then
+systemctl stop mnt-config.mount
-    systemctl stop mnt-config.mount
-else
-    rm -rf ${BOOT_CONFIG}
-fi

buildroot-patches/0006-Pump-raspberry-pi-firmware-for-kernel-4.14.patch

@@ -16,7 +16,7 @@ index 4854deae03..3a9f21e877 100644
 @@ -1,2 +1,2 @@
  # Locally computed
 -sha256 ea451834e20136d249661e0ed7d1fdfa309249d233a387f44dd6c3b746a454c6 rpi-firmware-36f991382326907419f64917624427e59fd8e4a0.tar.gz
-+sha256 8939476badeb1d28adc60b46315f1511cd83c1942fbde5ef2e04c4f1b9591da6 rpi-firmware-91e955e3786a807f4af8ae7e4a4bbf9ec470b843.tar.gz
++sha256 f2b0f8ec8e73f8fa399f2c72c574ea5fe7fa57ab6151b139842a3ba783cd2140 rpi-firmware-a46b1f9521229ec26a1377aab7d013df1ade2791.tar.gz
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index eab4c5d307..cb2e9d6cd8 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
@@ -26,7 +26,7 @@ index eab4c5d307..cb2e9d6cd8 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 36f991382326907419f64917624427e59fd8e4a0
-+RPI_FIRMWARE_VERSION = 91e955e3786a807f4af8ae7e4a4bbf9ec470b843
++RPI_FIRMWARE_VERSION = a46b1f9521229ec26a1377aab7d013df1ade2791
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot-patches/0010-rpi-use-latest-wifi-driver.patch

@@ -1,45 +0,0 @@
-From 30af519c8cc4b4c46dfb4ee42adda49a81dbc475 Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Thu, 12 Jul 2018 21:33:50 +0000
-Subject: [PATCH 1/1] rpi: use latest wifi driver
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +-
- package/rpi-wifi-firmware/rpi-wifi-firmware.mk   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
-index bc0d7c8b02..946a55fac0 100644
---- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
-+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
-@@ -1,3 +1,3 @@
- # Locally calculated
--sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30  rpi-wifi-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz
-+sha256 163fc0629d9ddcf7b729fefd3129f8d4f43b8fc912fa487b6d8bc57cf57232a7  rpi-wifi-firmware-86e88fbf0345da49555d0ec34c80b4fbae7d0cd3.tar.gz
- sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx
-diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-index 32dd3e519b..248b0a2621 100644
---- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-@@ -4,14 +4,14 @@
- #
- ################################################################################
- 
--RPI_WIFI_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907
--RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
-+RPI_WIFI_FIRMWARE_VERSION = 86e88fbf0345da49555d0ec34c80b4fbae7d0cd3
-+RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
- RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
- RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
- 
- define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
- 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
--	$(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
-+	$(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm
- endef
- 
- $(eval $(generic-package))
--- 
-2.17.1
-

buildroot/package/rpi-firmware/rpi-firmware.hash

@@ -1,2 +1,2 @@
 # Locally computed
-sha256 8939476badeb1d28adc60b46315f1511cd83c1942fbde5ef2e04c4f1b9591da6 rpi-firmware-91e955e3786a807f4af8ae7e4a4bbf9ec470b843.tar.gz
+sha256 f2b0f8ec8e73f8fa399f2c72c574ea5fe7fa57ab6151b139842a3ba783cd2140 rpi-firmware-a46b1f9521229ec26a1377aab7d013df1ade2791.tar.gz

buildroot/package/rpi-firmware/rpi-firmware.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 91e955e3786a807f4af8ae7e4a4bbf9ec470b843
+RPI_FIRMWARE_VERSION = a46b1f9521229ec26a1377aab7d013df1ade2791
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 163fc0629d9ddcf7b729fefd3129f8d4f43b8fc912fa487b6d8bc57cf57232a7  rpi-wifi-firmware-86e88fbf0345da49555d0ec34c80b4fbae7d0cd3.tar.gz
+sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30  rpi-wifi-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz
 sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx

buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk

@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-RPI_WIFI_FIRMWARE_VERSION = 86e88fbf0345da49555d0ec34c80b4fbae7d0cd3
+RPI_WIFI_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907
-RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
+RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
 RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
 RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
 
 define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
-	$(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm
+	$(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
 endef
 
 $(eval $(generic-package))

scripts/update-rpi-kernel.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ -z "$1" ]; then
-    echo "Need a version!"
-    exit 1
-fi
-
-sed -i "s/BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION=\".*\"/BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION=\"$1\"/g" buildroot-external/configs/rpi*