CLI: Update to version 7

When booting the HassOS VMDK appliance disk image on QEMU with OVMF UEFI
firmware, barebox numbers devices differently from other environments.

This patch makes the barebox `sh` implementation expand a pathname
wildcard at runtime, so that assigned disk indices != 0 will also work.

This fix introduces a potential (but most likely irrelevant)
bug/problem: If there is more than one disk connected to the system with
a matching name assigned, the wildcard will expand to two or more
pathnames, breaking the resulting `mount` command.

.gitignore

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

Documentation/bluetooth.md

@@ -0,0 +1,12 @@
+# 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/ova.md

@@ -0,0 +1,16 @@
+# OVA
+
+The OVA stay for open virtual appliance. Currently we had remove the ova files and publish a vmdk virtual disk,
+until we have better OVF template to generate our OVA. This vmdk work with (maybe you need convert the disk):
+- HyperV
+- VirtualBox
+- VMware
+
+## Virtual Machine
+
+You can use this vmdk in a virtual machine with follow requirements:
+- OS: Linux 64bit
+- UEFI boot
+- min. 1GB RAM
+- 2x vcpu
+- 1x Network

Documentation/boards/raspberrypi.md

@@ -1,5 +1,23 @@
 # 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/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

@@ -2,18 +2,23 @@
 
 ## Automatic
 
-You can format a USB stick with FAT32 and name it with `hassos-config`. The layout could be look like:
+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`. Use the following directory structure within the USB drive:
+
 ```
 network/
 modules/
-known_hosts
-hassos-xy.rauc
+authorized_keys
+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. 
+- 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 `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
+- 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
+API/UI or by calling `systemctl restart hassos-config` on the host.
 
 ## Local
 
@@ -25,5 +30,11 @@ 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].
 
+### Network
+
+You can manual add, edit or remove connections configs from `/etc/NetworkManager/system-connections`.
 
 [systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
+[network.md]: network.md
+[hassos-release]: https://github.com/home-assistant/hassos/releases/
+[debug-hassio]: https://developers.home-assistant.io/docs/en/hassio_debugging.html

Documentation/deployment.md

@@ -0,0 +1,27 @@
+# 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.
+
+## 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

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

Documentation/network.md

@@ -0,0 +1,97 @@
+# 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].
+
+## 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:
+
+### Default
+
+We have a preinstalled connection profile:
+```
+[connection]
+id=HassOS default
+uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
+type=802-3-ethernet
+
+[ipv4]
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+method=auto
+```
+
+### LAN
+```ini
+[connection]
+id=hassos-network
+uuid=d55162b4-6152-4310-9312-8f4c54d86afa
+type=802-3-ethernet
+
+[ipv4]
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+method=auto
+```
+
+### Wireless WPA/PSK
+```ini
+[connection]
+id=hassos-network
+uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
+type=802-11-wireless
+
+[802-11-wireless]
+mode=infrastructure
+ssid=MY_SSID
+
+[802-11-wireless-security]
+auth-alg=open
+key-mgmt=wpa-psk
+psk=MY_WLAN_SECRED_KEY
+
+[ipv4]
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+method=auto
+```
+
+### Static IP
+
+Replace follow configs:
+```ini
+[ipv4]
+method=manual
+address1=192.168.1.111/24,192.168.1.1
+dns=8.8.8.8;8.8.4.4;
+```
+
+## Tips
+
+### Reset network
+
+If you want reset the network configuration to default, use follow commands on host:
+```bash
+$ rm /etc/NetworkManager/system-connections/*
+$ cp /usr/share/system-connections/* /etc/NetworkManager/system-connections/
+$ nmcli con reload
+```
+
+### Powersave
+
+If you have trouble with powersave you can do following:
+```ini
+[wifi]
+# Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
+powersave=0
+```
+
+[keyfile]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
+[configuration-usb]: configuration.md
+[uuid]: https://www.uuidgenerator.net/

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/Config.in

@@ -1,3 +1,4 @@
 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/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/kernel.config

@@ -1 +1,17 @@
-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
+

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}
-create_overlay_image ${BINARIES_DIR}
-create_kernel_image ${BINARIES_DIR} bzImage
+prepare_disk_image
 
-create_disk_image ${BINARIES_DIR} ${BINARIES_DIR}/harddisk.img 6
-
-qemu-img convert -O vmdk ${BINARIES_DIR}/harddisk.img ${BINARIES_DIR}/${IMAGE_FILE}
+# Create disk images
+create_disk_image 6
+convert_disk_image_vmdk
+create_ota_update

buildroot-external/board/raspberrypi/kernel.config

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

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

@@ -6,19 +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=${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 +34,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}
-create_overlay_image ${BINARIES_DIR}
-create_kernel_image ${BINARIES_DIR} ${KERNEL_NAME}
+prepare_disk_image
 
-create_disk_image ${BINARIES_DIR} ${IMAGE_FILE} 2
-fix_disk_image_mbr ${IMAGE_FILE}
-
-rm -rf ${IMAGE_FILE}.gz
-gzip --best ${IMAGE_FILE}
+create_disk_image 2
+fix_disk_image_mbr
+convert_disk_image_gz
+create_ota_update

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-boot.sh

@@ -3,7 +3,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait cgroup_enable=memory"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
@@ -11,7 +11,8 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
 
 # Preserve origin bootargs
 setenv bootargs_rpi
-fdt addr ${fdt_addr}
+setenv fdt_org ${fdt_addr}
+fdt addr ${fdt_org}
 fdt get value bootargs_rpi /chosen bootargs
 
 setenv bootargs
@@ -35,6 +36,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
   fi
 done
 
+setenv fdt_addr
 if test -n "${bootargs}"; then
   saveenv
 else
@@ -48,4 +50,7 @@ fi
 echo "Loading kernel"
 run load_kernel
 echo " Starting kernel"
-booti ${kernel_addr_r} - ${fdt_addr}
+booti ${kernel_addr_r} - ${fdt_org}
+
+echo "Fails on boot"
+reset

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-boot.sh

@@ -3,7 +3,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
 
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait cgroup_enable=memory"
 
 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
@@ -11,7 +11,8 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
 
 # Preserve origin bootargs
 setenv bootargs_rpi
-fdt addr ${fdt_addr}
+setenv fdt_org ${fdt_addr}
+fdt addr ${fdt_org}
 fdt get value bootargs_rpi /chosen bootargs
 
 setenv bootargs
@@ -35,6 +36,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
   fi
 done
 
+setenv fdt_addr
 if test -n "${bootargs}"; then
   saveenv
 else
@@ -48,4 +50,7 @@ fi
 echo "Loading kernel"
 run load_kernel
 echo " Starting kernel"
-bootz ${kernel_addr_r} - ${fdt_addr}
+bootz ${kernel_addr_r} - ${fdt_org}
+
+echo "Fails on boot"
+reset

buildroot-external/board/raspberrypi/uboot.config

@@ -1,27 +1,3 @@
-CONFIG_ARM=y
-CONFIG_ARCH_BCM283X=y
-CONFIG_SYS_TEXT_BASE=0x00008000
-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
+# CONFIG_USB_STORAGE is not set
+# CONFIG_ENV_FAT_INTERFACE is not set
+# CONFIG_ENV_FAT_DEVICE_AND_PART is not set

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/disk0.hassos-kernel0 /mnt/system
+mount -t ext4 /dev/disk*.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/disk0.hassos-kernel1 /mnt/system
+mount -t ext4 /dev/disk*.hassos-kernel1 /mnt/system
 
 global bootm.image="/mnt/system/bzImage"

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

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

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

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

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/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 is not set
+CONFIG_CMP=y
 # 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,11 +18,10 @@ 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.41"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.67"
 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,8 +37,13 @@ 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_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -72,11 +77,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="131"
 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="7"
+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

@@ -21,13 +21,12 @@ 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="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 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,8 +45,13 @@ 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_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -69,8 +74,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_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-w/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w"
 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 +86,14 @@ 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="131"
 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="7"
+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,13 +21,12 @@ 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="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 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,8 +44,13 @@ 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_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -68,8 +73,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_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2"
 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 +85,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="131"
 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="7"
+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

@@ -21,13 +21,12 @@ 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="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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"
-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,8 +34,9 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
-BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -45,8 +45,13 @@ 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_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -69,12 +74,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_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3"
 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 +86,14 @@ 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="131"
 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="7"
+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,13 +21,12 @@ 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="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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"
-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,8 +34,9 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
-BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -45,8 +45,13 @@ 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_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -69,8 +74,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_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b"
 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 +86,14 @@ 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="131"
 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="7"
+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,13 +21,12 @@ 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="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f6da082a790f857d5163ac99357beae6b59f1eb5"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/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"
-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,8 +44,13 @@ 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_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -68,8 +73,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_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi/uboot.config"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi"
 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 +85,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="131"
 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="7"
+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,7 +1,7 @@
-VERSION_MAJOR=0
-VERSION_BUILD=4
+VERSION_MAJOR=1
+VERSION_BUILD=11
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="development"
+DEPLOYMENT="production"

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,28 @@
+#!/bin/sh
+
+##
+# Hooks
+
+# 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
+
+##
+# 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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,18 @@
+#!/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

@@ -0,0 +1,31 @@
+################################################################################
+#
+# 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)/etc/udev/rules.d
+	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.rules $(TARGET_DIR)/etc/udev/rules.d/
+endef
+
+$(eval $(generic-package))

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

@@ -0,0 +1,22 @@
+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

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

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/NetworkManager/NetworkManager.conf

@@ -6,3 +6,6 @@ rc-manager=file
 
 [keyfile]
 unmanaged-devices=type:bridge;type:tun;type:veth
+
+[logging]
+backend=journal

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

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

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/resolv.conf

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

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

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

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

@@ -0,0 +1,2 @@
+[Unit]
+RequiresMountsFor=/etc/hostname /etc/hosts /etc/NetworkManager/system-connections

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

@@ -0,0 +1,2 @@
+[Unit]
+RequiresMountsFor=/etc/hostname

buildroot-external/rootfs-overlay/etc/systemd/system/avahi-daemon.service.d/nm.conf

@@ -0,0 +1,3 @@
+[Unit]
+Wants=network-online.target
+After=network-online.target

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

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

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

@@ -1,5 +1,6 @@
 [Unit]
 RequiresMountsFor=/etc/dropbear
+ConditionFileNotEmpty=/root/.ssh/authorized_keys
 
 [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/getty@.service.d/hassos.conf

@@ -1,3 +1,3 @@
 [Unit]
-Requires=docker.service
-After=docker.service
+Wants=hassos-supervisor.service
+After=hassos-supervisor.service

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/root-.ssh.mount

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

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

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

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

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

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/multi-user.target.wants/hassos-apparmor.service

@@ -1 +1 @@
-/usr/lib/systemd/system/hassos-apparmor.service
+/usr/lib/systemd/system/hassos-apparmor.service

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

@@ -1 +1 @@
-/usr/lib/systemd/system/hassos-bind.target
+/usr/lib/systemd/system/hassos-bind.target

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

@@ -1 +1 @@
-/usr/lib/systemd/system/hassos-config.service
+/usr/lib/systemd/system/hassos-config.service

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

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

buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-persists-journald.service

@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-persists-journald.service

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

@@ -1 +1 @@
-/usr/lib/systemd/system/hassos-supervisor.service
+/usr/lib/systemd/system/hassos-supervisor.service

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

@@ -1 +1 @@
-/usr/lib/systemd/system/hassos-zram.target
+/usr/lib/systemd/system/hassos-zram.target

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

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

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

@@ -1,3 +1,3 @@
 [Unit]
-Requires=docker.service
-After=docker.service
+Wants=hassos-supervisor.service
+After=hassos-supervisor.service

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

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

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

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

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/etc/tmpfiles.d/nm.conf

@@ -0,0 +1,4 @@
+# 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/usr/lib/rauc/post-install

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

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/etc-NetworkManager-system\x2dconnections.mount

@@ -1,7 +1,7 @@
 [Unit]
 Description=NetworkManager persistent system connections
 Requires=mnt-overlay.mount
-After=mnt-overlay.mount
+After=mnt-overlay.mount systemd-tmpfiles-setup.service
 Before=NetworkManager.service hassos-config.service
 
 [Mount]

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/hassos-hardware.target

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

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

@@ -0,0 +1,14 @@
+[Unit]
+Description=HassOS persists journald
+Requires=var-log-journal.mount
+After=sysinit.target systemd-journald.service
+RefuseManualStart=true
+RefuseManualStop=true
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/hassos-persists-journald
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target

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

@@ -1,7 +1,8 @@
 [Unit]
 Description=HassOS supervisor
 Requires=docker.service
-After=docker.service dbus.socket
+Wants=network-online.target
+After=docker.service rauc.service dbus.socket network-online.target
 RequiresMountsFor=/mnt/data
 StartLimitIntervalSec=60
 StartLimitBurst=5

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

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