Merge pull request #38 from home-assistant/dev

Release 0.7 beta

.gitignore

@@ -0,0 +1,2 @@
+/release
+*.pem

Documentation/build.md

@@ -0,0 +1,21 @@
+# Building
+
+Running `sudo ./enter.sh` will get you into the build Docker container.   
+`make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
+
+## Scripts
+
+
+
+## Helpers
+
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external menuconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-menuconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-menuconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-menuconfig`
+
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external savedefconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-update-defconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-update-defconfig`
+- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-update-config`

Documentation/configuration.md

@@ -7,13 +7,13 @@ You can format a USB stick with FAT32 and name it with `hassos-config`. The layo
 network/
 modules/
 known_hosts
-hassos-xy.rauc
+hassos-xy.raucb
 ```
 
 - On `network` folder can hold any kind of NetworkManager connections files.
 - The folder `modules` is for modules-load configuration files.
 - `known_hosts` file activate debug SSH access of port `22222`.
-- For firmware updates you can but the `hassos-*.rauc` OTA update they should be install. 
+- For firmware updates you can but the `hassos-*.raucb` OTA update they should be install. 
 
 ## Local
 

Documentation/deployment.md

@@ -0,0 +1,23 @@
+# Deployment
+
+We know 3 types of release builds:
+- development (beta/dev)
+- staging (rc)
+- production (stable)
+
+## Versioning
+The format of version is *MAJOR.BUILD*. Everytime we create a new release with same userland, we bump the build number.
+The development use here own major number they will be bump for the stable version and the development version go to next major number.
+
+```
+0.x = development
+1.x = stable
+2.x = development
+3.x = stable
+```
+
+## GIT Branch/Tag
+The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch hould the development
+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.

README.md

@@ -12,37 +12,3 @@ Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for D
 - AppArmor protected
 - ZRAM LZ4 for /tmp, /var, swap
 - Run every supervisor
-
-## Schemas
-![](misc/hassio-os-partition.png?raw=true)
-
-# Customize
-
-Provide a file with the name `hassos.json` in your data partition and the following structure:
-
-```json
-{
-  "supervisor": "repo/image",
-  "supervisor_args": "optional / custom docker arguments",
-  "cli": "repo/image",
-  "cli_args": "optional / custom docker arguments",
-  "hostname": "default hostname"
-}
-```
-
-# Building
-Running `sudo ./enter.sh` will get you into the build Docker container.   
-`make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
-
-## Helpers
-
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external menuconfig`
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-menuconfig`
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-menuconfig`
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-menuconfig`
-
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external savedefconfig`
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-update-defconfig`
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-update-defconfig`
-- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-update-config`

buildroot-external/apparmor/hassio-supervisor

@@ -1,75 +0,0 @@
-#include <tunables/global>
-
-profile hassio-supervisor flags=(attach_disconnected,mediate_deleted) {
-  #include <abstractions/base>
-  #include <abstractions/python>
-
-  network,
-  deny network raw,
-
-  signal (send) set=(kill,term),
-
-  /bin/busybox ix,
-  /usr/bin/python{,3,3.[0-9]} ix,
-  /usr/bin/git cx,
-  /usr/bin/socat cx,
-  /usr/bin/gdbus cx,
-
-  deny /proc/** wl,
-  deny /root/** wl,
-  deny /sys/** wl,
-
-  /** r,
-  /tmp/** rw,
-  /data/** rw,
-  /{,var/}run/docker.sock rw,
-
-  capability net_bind_service,
-
-  profile /usr/bin/socat flags=(attach_disconnected,mediate_deleted) {
-    #include <abstractions/base>
-
-    network inet udp,
-    network inet tcp,
-
-    deny network raw,
-    deny network packet,
-
-    signal (receive) set=(kill,term),
-    capability net_bind_service,
-
-    /lib/* mr,
-    /usr/bin/socat mr,
-  }
-
-  profile /usr/bin/gdbus flags=(attach_disconnected,mediate_deleted) {
-    #include <abstractions/base>
-    #include <abstractions/dbus>
-
-    unix (send, receive) type=stream,
-
-    /usr/bin/gdbus mr,
-    /lib/* mr,
-    /{,var/}run/dbus/system_bus_socket rw,
-  }
-
-  profile /usr/bin/git flags=(attach_disconnected,mediate_deleted) {
-    #include <abstractions/base>
-
-    network,
-    deny network raw,
-
-    /bin/busybox ix,
-    /usr/bin/git mr,
-    /usr/libexec/git-core/* ix,
-
-    deny /data/homeassistant rw,
-    deny /data/ssl rw,
-
-    /** r,
-    /lib/* mr,
-    /data/addons/** lrw,
-
-    capability dac_override,
-  }
-}

buildroot-external/board/ova/info

@@ -2,3 +2,4 @@ BOARD_ID=ova
 BOARD_NAME="Open Virtual Appliance"
 CHASSIS=vm
 BOOTLOADER=barebox
+KERNEL_FILE=bzImage

buildroot-external/board/ova/patches/rauc/0001-add-i-argument-to.patch

@@ -17,7 +17,7 @@ index d5efc0c..c57c2f7 100644
  	g_ptr_array_add(args, g_strdup_printf(BOOTSTATE_PREFIX ".%s.remaining_attempts", bootname));
 +
 +	g_ptr_array_add(args, g_strdup("-i"));
-+	g_ptr_array_add(args, g_strdup("/mnt/boot/EFI/barebox/state.dtb"));
++	g_ptr_array_add(args, g_strdup("/etc/barebox-state.dtb"));
  	g_ptr_array_add(args, NULL);
  
  	sub = g_subprocess_newv((const gchar * const *)args->pdata,
@@ -27,7 +27,7 @@ index d5efc0c..c57c2f7 100644
  	}
 +
 +	g_ptr_array_add(args, g_strdup("-i"));
-+	g_ptr_array_add(args, g_strdup("/mnt/boot/EFI/barebox/state.dtb"));
++	g_ptr_array_add(args, g_strdup("/etc/barebox-state.dtb"));
  	g_ptr_array_add(args, NULL);
  
  	sub = g_subprocess_newv((const gchar * const *)args->pdata,

buildroot-external/board/ova/post-image.sh

@@ -6,12 +6,11 @@ BOARD_DIR=${2}
 BOOT_DATA=${BINARIES_DIR}/boot
 
 . ${SCRIPT_DIR}/hdd-image.sh
+. ${SCRIPT_DIR}/name.sh
+. ${SCRIPT_DIR}/ota.sh
 . ${BR2_EXTERNAL_HASSOS_PATH}/info
 . ${BOARD_DIR}/info
 
-# Filename
-IMAGE_FILE=${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.vmdk
-
 # Init boot data
 rm -rf ${BOOT_DATA}
 mkdir -p ${BOOT_DATA}/EFI/BOOT
@@ -23,10 +22,9 @@ cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb ${BOOT_DATA}/EFI/bareb
 echo "console=tty1" > ${BOOT_DATA}/cmdline.txt
 
 # Create other layers
-create_boot_image ${BINARIES_DIR}
+prepare_disk_image
-create_overlay_image ${BINARIES_DIR}
-create_kernel_image ${BINARIES_DIR} bzImage
 
-create_disk_image ${BINARIES_DIR} ${BINARIES_DIR}/harddisk.img 6
+# Create disk images
-
+create_disk_image 6
-qemu-img convert -O vmdk ${BINARIES_DIR}/harddisk.img ${BINARIES_DIR}/${IMAGE_FILE}
+convert_disk_image_vmdk
+create_ota_update

buildroot-external/board/raspberrypi/post-image.sh

@@ -6,19 +6,10 @@ BOARD_DIR=${2}
 BOOT_DATA=${BINARIES_DIR}/boot
 
 . ${SCRIPT_DIR}/hdd-image.sh
+. ${SCRIPT_DIR}/name.sh
 . ${BR2_EXTERNAL_HASSOS_PATH}/info
 . ${BOARD_DIR}/info
 
-# Filename
-IMAGE_FILE=${BINARIES_DIR}/${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.img
-
-# Eval kernel name
-if [ "$BOARD_ID" == "rpi3-64" ]; then
-    KERNEL_NAME="Image"
-else
-    KERNEL_NAME="zImage"
-fi
-
 # Init boot data
 rm -rf ${BOOT_DATA}
 mkdir -p ${BOOT_DATA}
@@ -42,13 +33,15 @@ cp -r ${BINARIES_DIR}/rpi-firmware/overlays ${BOOT_DATA}/
 
 echo "dwc_otg.lpm_enable=0 console=tty1" > ${BOOT_DATA}/cmdline.txt
 
+# Enable 64bit support
+if [ "${BOARD_ID}" == "rpi3-64" ]; then
+    echo "arm_64bit=1" >> ${BOOT_DATA}/config.txt
+fi
+
 # Create other layers
-create_boot_image ${BINARIES_DIR}
+prepare_disk_image
-create_overlay_image ${BINARIES_DIR}
-create_kernel_image ${BINARIES_DIR} ${KERNEL_NAME}
 
-create_disk_image ${BINARIES_DIR} ${IMAGE_FILE} 2
+create_disk_image 2
-fix_disk_image_mbr ${IMAGE_FILE}
+fix_disk_image_mbr
-
+convert_disk_image_gz
-rm -rf ${IMAGE_FILE}.gz
+create_ota_update
-gzip --best ${IMAGE_FILE}

buildroot-external/board/raspberrypi/rpi/info

@@ -2,3 +2,4 @@ BOARD_ID=rpi
 BOARD_NAME="RaspberryPi"
 CHASSIS=embedded
 BOOTLOADER=uboot
+KERNEL_FILE=zImage

buildroot-external/board/raspberrypi/rpi/uboot.config

@@ -1,2 +0,0 @@
-CONFIG_TARGET_RPI=y
-CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"

buildroot-external/board/raspberrypi/rpi0-w/info

@@ -2,3 +2,4 @@ BOARD_ID=rpi0-w
 BOARD_NAME="RaspberryPi Zero-W"
 CHASSIS=embedded
 BOOTLOADER=uboot
+KERNEL_FILE=zImage

buildroot-external/board/raspberrypi/rpi0-w/uboot.config

@@ -1,2 +0,0 @@
-CONFIG_TARGET_RPI_0_W=y
-CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"

buildroot-external/board/raspberrypi/rpi2/info

@@ -2,3 +2,4 @@ BOARD_ID=rpi2
 BOARD_NAME="RaspberryPi 2"
 CHASSIS=embedded
 BOOTLOADER=uboot
+KERNEL_FILE=zImage

buildroot-external/board/raspberrypi/rpi2/uboot.config

@@ -1,2 +0,0 @@
-CONFIG_TARGET_RPI_2=y
-CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"

buildroot-external/board/raspberrypi/rpi3-64/info

@@ -2,3 +2,4 @@ BOARD_ID=rpi3-64
 BOARD_NAME="RaspberryPi 3 64bit"
 CHASSIS=embedded
 BOOTLOADER=uboot
+KERNEL_FILE=Image

buildroot-external/board/raspberrypi/rpi3-64/uboot.config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_RPI_3=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"

buildroot-external/board/raspberrypi/rpi3/info

@@ -2,3 +2,4 @@ BOARD_ID=rpi3
 BOARD_NAME="RaspberryPi 3"
 CHASSIS=embedded
 BOOTLOADER=uboot
+KERNEL_FILE=zImage

buildroot-external/board/raspberrypi/rpi3/uboot.config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_RPI_3_32B=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"

buildroot-external/board/raspberrypi/uboot.config

@@ -1,27 +1,3 @@
-CONFIG_ARM=y
+# CONFIG_USB_STORAGE is not set
-CONFIG_ARCH_BCM283X=y
+# CONFIG_ENV_FAT_INTERFACE is not set
-CONFIG_SYS_TEXT_BASE=0x00008000
+# CONFIG_ENV_FAT_DEVICE_AND_PART is not set
-CONFIG_OF_BOARD_SETUP=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_USB=y
-CONFIG_OF_EMBED=y
-CONFIG_ENV_EXT4_INTERFACE="mmc"
-CONFIG_DM_KEYBOARD=y
-CONFIG_DM_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_BCM2835=y
-CONFIG_DM_ETH=y
-CONFIG_PINCTRL=y
-# CONFIG_PINCTRL_GENERIC is not set
-# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_KEYBOARD=y
-CONFIG_USB_HOST_ETHER=y
-CONFIG_USB_ETHER_SMSC95XX=y
-CONFIG_DM_VIDEO=y
-CONFIG_PHYS_TO_BUS=y

buildroot-external/bootloader/uboot.config

@@ -13,7 +13,4 @@ CONFIG_FS_EXT4=y
 # CONFIG_ENV_IS_IN_EXT4 is not set
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CONSOLE_SCROLL_LINES=10
-CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_REGEX=y
-CONFIG_OF_LIBFDT_OVERLAY=y
 # CONFIG_EFI_LOADER is not set

buildroot-external/configs/ova_defconfig

@@ -22,7 +22,6 @@ 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
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -30,6 +29,7 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_DT_UTILS=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -37,6 +37,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
 BR2_PACKAGE_DROPBEAR=y
@@ -72,11 +73,13 @@ 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="107"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
 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="3"
+BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+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

buildroot-external/configs/rpi0_w_defconfig

@@ -27,7 +27,6 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.confi
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -35,6 +34,7 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
@@ -45,6 +45,7 @@ BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
 BR2_PACKAGE_DROPBEAR=y
@@ -69,8 +70,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w"
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-w/uboot.config"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -82,11 +82,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="107"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
 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="3"
+BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+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

buildroot-external/configs/rpi2_defconfig

@@ -27,7 +27,6 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.confi
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -35,6 +34,7 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -44,6 +44,7 @@ BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
 BR2_PACKAGE_DROPBEAR=y
@@ -68,8 +69,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2"
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2/uboot.config"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -81,11 +81,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="107"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
 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="3"
+BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+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

buildroot-external/configs/rpi3_64_defconfig

@@ -27,7 +27,6 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.confi
 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"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -35,6 +34,7 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
@@ -45,6 +45,7 @@ BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
 BR2_PACKAGE_DROPBEAR=y
@@ -69,12 +70,11 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3"
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64/uboot.config"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.sh"
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64/uboot-boot.sh"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
@@ -82,11 +82,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="107"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
 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="3"
+BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+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

buildroot-external/configs/rpi3_defconfig

@@ -27,7 +27,6 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.confi
 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"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -35,6 +34,7 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
@@ -45,6 +45,7 @@ BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
 BR2_PACKAGE_DROPBEAR=y
@@ -69,8 +70,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b"
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3/uboot.config"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -82,11 +82,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="107"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
 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="3"
+BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+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

buildroot-external/configs/rpi_defconfig

@@ -27,7 +27,6 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.confi
 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"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
@@ -35,6 +34,7 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
@@ -44,6 +44,7 @@ BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_AVAHI=y
+# BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
 BR2_PACKAGE_DROPBEAR=y
@@ -68,8 +69,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi"
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi/uboot.config"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
@@ -81,11 +81,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="107"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="109"
 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="3"
+BR2_PACKAGE_HASSOS_CLI_VERSION="5"
+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

buildroot-external/info

@@ -1,5 +1,5 @@
 VERSION_MAJOR=0
-VERSION_BUILD=4
+VERSION_BUILD=7
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"

buildroot-external/kernel.config

@@ -97,3 +97,4 @@ CONFIG_EFI_PARTITION=y
 
 # CONFIG_LOGO is not set
 # CONFIG_VIRTUALIZATION is not set
+# CONFIG_DEBUG_STACK_USAGE is not set

buildroot-external/misc/rauc-hook

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Handle boot hocks
+if [ "${RAUC_SLOT_CLASS}" = "boot" ]; then
+    if [ "${1}" = "slot-post-install" ]; then
+        /usr/lib/rauc/post-install-boot 
+    elif [ "${1}" = "slot-pre-install" ]; then
+        /usr/lib/rauc/pre-install-boot 
+    fi
+fi
+
+exit 0

buildroot-external/package/hassos/Config.in

@@ -28,6 +28,11 @@ config BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE
 	help
 	  AppArmor profile for supervisor.
 
+config BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL
+	string "AppArmor supervisor profile URL"
+	help
+	  AppArmor profile for supervisor url.
+
 config BR2_PACKAGE_HASSOS_CLI
 	string "cli docker image"
 	help
@@ -48,9 +53,14 @@ config BR2_PACKAGE_HASSOS_CLI_PROFILE
 	help
 	  AppArmor profile for cli.
 
+config BR2_PACKAGE_HASSOS_CLI_PROFILE_URL
+	string "AppArmor cli profile url"
+	help
+	  AppArmor profile for cli url.
+
 config BR2_PACKAGE_HASSOS_APPARMOR_DIR
 	string "AppArmor profiles folder"
 	help
-	  AppArmor profiles folder for supervisor.
+	  AppArmor profiles folder for HassOS.
 
 endif

buildroot-external/package/hassos/builder/Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 # Install packages
 RUN apk add --no-cache \
-    bash coreutils e2fsprogs
+    bash coreutils e2fsprogs curl
 RUN apk add --no-cache --repository http://nl.alpinelinux.org/alpine/v3.7/community \
     docker
 

buildroot-external/package/hassos/builder/hostapp.sh

@@ -5,10 +5,12 @@ SUPERVISOR=""
 SUPERVISOR_VERSION=""
 SUPERVISOR_ARGS=""
 SUPERVISOR_PROFILE=""
+SUPERVISOR_PROFILE_URL=""
 CLI=""
 CLI_VERSION=""
 CLI_ARGS=""
 CLI_PROFILE=""
+CLI_PROFILE_URL=""
 APPARMOR=""
 DATA_IMG="/export/data.ext4"
 
@@ -32,6 +34,10 @@ while [[ $# -gt 0 ]]; do
             SUPERVISOR_PROFILE=$2
             shift
             ;;
+        --supervisor-profile-url)
+            SUPERVISOR_PROFILE_URL=$2
+            shift
+            ;;
         --cli)
             CLI=$2
             shift
@@ -48,6 +54,10 @@ while [[ $# -gt 0 ]]; do
             CLI_PROFILE=$2
             shift
             ;;
+        --cli-profile-url)
+            CLI_PROFILE_URL=$2
+            shift
+            ;;
         --apparmor)
             APPARMOR=$2
             shift
@@ -106,7 +116,16 @@ EOF
 # Setup AppArmor
 if [ ! -z "${APPARMOR}" ]; then
     mkdir -p /mnt/data/${APPARMOR}
-    cp -f /apparmor/* /mnt/data/${APPARMOR}/
+
+    # Supervisor
+    if [ ! -z "${SUPERVISOR_PROFILE_URL}" ]; then
+        curl -L -o /mnt/data/${APPARMOR}/${SUPERVISOR_PROFILE} ${SUPERVISOR_PROFILE_URL}
+    fi
+
+    # CLI
+    if [ ! -z "${CLI_PROFILE_URL}" ]; then
+        curl -L -o /mnt/data/${APPARMOR}/${CLI_PROFILE} ${CLI_PROFILE_URL}
+    fi
 fi
 
 # Finish

buildroot-external/package/hassos/hassos.mk

@@ -17,16 +17,17 @@ endef
 define HASSOS_INSTALL_TARGET_CMDS
 	docker run --rm --privileged \
 		-v $(BINARIES_DIR):/export \
-		-v $(BR2_EXTERNAL_HASSOS_PATH)/apparmor:/apparmor \
 		hassos-hostapps \
 		--supervisor $(BR2_PACKAGE_HASSOS_SUPERVISOR) \
 		--supervisor-version $(BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION) \
 		--supervisor-args $(BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS) \
 		--supervisor-profile $(BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE) \
+		--supervisor-profile-url $(BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL) \
 		--cli $(BR2_PACKAGE_HASSOS_CLI) \
 		--cli-version $(BR2_PACKAGE_HASSOS_CLI_VERSION) \
 		--cli-args $(BR2_PACKAGE_HASSOS_CLI_ARGS) \
 		--cli-profile $(BR2_PACKAGE_HASSOS_CLI_PROFILE) \
+		--cli-profile-url $(BR2_PACKAGE_HASSOS_CLI_PROFILE_URL) \
 		--apparmor $(BR2_PACKAGE_HASSOS_APPARMOR_DIR)
 endef
 

buildroot-external/patches/uboot/0002-mmc-unirqify-bcm2835-sdhost-and-fix-writes.patch

@@ -0,0 +1,409 @@
+From patchwork Wed May 23 20:24:51 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [U-Boot] mmc: Unirqify bcm2835_sdhost and fix writes
+X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
+X-Patchwork-Id: 919394
+X-Patchwork-Delegate: agraf@suse.de
+Message-Id: <20180523202451.68781-1-agraf@suse.de>
+To: u-boot@lists.denx.de
+Date: Wed, 23 May 2018 22:24:51 +0200
+From: Alexander Graf <agraf@suse.de>
+List-Id: U-Boot discussion <u-boot.lists.denx.de>
+
+The bcm2835 sdhost driver has a problem with "write multiple" commands.
+It seems to boil down to the fact that the controller dislikes its FIFO
+to get drained at the end of a block when a write multiple blocks command
+is in flight.
+
+The easy fix is to simply get rid of all the IRQ driven logic and make
+the driver push as much data into the FIFO as it can. That way we never
+drain and we never run into the problem.
+
+Reported-by: Jan Leonhardt <jan@cyberdesigner.net>
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ drivers/mmc/bcm2835_sdhost.c | 265 ++++++++-----------------------------------
+ 1 file changed, 47 insertions(+), 218 deletions(-)
+
+diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
+index 96428333b0..1ce019af57 100644
+--- a/drivers/mmc/bcm2835_sdhost.c
++++ b/drivers/mmc/bcm2835_sdhost.c
+@@ -163,7 +163,6 @@ struct bcm2835_host {
+ 	int			clock;		/* Current clock speed */
+ 	unsigned int		max_clk;	/* Max possible freq */
+ 	unsigned int		blocks;		/* remaining PIO blocks */
+-	int			irq;		/* Device IRQ */
+ 
+ 	u32			ns_per_fifo_word;
+ 
+@@ -173,14 +172,7 @@ struct bcm2835_host {
+ 
+ 	struct mmc_cmd	*cmd;		/* Current command */
+ 	struct mmc_data		*data;		/* Current data request */
+-	bool			data_complete:1;/* Data finished before cmd */
+ 	bool			use_busy:1;	/* Wait for busy interrupt */
+-	bool			wait_data_complete:1;	/* Wait for data */
+-
+-	/* for threaded irq handler */
+-	bool			irq_block;
+-	bool			irq_busy;
+-	bool			irq_data;
+ 
+ 	struct udevice		*dev;
+ 	struct mmc		*mmc;
+@@ -240,17 +232,9 @@ static void bcm2835_reset_internal(struct bcm2835_host *host)
+ 	writel(host->cdiv, host->ioaddr + SDCDIV);
+ }
+ 
+-static int bcm2835_finish_command(struct bcm2835_host *host);
+-
+-static void bcm2835_wait_transfer_complete(struct bcm2835_host *host)
++static int bcm2835_wait_transfer_complete(struct bcm2835_host *host)
+ {
+-	int timediff;
+-	u32 alternate_idle;
+-
+-	alternate_idle = (host->data->flags & MMC_DATA_READ) ?
+-		SDEDM_FSM_READWAIT : SDEDM_FSM_WRITESTART1;
+-
+-	timediff = 0;
++	int timediff = 0;
+ 
+ 	while (1) {
+ 		u32 edm, fsm;
+@@ -261,7 +245,10 @@ static void bcm2835_wait_transfer_complete(struct bcm2835_host *host)
+ 		if ((fsm == SDEDM_FSM_IDENTMODE) ||
+ 		    (fsm == SDEDM_FSM_DATAMODE))
+ 			break;
+-		if (fsm == alternate_idle) {
++
++		if ((fsm == SDEDM_FSM_READWAIT) ||
++		    (fsm == SDEDM_FSM_WRITESTART1) ||
++		    (fsm == SDEDM_FSM_READDATA)) {
+ 			writel(edm | SDEDM_FORCE_DATA_MODE,
+ 			       host->ioaddr + SDEDM);
+ 			break;
+@@ -273,9 +260,11 @@ static void bcm2835_wait_transfer_complete(struct bcm2835_host *host)
+ 				"wait_transfer_complete - still waiting after %d retries\n",
+ 				timediff);
+ 			bcm2835_dumpregs(host);
+-			return;
++			return -ETIMEDOUT;
+ 		}
+ 	}
++
++	return 0;
+ }
+ 
+ static int bcm2835_transfer_block_pio(struct bcm2835_host *host, bool is_read)
+@@ -322,6 +311,9 @@ static int bcm2835_transfer_block_pio(struct bcm2835_host *host, bool is_read)
+ 			      fsm_state != SDEDM_FSM_READCRC)) ||
+ 			    (!is_read &&
+ 			     (fsm_state != SDEDM_FSM_WRITEDATA &&
++			      fsm_state != SDEDM_FSM_WRITEWAIT1 &&
++			      fsm_state != SDEDM_FSM_WRITEWAIT2 &&
++			      fsm_state != SDEDM_FSM_WRITECRC &&
+ 			      fsm_state != SDEDM_FSM_WRITESTART1 &&
+ 			      fsm_state != SDEDM_FSM_WRITESTART2))) {
+ 				hsts = readl(host->ioaddr + SDHSTS);
+@@ -358,9 +350,8 @@ static int bcm2835_transfer_pio(struct bcm2835_host *host)
+ 
+ 	is_read = (host->data->flags & MMC_DATA_READ) != 0;
+ 	ret = bcm2835_transfer_block_pio(host, is_read);
+-
+-	if (host->wait_data_complete)
+-		bcm2835_wait_transfer_complete(host);
++	if (ret)
++		return ret;
+ 
+ 	sdhsts = readl(host->ioaddr + SDHSTS);
+ 	if (sdhsts & (SDHSTS_CRC16_ERROR |
+@@ -379,21 +370,8 @@ static int bcm2835_transfer_pio(struct bcm2835_host *host)
+ 	return ret;
+ }
+ 
+-static void bcm2835_set_transfer_irqs(struct bcm2835_host *host)
+-{
+-	u32 all_irqs = SDHCFG_DATA_IRPT_EN | SDHCFG_BLOCK_IRPT_EN |
+-		SDHCFG_BUSY_IRPT_EN;
+-
+-	host->hcfg = (host->hcfg & ~all_irqs) |
+-		SDHCFG_DATA_IRPT_EN |
+-		SDHCFG_BUSY_IRPT_EN;
+-
+-	writel(host->hcfg, host->ioaddr + SDHCFG);
+-}
+-
+-static
+-void bcm2835_prepare_data(struct bcm2835_host *host, struct mmc_cmd *cmd,
+-			  struct mmc_data *data)
++static void bcm2835_prepare_data(struct bcm2835_host *host, struct mmc_cmd *cmd,
++				 struct mmc_data *data)
+ {
+ 	WARN_ON(host->data);
+ 
+@@ -401,14 +379,9 @@ void bcm2835_prepare_data(struct bcm2835_host *host, struct mmc_cmd *cmd,
+ 	if (!data)
+ 		return;
+ 
+-	host->wait_data_complete = cmd->cmdidx != MMC_CMD_READ_MULTIPLE_BLOCK;
+-	host->data_complete = false;
+-
+ 	/* Use PIO */
+ 	host->blocks = data->blocks;
+ 
+-	bcm2835_set_transfer_irqs(host);
+-
+ 	writel(data->blocksize, host->ioaddr + SDHBCT);
+ 	writel(data->blocks, host->ioaddr + SDHBLC);
+ }
+@@ -483,36 +456,6 @@ static int bcm2835_send_command(struct bcm2835_host *host, struct mmc_cmd *cmd,
+ 	return 0;
+ }
+ 
+-static int bcm2835_transfer_complete(struct bcm2835_host *host)
+-{
+-	int ret = 0;
+-
+-	WARN_ON(!host->data_complete);
+-
+-	host->data = NULL;
+-
+-	return ret;
+-}
+-
+-static void bcm2835_finish_data(struct bcm2835_host *host)
+-{
+-	host->hcfg &= ~(SDHCFG_DATA_IRPT_EN | SDHCFG_BLOCK_IRPT_EN);
+-	writel(host->hcfg, host->ioaddr + SDHCFG);
+-
+-	host->data_complete = true;
+-
+-	if (host->cmd) {
+-		/* Data managed to finish before the
+-		 * command completed. Make sure we do
+-		 * things in the proper order.
+-		 */
+-		dev_dbg(dev, "Finished early - HSTS %08x\n",
+-			readl(host->ioaddr + SDHSTS));
+-	} else {
+-		bcm2835_transfer_complete(host);
+-	}
+-}
+-
+ static int bcm2835_finish_command(struct bcm2835_host *host)
+ {
+ 	struct mmc_cmd *cmd = host->cmd;
+@@ -562,8 +505,6 @@ static int bcm2835_finish_command(struct bcm2835_host *host)
+ 
+ 	/* Processed actual command. */
+ 	host->cmd = NULL;
+-	if (host->data && host->data_complete)
+-		ret = bcm2835_transfer_complete(host);
+ 
+ 	return ret;
+ }
+@@ -608,159 +549,44 @@ static int bcm2835_check_data_error(struct bcm2835_host *host, u32 intmask)
+ 	return ret;
+ }
+ 
+-static void bcm2835_busy_irq(struct bcm2835_host *host)
+-{
+-	if (WARN_ON(!host->cmd)) {
+-		bcm2835_dumpregs(host);
+-		return;
+-	}
+-
+-	if (WARN_ON(!host->use_busy)) {
+-		bcm2835_dumpregs(host);
+-		return;
+-	}
+-	host->use_busy = false;
+-
+-	bcm2835_finish_command(host);
+-}
+-
+-static void bcm2835_data_irq(struct bcm2835_host *host, u32 intmask)
++static int bcm2835_transmit(struct bcm2835_host *host)
+ {
++	u32 intmask = readl(host->ioaddr + SDHSTS);
+ 	int ret;
+ 
+-	/*
+-	 * There are no dedicated data/space available interrupt
+-	 * status bits, so it is necessary to use the single shared
+-	 * data/space available FIFO status bits. It is therefore not
+-	 * an error to get here when there is no data transfer in
+-	 * progress.
+-	 */
+-	if (!host->data)
+-		return;
+-
++	/* Check for errors */
+ 	ret = bcm2835_check_data_error(host, intmask);
+ 	if (ret)
+-		goto finished;
+-
+-	if (host->data->flags & MMC_DATA_WRITE) {
+-		/* Use the block interrupt for writes after the first block */
+-		host->hcfg &= ~(SDHCFG_DATA_IRPT_EN);
+-		host->hcfg |= SDHCFG_BLOCK_IRPT_EN;
+-		writel(host->hcfg, host->ioaddr + SDHCFG);
+-		bcm2835_transfer_pio(host);
+-	} else {
+-		bcm2835_transfer_pio(host);
+-		host->blocks--;
+-		if ((host->blocks == 0))
+-			goto finished;
+-	}
+-	return;
++		return ret;
+ 
+-finished:
+-	host->hcfg &= ~(SDHCFG_DATA_IRPT_EN | SDHCFG_BLOCK_IRPT_EN);
+-	writel(host->hcfg, host->ioaddr + SDHCFG);
+-}
+-
+-static void bcm2835_data_threaded_irq(struct bcm2835_host *host)
+-{
+-	if (!host->data)
+-		return;
+-	if ((host->blocks == 0))
+-		bcm2835_finish_data(host);
+-}
+-
+-static void bcm2835_block_irq(struct bcm2835_host *host)
+-{
+-	if (WARN_ON(!host->data)) {
+-		bcm2835_dumpregs(host);
+-		return;
+-	}
+-
+-	WARN_ON(!host->blocks);
+-	if ((--host->blocks == 0))
+-		bcm2835_finish_data(host);
+-	else
+-		bcm2835_transfer_pio(host);
+-}
++	ret = bcm2835_check_cmd_error(host, intmask);
++	if (ret)
++		return ret;
+ 
+-static irqreturn_t bcm2835_irq(int irq, void *dev_id)
+-{
+-	irqreturn_t result = IRQ_NONE;
+-	struct bcm2835_host *host = dev_id;
+-	u32 intmask;
+-
+-	intmask = readl(host->ioaddr + SDHSTS);
+-
+-	writel(SDHSTS_BUSY_IRPT |
+-	       SDHSTS_BLOCK_IRPT |
+-	       SDHSTS_SDIO_IRPT |
+-	       SDHSTS_DATA_FLAG,
+-	       host->ioaddr + SDHSTS);
+-
+-	if (intmask & SDHSTS_BLOCK_IRPT) {
+-		bcm2835_check_data_error(host, intmask);
+-		host->irq_block = true;
+-		result = IRQ_WAKE_THREAD;
++	/* Handle wait for busy end */
++	if (host->use_busy && (intmask & SDHSTS_BUSY_IRPT)) {
++		writel(SDHSTS_BUSY_IRPT, host->ioaddr + SDHSTS);
++		host->use_busy = false;
++		bcm2835_finish_command(host);
+ 	}
+ 
+-	if (intmask & SDHSTS_BUSY_IRPT) {
+-		if (!bcm2835_check_cmd_error(host, intmask)) {
+-			host->irq_busy = true;
+-			result = IRQ_WAKE_THREAD;
+-		} else {
+-			result = IRQ_HANDLED;
++	/* Handle PIO data transfer */
++	if (host->data) {
++		ret = bcm2835_transfer_pio(host);
++		if (ret)
++			return ret;
++		host->blocks--;
++		if (host->blocks == 0) {
++			/* Wait for command to complete for real */
++			ret = bcm2835_wait_transfer_complete(host);
++			if (ret)
++				return ret;
++			/* Transfer complete */
++			host->data = NULL;
+ 		}
+ 	}
+ 
+-	/* There is no true data interrupt status bit, so it is
+-	 * necessary to qualify the data flag with the interrupt
+-	 * enable bit.
+-	 */
+-	if ((intmask & SDHSTS_DATA_FLAG) &&
+-	    (host->hcfg & SDHCFG_DATA_IRPT_EN)) {
+-		bcm2835_data_irq(host, intmask);
+-		host->irq_data = true;
+-		result = IRQ_WAKE_THREAD;
+-	}
+-
+-	return result;
+-}
+-
+-static irqreturn_t bcm2835_threaded_irq(int irq, void *dev_id)
+-{
+-	struct bcm2835_host *host = dev_id;
+-
+-	if (host->irq_block) {
+-		host->irq_block = false;
+-		bcm2835_block_irq(host);
+-	}
+-
+-	if (host->irq_busy) {
+-		host->irq_busy = false;
+-		bcm2835_busy_irq(host);
+-	}
+-
+-	if (host->irq_data) {
+-		host->irq_data = false;
+-		bcm2835_data_threaded_irq(host);
+-	}
+-
+-	return IRQ_HANDLED;
+-}
+-
+-static void bcm2835_irq_poll(struct bcm2835_host *host)
+-{
+-	u32 intmask;
+-
+-	while (1) {
+-		intmask = readl(host->ioaddr + SDHSTS);
+-		if (intmask & (SDHSTS_BUSY_IRPT | SDHSTS_BLOCK_IRPT |
+-			       SDHSTS_SDIO_IRPT | SDHSTS_DATA_FLAG)) {
+-			bcm2835_irq(0, host);
+-			bcm2835_threaded_irq(0, host);
+-			return;
+-		}
+-	}
++	return 0;
+ }
+ 
+ static void bcm2835_set_clock(struct bcm2835_host *host, unsigned int clock)
+@@ -864,8 +690,11 @@ static int bcm2835_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
+ 	}
+ 
+ 	/* Wait for completion of busy signal or data transfer */
+-	while (host->use_busy || host->data)
+-		bcm2835_irq_poll(host);
++	while (host->use_busy || host->data) {
++		ret = bcm2835_transmit(host);
++		if (ret)
++			break;
++	}
+ 
+ 	return ret;
+ }
+

buildroot-external/rootfs-overlay/etc/rauc/system.conf

@@ -4,12 +4,16 @@ mountprefix=/run/rauc
 statusfile=/mnt/data/rauc.db
 bootloader=%BOOTLOADER%
 
+[handlers]
+pre-install=/usr/lib/rauc/pre-install
+post-install=/usr/lib/rauc/post-install
+
 [keyring]
 path=/etc/rauc/keyring.pem
 
 [slot.boot.0]
 device=/dev/disk/by-partlabel/hassos-boot
-type=vfs
+type=vfat
 
 [slot.kernel.0]
 device=/dev/disk/by-partlabel/hassos-kernel0

buildroot-external/rootfs-overlay/etc/systemd/journald.conf

@@ -1,6 +1,5 @@
 [Journal]
 Storage=auto
 Compress=yes
-SystemMaxUse=8M
+SystemMaxUse=12M
-RuntimeMaxUse=8M
+RuntimeMaxUse=10M
-

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

@@ -1,5 +1,6 @@
 [Unit]
 RequiresMountsFor=/etc/dropbear
+ConditionFileNotEmpty=/root/.ssh/known_hosts
 
 [Service]
 ExecStartPre=

buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/docker.conf

@@ -0,0 +1,3 @@
+[Unit]
+Requires=docker.service
+After=docker.service

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

@@ -1,2 +0,0 @@
-[Unit]
-OnFailure=rauc-bad.service

buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-state.mount

@@ -1 +0,0 @@
-/usr/lib/systemd/system/mnt-state.mount

buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/var.mount

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

buildroot-external/rootfs-overlay/etc/systemd/system/timers.target.wants/rauc-good.timer

@@ -1 +0,0 @@
-/usr/lib/systemd/system/rauc-good.timer

buildroot-external/rootfs-overlay/etc/systemd/system/timers.target.wants/rauc-mark.timer

@@ -0,0 +1 @@
+/usr/lib/systemd/system/rauc-mark.timer

buildroot-external/rootfs-overlay/usr/lib/rauc/post-install

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+systemctl start mnt-boot.mount
+systemctl reboot

buildroot-external/rootfs-overlay/usr/lib/rauc/post-install-boot

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+BOOT_DATA=/tmp/boot-data
+
+cp -f ${BOOT_DATA}/*.txt ${RAUC_SLOT_MOUNT_POINT}/
+
+rm -rf ${BOOT_DATA}

buildroot-external/rootfs-overlay/usr/lib/rauc/pre-install

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+systemctl stop mnt-boot.mount

buildroot-external/rootfs-overlay/usr/lib/rauc/pre-install-boot

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BOOT_DATA=/tmp/boot-data
+
+rm -rf ${BOOT_DATA}
+mkdir -p ${BOOT_DATA}
+
+cp -f ${RAUC_SLOT_MOUNT_POINT}/*.txt ${BOOT_DATA}/

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service

@@ -2,6 +2,8 @@
 Description=HassOS data resizing
 DefaultDependencies=no
 Before=mnt-data.mount
+RefuseManualStart=true
+RefuseManualStop=true
 
 [Service]
 Type=oneshot

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount

@@ -0,0 +1,8 @@
+[Unit]
+Description=HassOS config partition
+
+[Mount]
+What=LABEL=hassos-config
+Where=/mnt/config
+Type=auto
+Options=ro

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-state.mount

@@ -1,14 +0,0 @@
-[Unit]
-Description=HassOS bootstate partition
-DefaultDependencies=no
-Before=umount.target
-After=local-fs.target rauc.service
-Conflicts=umount.target
-
-[Mount]
-What=LABEL=hassos-bootstate
-Where=/mnt/state
-Type=ext2
-
-[Install]
-WantedBy=local-fs.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-bad.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=HassOS rauc bad
-Requires=rauc.service
-RefuseManualStart=true
-RefuseManualStop=true
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/rauc status mark-bad
-ExecStartPost=/usr/bin/systemctl reboot

buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service

@@ -1,10 +1,9 @@
 [Unit]
 Description=HassOS rauc good 
-Requires=hassos-supervisor.service rauc.service
 RefuseManualStart=true
 RefuseManualStop=true
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/rauc status mark-good
+ExecStart=/usr/sbin/hassos-rate
 RemainAfterExit=true

buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-swap.service

@@ -2,6 +2,8 @@
 Description=HassOS ZRAM swap
 DefaultDependencies=no
 Before=dev-zram0.swap
+RefuseManualStart=true
+RefuseManualStop=true
 
 [Service]
 Type=oneshot

buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-tmp.service

@@ -2,6 +2,8 @@
 Description=HassOS ZRAM tmp
 DefaultDependencies=no
 Before=tmp.mount
+RefuseManualStart=true
+RefuseManualStop=true
 
 [Service]
 Type=oneshot

buildroot-external/rootfs-overlay/usr/lib/systemd/system/zram-var.service

@@ -2,6 +2,8 @@
 Description=HassOS ZRAM var
 DefaultDependencies=no
 Before=var.mount
+RefuseManualStart=true
+RefuseManualStop=true
 
 [Service]
 Type=oneshot

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

@@ -1,15 +1,12 @@
 #!/bin/sh
-set -e
 
-# Check if hassos-config is present
+# Mount config folder
-if ! findfs LABEL="hassos-config" > /dev/null; then
+systemctl start mnt-config.mount
-    echo "[Warning] No hassos-config partition found!"
+if ! systemctl -q is-active mnt-config.mount; then
+    echo "[Warning] No config partition found"
     exit 0
 fi
 
-# Mount config partition
-mount -o ro LABEL="hassos-config" /mnt/config
-
 ##
 # NetworkManager
 if [ -d /mnt/config/network ]; then
@@ -18,7 +15,7 @@ if [ -d /mnt/config/network ]; then
     rm -rf /etc/NetworkManager/system-connections/*
     cp -f /mnt/config/network/* /etc/NetworkManager/system-connections/
 
-    nmcli con reload || true
+    nmcli con reload
 fi
 
 ##
@@ -37,16 +34,21 @@ if [ -f /mnt/config/known_hosts ]; then
 
     cp -f /mnt/config/known_hosts /root/.ssh/known_hosts
     chmod 600 /root/.ssh/known_hosts
+
+    systemctl start dropbear
+else
+    rm -f /root/.ssh/known_hosts
+    systemctl stop dropbear
 fi
 
 ##
 # Firmware update
-if ls /mnt/config/*.rauc > /dev/null; then
+if ls /mnt/config/*.raucb > /dev/null; then
     echo "[Info] Performe a firmware update"
 
-    rauc_filename=$(ls /mnt/config/*.rauc | head -n 1)
+    rauc_filename=$(ls /mnt/config/*.raucb | head -n 1)
     rauc install /mnt/config/$rauc_filename
 fi
 
 # Cleanup config partition
-umount /mnt/config
+systemctl stop mnt-config.mount

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

@@ -12,6 +12,7 @@ fi
 
 # Resize & Reload partition
 echo "[INFO] Update hassos-data partition"
+sgdisk -e ${DEVICE_ROOT}
 sgdisk -d 8 -n 8:0:0 -c 8:"hassos-data" -t 8:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 8:"a52a4597-fa3a-4851-aefd-2fbe9f849079" ${DEVICE_ROOT}
 sgdisk -v ${DEVICE_ROOT}
 partx -u ${DEVICE_ROOT}

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

@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+
+
+function mark_good() {
+    rauc status mark-good
+    exit 0
+}
+
+function mark_bad() {
+    rauc status mark-bad
+    systemctl reboot
+}
+
+#### Check system ####
+
+# Docker state
+if ! systemctl -q is-active docker; then
+    mark_bad
+fi
+
+# Docker state
+if ! systemctl -q is-active hassos-supervisor; then
+    mark_bad
+fi
+
+mark_good

buildroot-external/scripts/hdd-image.sh

@@ -18,8 +18,8 @@ DATA_SIZE=1G
 
 
 function create_boot_image() {
-    local boot_data="${1}/boot"
+    local boot_data="${BINARIES_DIR}/boot"
-    local boot_img="${1}/boot.vfat"
+    local boot_img="${BINARIES_DIR}/boot.vfat"
 
     echo "mtools_skip_check=1" > ~/.mtoolsrc
     dd if=/dev/zero of=${boot_img} bs=${BOOT_SIZE} count=1
@@ -29,7 +29,7 @@ function create_boot_image() {
 
 
 function create_overlay_image() {
-    local overlay_img="${1}/overlay.ext4"
+    local overlay_img="${BINARIES_DIR}/overlay.ext4"
 
     dd if=/dev/zero of=${overlay_img} bs=${OVERLAY_SIZE} count=1
     mkfs.ext4 -L "hassos-overlay" -E lazy_itable_init=0,lazy_journal_init=0 ${overlay_img}
@@ -37,39 +37,41 @@ function create_overlay_image() {
 
 
 function create_kernel_image() {
-    local kernel0_img="${1}/kernel0.ext4"
+    local kernel_img="${BINARIES_DIR}/kernel.ext4"
-    local kernel1_img="${1}/kernel1.ext4"
+    local kernel="${BINARIES_DIR}/${KERNEL_FILE}"
-    local kernel=${1}/${2}
 
     # Make image
-    dd if=/dev/zero of=${kernel0_img} bs=${KERNEL_SIZE} count=1
+    dd if=/dev/zero of=${kernel_img} bs=${KERNEL_SIZE} count=1
-    mkfs.ext4 -L "hassos-kernel0" -E lazy_itable_init=0,lazy_journal_init=0 ${kernel0_img}
+    mkfs.ext4 -L "hassos-kernel" -E lazy_itable_init=0,lazy_journal_init=0 ${kernel_img}
-    dd if=/dev/zero of=${kernel1_img} bs=${KERNEL_SIZE} count=1
-    mkfs.ext4 -L "hassos-kernel1" -E lazy_itable_init=0,lazy_journal_init=0 ${kernel1_img}
 
     # Mount / init file structs
     mkdir -p /mnt/data/
-    mount -o loop ${kernel0_img} /mnt/data
+    mount -o loop ${kernel_img} /mnt/data
     cp -f ${kernel} /mnt/data/
     umount /mnt/data
 }
 
 
+function prepare_disk_image() {
+    create_boot_image
+    create_overlay_image
+    create_kernel_image
+}
+
+
 function create_disk_image() {
-    local boot_img="${1}/boot.vfat"
+    local boot_img="${BINARIES_DIR}/boot.vfat"
-    local rootfs_img="${1}/rootfs.squashfs"
+    local rootfs_img="${BINARIES_DIR}/rootfs.squashfs"
-    local overlay_img="${1}/overlay.ext4"
+    local overlay_img="${BINARIES_DIR}/overlay.ext4"
-    local data_img="${1}/data.ext4"
+    local data_img="${BINARIES_DIR}/data.ext4"
-    local kernel0_img="${1}/kernel0.ext4"
+    local kernel_img="${BINARIES_DIR}/kernel.ext4"
-    local kernel1_img="${1}/kernel1.ext4"
+    local hdd_img="$(hassos_image_name img)"
-    local hdd_img=${2}
+    local hdd_count=${1:-2}
-    local hdd_count=${3:-2}
 
     local loop_dev="/dev/mapper/$(losetup -f | cut -d'/' -f3)"
     local boot_offset=0
     local rootfs_offset=0
-    local kernel0_offset=0
+    local kernel_offset=0
-    local kernel1_offset=0
     local overlay_offset=0
     local data_offset=0
 
@@ -81,13 +83,12 @@ function create_disk_image() {
     boot_offset="$(sgdisk -F ${hdd_img})"
     sgdisk -n 1:0:+${BOOT_SIZE} -c 1:"hassos-boot" -t 1:"C12A7328-F81F-11D2-BA4B-00A0C93EC93B" -u 1:${BOOT_UUID} ${hdd_img}
 
-    kernel0_offset="$(sgdisk -F ${hdd_img})"
+    kernel_offset="$(sgdisk -F ${hdd_img})"
     sgdisk -n 2:0:+${KERNEL_SIZE} -c 2:"hassos-kernel0" -t 2:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 2:${KERNEL0_UUID} ${hdd_img}
 
     rootfs_offset="$(sgdisk -F ${hdd_img})"
     sgdisk -n 3:0:+${SYSTEM_SIZE} -c 3:"hassos-system0" -t 3:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 3:${SYSTEM0_UUID} ${hdd_img}
 
-    kernel1_offset="$(sgdisk -F ${hdd_img})"
     sgdisk -n 4:0:+${KERNEL_SIZE} -c 4:"hassos-kernel1" -t 4:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 4:${KERNEL1_UUID} ${hdd_img}
 
     sgdisk -n 5:0:+${SYSTEM_SIZE} -c 5:"hassos-system1" -t 5:"0FC63DAF-8483-4772-8E79-3D69D8477DE4" -u 5:${SYSTEM1_UUID} ${hdd_img}
@@ -103,8 +104,7 @@ function create_disk_image() {
     # Write Images
     sgdisk -v
     dd if=${boot_img} of=${hdd_img} conv=notrunc bs=512 obs=512 seek=${boot_offset}
-    dd if=${kernel0_img} of=${hdd_img} conv=notrunc bs=512 obs=512 seek=${kernel0_offset}
+    dd if=${kernel_img} of=${hdd_img} conv=notrunc bs=512 obs=512 seek=${kernel_offset}
-    dd if=${kernel1_img} of=${hdd_img} conv=notrunc bs=512 obs=512 seek=${kernel1_offset}
     dd if=${rootfs_img} of=${hdd_img} conv=notrunc bs=512 obs=512 seek=${rootfs_offset}
     dd if=${overlay_img} of=${hdd_img} conv=notrunc bs=512 obs=512 seek=${overlay_offset}
     dd if=${data_img} of=${hdd_img} conv=notrunc bs=512 obs=512 seek=${data_offset}
@@ -112,8 +112,26 @@ function create_disk_image() {
 
 
 function fix_disk_image_mbr() {
-    local hdd_img=${1}
+    local hdd_img="$(hassos_image_name img)"
 
     sgdisk -t 1:"E3C9E316-0B5C-4DB8-817D-F92DF00215AE" ${hdd_img}
     dd if=${BR2_EXTERNAL_HASSOS_PATH}/misc/mbr.img of=${hdd_img} conv=notrunc bs=512 count=1
 }
+
+
+function convert_disk_image_vmdk() {
+    local hdd_img="$(hassos_image_name img)"
+    local hdd_vmdk="$(hassos_image_name vmdk)"
+
+    rm -f ${hdd_vmdk}
+    qemu-img convert -O vmdk ${hdd_img} ${hdd_vmdk}
+    rm -f ${hdd_img}
+}
+
+
+function convert_disk_image_gz() {
+    local hdd_img="$(hassos_image_name img)"
+
+    rm -f ${hdd_img}.gz
+    gzip --best ${hdd_img}
+}

buildroot-external/scripts/name.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+function hassos_image_name() {
+    echo "${BINARIES_DIR}/${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.${1}"
+}
+
+function hassos_rauc_compatible() {
+    echo "${HASSOS_ID}-${BOARD_ID}"
+}
+
+function hassos_version() {
+    echo "${VERSION_MAJOR}.${VERSION_BUILD}"
+}

buildroot-external/scripts/ota.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+function create_ota_update() {
+    local ota_file="$(hassos_image_name raucb)"
+    local rauc_folder="${BINARIES_DIR}/rauc"
+    local boot="${BINARIES_DIR}/boot.vfat"
+    local kernel="${BINARIES_DIR}/kernel.ext4"
+    local rootfs="${BINARIES_DIR}/rootfs.squashfs"
+    local key="/build/key.pem"
+    local cert="/build/cert.pem"
+
+    rm -rf ${rauc_folder} ${ota_file}
+    mkdir -p ${rauc_folder}
+
+    cp -f ${kernel} ${rauc_folder}/kernel.ext4
+    cp -f ${boot} ${rauc_folder}/boot.vfat
+    cp -f ${rootfs} ${rauc_folder}/rootfs.img
+    cp -f ${BR2_EXTERNAL_HASSOS_PATH}/misc/rauc-hook ${rauc_folder}/hook
+
+    (
+        echo "[update]"
+        echo "compatible=$(hassos_rauc_compatible)"
+        echo "version=$(hassos_version)"
+        echo "[hooks]"
+        echo "filename=hook"
+        echo "[image.boot]"
+        echo "filename=boot.vfat"
+        echo "hooks=pre-install;post-install"
+        echo "[image.kernel]"
+        echo "filename=kernel.ext4"
+        echo "[image.rootfs]"
+        echo "filename=rootfs.img"
+    ) > ${rauc_folder}/manifest.raucm
+
+    rauc bundle -d --cert=${cert} --key=${key} ${rauc_folder} ${ota_file}
+}

buildroot-external/scripts/post-build.sh

@@ -7,6 +7,8 @@ BOARD_DIR=${2}
 . ${SCRIPT_DIR}/rootfs-layer.sh
 . ${BR2_EXTERNAL_HASSOS_PATH}/info
 . ${BOARD_DIR}/info
+. ${SCRIPT_DIR}/name.sh
+
 
 # HassOS tasks
 fix_rootfs
@@ -32,12 +34,20 @@ install_hassos_cli
 ) > ${TARGET_DIR}/etc/machine-info
 
 # Settup rauc
-sed -i "s/%COMPATIBLE%/${HASSOS_ID}-${BOARD_ID}/g" ${TARGET_DIR}/etc/rauc/system.conf
+sed -i "s/%COMPATIBLE%/$(hassos_rauc_compatible)/g" ${TARGET_DIR}/etc/rauc/system.conf
 sed -i "s/%BOOTLOADER%/${BOOTLOADER}/g" ${TARGET_DIR}/etc/rauc/system.conf
 
 # Settup the correct CA
-if [ "${DEPLOYMENT}" == "development" ]; then
+if [ "${DEPLOYMENT}" == "production" ]; then
-    cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/provisioning-ca.pem ${TARGET_DIR}/etc/rauc/keyring.pem
-else
     cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/rel-ca.pem ${TARGET_DIR}/etc/rauc/keyring.pem
+else
+    cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/dev-ca.pem ${TARGET_DIR}/etc/rauc/keyring.pem
 fi
+
+# Bootloader options
+if [ "${BOOTLOADER}" == "uboot" ]; then
+    cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/fw_env.config ${TARGET_DIR}/etc/fw_env.config
+else
+    cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb ${TARGET_DIR}/etc/barebox-state.dtb
+fi
+

buildroot-patches/0006-NetworkManager-allow-to-wait-on-boot.patch

@@ -1,35 +0,0 @@
-From 590565bc07f563f978004727dc817dc89527377a Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Sat, 31 Mar 2018 16:58:14 +0200
-Subject: [PATCH 1/1] NetworkManager: allow to wait on boot
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- package/network-manager/network-manager.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
-index a520aad..fb2012a 100644
---- a/package/network-manager/network-manager.mk
-+++ b/package/network-manager/network-manager.mk
-@@ -93,6 +93,7 @@ endef
- 
- define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
- 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-+	mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants
- 
- 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
- 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
-@@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
- 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
- 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
- 
-+	ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
-+		$(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
-+
- 	ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
- 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
- endef
--- 
-2.7.4
-

buildroot/package/network-manager/network-manager.mk

@@ -93,7 +93,6 @@ endef
 
 define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants
 
 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
@@ -101,9 +100,6 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
 
-	ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
-		$(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
-
 	ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
 endef

scripts/build-all.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+mkdir -p /build/RL
+
+all_platforms=(ova rpi rpi0_w rpi2 rpi3 rpi3_64)
+for platform in "${all_platforms[@]}"; do
+    make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external \
+        ${platform}_defconfig
+    make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external
+    cp -f /build/buildroot/output/images/hassos_* /build/release/
+
+    make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external \
+        clean
+done