Bump version to 8.4

* buildroot e7a881ea75...686000eee8 (1):
  > package/bluez5_utils: Fix spamming errors

.dockerignore

@@ -1,3 +1,12 @@
-# Ignore everything except what we really need
+# We don't need this folder because we map the hole folder
-*
+buildroot/
-!scripts/
+buildroot-external/
+buildroot-patches/
+
+# Output/Release directory gets created using build scripts
+output*/
+release/
+
+# Ignore hidden directories as well
+.git/
+.github/

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -25,7 +25,6 @@ body:
       label: What operating system image do you use?
       options:
         - generic-x86-64 (Generic UEFI capable x86-64 systems)
-        - generic-aarch64 (Generic UEFI capable aarch64 systems)
         - khadas-vim3 (Khadas VIM3)
         - odroid-c2 (Hardkernel ODROID-C2)
         - odroid-c4 (Hardkernel ODROID-C4)
@@ -38,7 +37,6 @@ body:
         - rpi4  (Raspberry Pi 4/400 32-bit OS)
         - rpi4-64  (Raspberry Pi 4/400 64-bit OS)
         - tinker (ASUS Tinker Board/Tinker Board S)
-        - yellow (Home Assistant Yellow)
       description: >
         Can be found in the [Configuration panel -> Settings -> Info](https://my.home-assistant.io/redirect/info/). It is listed as the `Board` value.
 

.github/ISSUE_TEMPLATE/config.yml

@@ -5,7 +5,7 @@ contact_links:
     about: Our documentation has its own issue tracker. Please report issues with the website there.
 
   - name: Report incorrect or missing information on our developer documentation
-    url: https://github.com/home-assistant/developers.home-assistant/issues
+    url: https://github.com/home-assistant/developers.home-assistant.io/issues
     about: Our developer documentation has its own issue tracker. Please report issues with the website there.
 
   - name: Request a feature for the Operating System

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-      interval: "weekly"

.github/workflows/dev.yml

@@ -35,7 +35,7 @@ jobs:
           version_pr=$(printf "%05d" ${{ github.event.pull_request.number }})
           echo "Development build for PR #${{ github.event.pull_request.number }}"
           echo "::set-output name=version_pr::${version_pr}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Get Major/Minor version
         id: version_main
         run: |
@@ -43,7 +43,7 @@ jobs:
           build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
           echo "::set-output name=version_main::${major}.${build}"
       - name: Create build matrix
-        uses: actions/github-script@v6
+        uses: actions/github-script@v4
         id: generate_matrix
         with:
           script: |
@@ -72,7 +72,7 @@ jobs:
 
     steps:
       - name: Define git reference
-        uses: actions/github-script@v6
+        uses: actions/github-script@v4
         id: generate_gitref
         with:
           script: |
@@ -81,7 +81,7 @@ jobs:
             return { "ref": context.payload.pull_request.head.sha }
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           submodules: true
           persist-credentials: false
@@ -109,7 +109,7 @@ jobs:
             haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.prepare.outputs.version_dev }} ${{ matrix.board.defconfig }}
 
       - name: Upload images
-        uses: burnett01/rsync-deployments@5.2
+        uses: burnett01/rsync-deployments@4.1
         with:
           rsh: -q
           switches: -aW

.github/workflows/pr-checks.yml

@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         submodules: true
 
     - name: Check Dockerfile
-      uses: brpaz/hadolint-action@v1.5.0
+      uses: brpaz/hadolint-action@v1.1.0
       with:
         dockerfile: Dockerfile
 

.github/workflows/release-drafter.yml

@@ -3,6 +3,7 @@ name: Release Drafter
 on:
   push:
     branches:
+      - dev
       - rel-*
 
 jobs:

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       version_dev: ${{ steps.version_check.outputs.version_dev }}
       matrix: ${{ steps.generate_matrix.outputs.result }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Validate version
         id: version_check
         run: |
@@ -36,7 +36,7 @@ jobs:
           fi
           echo "::set-output name=version_dev::${tag_dev}"
       - name: Create build matrix
-        uses: actions/github-script@v6
+        uses: actions/github-script@v4
         id: generate_matrix
         with:
           script: |
@@ -54,7 +54,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: true
 

.github/workflows/stale.yml

@@ -19,7 +19,7 @@ jobs:
       # - No PRs marked as no-stale or pinned
       # - No issues marked as no-stale, help-wanted or pinned
       - name: 90 days stale issues & PRs policy
-        uses: actions/stale@v5
+        uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 90

Dockerfile

@@ -28,24 +28,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         cpio \
         file \
         git \
-        graphviz \
-        jq \
         make \
         ncurses-dev \
-        openssh-client \
         patch \
         perl \
         python3 \
         python3-matplotlib \
         python-is-python3 \
-        qemu-utils \
+        graphviz \
         rsync \
-        skopeo \
         sudo \
         unzip \
-        vim \
-        wget \
         zip \
+        wget \
+        qemu-utils \
+        openssh-client \
+        vim \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	skopeo \
+	jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Init entry

Documentation/boards/generic-x86-64/README.md

@@ -12,7 +12,6 @@ been tested with is listed below.
 |-----------------------|--------------|---------|-------------|
 | Intel NUC5CPYH        | Q3 2015      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
 | Intel NUC6CAYH        | Q4 2016      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
-| Intel NUC6CAYS        | Q4 2016      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
 | Intel NUC7i3DNHE	| Q3 2017      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
 | Intel NUC10i3FNK2     | Q4 2019      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
 | Gigabyte GB-BPCE-3455 | 2017         | yes*    | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
@@ -49,7 +48,7 @@ The following cards are supported:
 
 ## Bluetooth
 
-Bluetooth integrated in Intel Wireless cards working OK, other options untested.
+Bluetooth is untested.
 
 ## Installation
 

Documentation/kernel.md

@@ -5,18 +5,18 @@ Default Kernel tree: 5.15
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.15.65 |
+| Open Virtual Appliance | 5.15.55 |
-| Raspberry Pi | 5.15.61 |
+| Raspberry Pi | 5.15.32 |
-| Raspberry Pi 0-W | 5.15.61 |
+| Raspberry Pi 0-W | 5.15.32 |
-| Raspberry Pi 2 | 5.15.61 |
+| Raspberry Pi 2 | 5.15.32 |
-| Raspberry Pi 3 | 5.15.61 |
+| Raspberry Pi 3 | 5.15.32 |
-| Raspberry Pi 4 | 5.15.61 |
+| Raspberry Pi 4 | 5.15.32 |
-| Home Assistant Yellow | 5.15.61 |
+| Home Assistant Yellow | 5.15.32 |
-| Tinker Board | 5.15.65 |
+| Tinker Board | 5.15.55 |
-| Odroid-C2 | 5.15.65 |
+| Odroid-C2 | 5.15.55 |
-| Odroid-C4 | 5.15.65 |
+| Odroid-C4 | 5.15.55 |
-| Odroid-N2 | 5.15.65 |
+| Odroid-N2 | 5.15.55 |
-| Odroid-XU4 | 5.15.65 |
+| Odroid-XU4 | 5.15.55 |
-| Generic aarch64 | 5.15.65 |
+| Generic aarch64 | 5.15.55 |
-| Generic x86-64 | 5.15.65 |
+| Generic x86-64 | 5.15.55 |
-| Khadas VIM3 | 5.15.65 |
+| Khadas VIM3 | 5.15.55 |

Documentation/network.md

@@ -128,12 +128,12 @@ profile using DHCP, use the following commands on the host console:
 
 Home Assistant OS will recreate the default connection profile during boot.
 
-### Enabling Wi-Fi
+### Enabling WiFi
 
-Wi-Fi is discouraged for reliability reasons. However, if you still prefer to use Wi-Fi, you can us the `ha network` command to set up Wi-Fi (example for a Raspberry Pi 4, check `ha network info` to check if your board supports Wi-Fi and the name of the Wi-Fi device):
+WiFi is discouraged for reliability reasons. However if you're still like to use WiFi, you can us the `ha network` command to set up WiFi (example for a Raspberry Pi 4, check `ha network info` to check if your board supports WiFi and the name of the WiFi device):
 
 ```bash
-ha network update wlan0 --ipv4-method auto --wifi-auth wpa-psk --wifi-mode infrastructure --wifi-ssid "MY-SSID" --wifi-psk MY_PASS
+ha network update wlan0 --enabled --ipv4-method auto --wifi-auth wpa-psk --wifi-mode infrastructure --wifi-ssid MY-SSID --wifi-psk MY_PASS
 ````
 
 ### Powersave

buildroot-external/board/arm-uefi/generic-aarch64/grub.cfg

@@ -15,43 +15,29 @@ for SLOT in $ORDER; do
         INDEX=0
         OK=$A_OK
         TRY=$A_TRY
+        A_TRY=1
     fi
     if [ "$SLOT" == "B" ]; then
         INDEX=1
         OK=$B_OK
         TRY=$B_TRY
+        B_TRY=1
     fi
-    if [ "$OK" -eq 1 -a "$TRY" -lt 3 ]; then
+    if [ "$OK" -eq 1 -a "$TRY" -eq 0 ]; then
         default=$INDEX
-
-        # increment attempts and save back to slot
-        if [ "$TRY" -eq 1 ]; then
-            TRY=2
-        elif [ "$TRY" -eq 2 ]; then
-            TRY=3
-	else
-            TRY=1
-        fi
-
-	if [ "$SLOT" == "A" ]; then
-            A_TRY=$TRY
-        fi
-	if [ "$SLOT" == "B" ]; then
-            B_TRY=$TRY
-        fi
-
         break
     fi
 done
 
-# No bootable slot found, choose rescue...
+# reset booted flags
 if [ "$default" -eq 99 ]; then
-    if [ "$A_OK" -eq 1 ]; then
+    if [ "$A_OK" -eq 1 -a "$A_TRY" -eq 1 ]; then
-        default=2
+        A_TRY=0
     fi
-    if [ "$B_OK" -eq 1 ]; then
+    if [ "$B_OK" -eq 1 -a "$B_TRY" -eq 1 ]; then
-        default=3
+        B_TRY=0
     fi
+    default=0
 fi
 
 save_env A_TRY A_OK B_TRY B_OK ORDER MACHINE_ID
@@ -71,11 +57,3 @@ menuentry "Slot A (OK=$A_OK TRY=$A_TRY)" {
 menuentry "Slot B (OK=$B_OK TRY=$B_TRY)" {
     linux (${boothd},gpt4)/Image root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B
 }
-
-menuentry "Slot A (rescue shell)" {
-    linux (${boothd},gpt2)/Image root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd $default_cmdline $cmdline rauc.slot=A systemd.unit=recovery.target
-}
-
-menuentry "Slot B (rescue shell)" {
-    linux (${boothd},gpt4)/Image root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B systemd.unit=recovery.target
-}

buildroot-external/board/asus/tinker/kernel.config

@@ -120,6 +120,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y

buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch

@@ -1,94 +0,0 @@
-From 1fb890d987088f5b6b4c165d8d05480e15b8882e Mon Sep 17 00:00:00 2001
-Message-Id: <1fb890d987088f5b6b4c165d8d05480e15b8882e.1662147854.git.stefan@agner.ch>
-From: memeka <mihailescu2m@gmail.com>
-Date: Fri, 18 Jan 2019 14:36:21 +1030
-Subject: [PATCH] ODROID-XU4: regulator: s2mps11: add ethernet power reset in
- shutdown function
-
-Ethernet device cannot be detected on warm boot sometimes. This patch is
-to add the power reset routines for ethernet device using PMIC. Then
-ethernet device can be reset hardware-wise.
-
-Change-Id: Iffbe2966da7e4679f63b91ab79241167391792df
-Signed-off-by: Brian Kim <brian.kim@hardkernel.com>
-Signed-off-by: Marian Mihailescu <mihailescu2m@gmail.com>
----
- drivers/regulator/s2mps11.c | 55 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
-
-diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
-index ebc67e3ddd4f..51f128076db9 100644
---- a/drivers/regulator/s2mps11.c
-+++ b/drivers/regulator/s2mps11.c
-@@ -1117,6 +1117,57 @@ static const struct regulator_desc s2mpu02_regulators[] = {
- 	regulator_desc_s2mpu02_buck7(7),
- };
- 
-+static int s2mps11_pmic_ethonoff(struct platform_device *pdev, bool onoff)
-+{
-+	struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
-+	unsigned int reg_val = 0;
-+	int ret = 0;
-+
-+	ret = regmap_read(iodev->regmap_pmic, S2MPS11_REG_L15CTRL, &reg_val);
-+	if (ret) {
-+		dev_err(&pdev->dev, "failed to read S2MPS11_REG_L15CTRL value\n");
-+		return ret;
-+	}
-+
-+	ret = regmap_read(iodev->regmap_pmic, S2MPS11_REG_L17CTRL, &reg_val);
-+	if (ret) {
-+		dev_err(&pdev->dev, "failed to read S2MPS11_REG_L17CTRL value\n");
-+		return ret;
-+	}
-+
-+	if (onoff) {
-+		/* ETH VDD0 ON */
-+		ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L15CTRL, 0xFF, 0x72);
-+		if (ret) {
-+			dev_err(&pdev->dev, "cannot update S2MPS11 LDO CTRL15 register\n");
-+			return ret;
-+		}
-+
-+		/* ETH VDD1 ON */
-+		ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L17CTRL, 0xFF, 0x72);
-+		if (ret) {
-+			dev_err(&pdev->dev, "cannot update S2MPS11 LDO CTRL17 register\n");
-+			return ret;
-+		}
-+	} else {
-+		/* ETH VDD0 OFF */
-+		ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L15CTRL, 0x3F, 0x00);
-+		if (ret) {
-+			dev_err(&pdev->dev, "cannot update S2MPS11 LDO CTRL15 register\n");
-+			return ret;
-+		}
-+
-+		/* ETH VDD1 OFF */
-+		ret = regmap_update_bits(iodev->regmap_pmic, S2MPS11_REG_L17CTRL, 0x3F, 0x00);
-+		if (ret) {
-+			dev_err(&pdev->dev, "cannot update S2MPS11 LDO CTRL17 register\n");
-+			return ret;
-+		}
-+	}
-+
-+	return ret;
-+}
-+
- static int s2mps11_pmic_probe(struct platform_device *pdev)
- {
- 	struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
-@@ -1219,6 +1270,10 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
- 		}
- 	}
- 
-+	dev_info(&pdev->dev, "Resetting Ethernet\n");
-+	s2mps11_pmic_ethonoff(pdev, false);
-+	mdelay(10);
-+	s2mps11_pmic_ethonoff(pdev, true);
- out:
- 	kfree(rdata);
- 
--- 
-2.37.2
-

buildroot-external/board/pc/generic-x86-64/kernel.config

@@ -154,5 +154,3 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_XTENSA=m
 
 CONFIG_THINKPAD_ACPI=m
-
-CONFIG_SENSORS_K10TEMP=m

buildroot-external/board/pc/grub.cfg

@@ -15,43 +15,29 @@ for SLOT in $ORDER; do
         INDEX=0
         OK=$A_OK
         TRY=$A_TRY
+        A_TRY=1
     fi
     if [ "$SLOT" == "B" ]; then
         INDEX=1
         OK=$B_OK
         TRY=$B_TRY
+        B_TRY=1
     fi
-    if [ "$OK" -eq 1 -a "$TRY" -lt 3 ]; then
+    if [ "$OK" -eq 1 -a "$TRY" -eq 0 ]; then
         default=$INDEX
-
-        # increment attempts and save back to slot
-        if [ "$TRY" -eq 1 ]; then
-            TRY=2
-        elif [ "$TRY" -eq 2 ]; then
-            TRY=3
-	else
-            TRY=1
-        fi
-
-	if [ "$SLOT" == "A" ]; then
-            A_TRY=$TRY
-        fi
-	if [ "$SLOT" == "B" ]; then
-            B_TRY=$TRY
-        fi
-
         break
     fi
 done
 
-# No bootable slot found, choose rescue...
+# reset booted flags
 if [ "$default" -eq 99 ]; then
-    if [ "$A_OK" -eq 1 ]; then
+    if [ "$A_OK" -eq 1 -a "$A_TRY" -eq 1 ]; then
-        default=2
+        A_TRY=0
     fi
-    if [ "$B_OK" -eq 1 ]; then
+    if [ "$B_OK" -eq 1 -a "$B_TRY" -eq 1 ]; then
-        default=3
+        B_TRY=0
     fi
+    default=0
 fi
 
 save_env A_TRY A_OK B_TRY B_OK ORDER MACHINE_ID
@@ -71,11 +57,3 @@ menuentry "Slot A (OK=$A_OK TRY=$A_TRY)" {
 menuentry "Slot B (OK=$B_OK TRY=$B_TRY)" {
     linux (${boothd},gpt4)/bzImage root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B
 }
-
-menuentry "Slot A (rescue shell)" {
-    linux (${boothd},gpt2)/bzImage root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd $default_cmdline $cmdline rauc.slot=A systemd.unit=recovery.target
-}
-
-menuentry "Slot B (rescue shell)" {
-    linux (${boothd},gpt4)/bzImage root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B systemd.unit=recovery.target
-}

buildroot-external/board/raspberrypi/cmdline.txt

@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=tty1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u
+dwc_otg.lpm_enable=0 console=tty1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:55aa:u

buildroot-external/board/raspberrypi/config.txt

@@ -75,8 +75,6 @@ dtparam=audio=on
 # Enable DRM VC4 V3D driver on top of the dispmanx display stack
 dtoverlay=vc4-fkms-v3d
 max_framebuffers=2
-# Enable boost from 1.5Ghz to 1.8Ghz on compatible models
-arm_boost=1
 
 [all]
 #dtoverlay=vc4-fkms-v3d

buildroot-external/board/raspberrypi/yellow/patches/linux/0001-ARM-dts-bcm2711-Add-device-tree-for-Home-Assistant-Y.patch

@@ -1,8 +1,9 @@
-From b28a8f5b591841f88f19cbf9850d713a602d912e Mon Sep 17 00:00:00 2001
+From 2d3d8c091bc692999a1c519c1dc1570cc8be2358 Mon Sep 17 00:00:00 2001
-Message-Id: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+Message-Id: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Apr 2022 14:47:59 +0200
-Subject: [PATCH] ARM: dts: bcm2711: Add device tree for Home Assistant Yellow
+Subject: [PATCH 01/10] ARM: dts: bcm2711: Add device tree for Home Assistant
+ Yellow
 
 Add device tree for Home Assistant Yellow, a Compute Module 4 based I/O
 board.
@@ -18,11 +19,11 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-ha-yellow.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 3dfe451bcb16..d147c3400732 100644
+index f9acf5c4a59b..fb5b4555d42e 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -18,7 +18,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
+@@ -17,7 +17,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
- 	bcm2709-rpi-cm2.dtb \
+ 	bcm2711-rpi-400.dtb \
  	bcm2710-rpi-cm3.dtb \
  	bcm2711-rpi-cm4.dtb \
 -	bcm2711-rpi-cm4s.dtb
@@ -636,13 +637,13 @@ index 000000000000..61d8c81d3de4
 +	};
 +};
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 9873335d0ed2..8c19b62e189e 100644
+index 8eadc747ae1f..786dfe43d804 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
-@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb
+@@ -13,6 +13,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb
+ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
- dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4s.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4-ha-yellow.dtb
  
  subdir-y	+= bcm4908
@@ -655,5 +656,5 @@ index 000000000000..fdc5ec5bc956
 @@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts"
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0002-ARM-dts-bcm2711-yellow-Mux-UART4-for-SiLabs-radio-mo.patch

@@ -1,10 +1,11 @@
-From 7eb647452bb1a3294fae8edc5a323070adff922b Mon Sep 17 00:00:00 2001
+From a4a63bb6f6789c00762b92f0469d10bac525d1f9 Mon Sep 17 00:00:00 2001
-Message-Id: <7eb647452bb1a3294fae8edc5a323070adff922b.1662565903.git.stefan@agner.ch>
+Message-Id: <a4a63bb6f6789c00762b92f0469d10bac525d1f9.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:33:09 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio module
+Subject: [PATCH 02/10] ARM: dts: bcm2711: yellow: Mux UART4 for SiLabs radio
+ module
 
 Enable UART4 by default and mux pins including hardware flow control.
 
@@ -56,5 +57,5 @@ index 61d8c81d3de4..8db71876a78c 100644
  
  	uart5_pins: uart5_pins {
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0003-ARM-dts-bcm2711-yellow-Mux-debug-UART5.patch

@@ -1,10 +1,10 @@
-From a7b86d8d0d81f841d8399a83f0f59f383d1556ed Mon Sep 17 00:00:00 2001
+From c0ddd45166d5aa922045da915202540db3ef2dc2 Mon Sep 17 00:00:00 2001
-Message-Id: <a7b86d8d0d81f841d8399a83f0f59f383d1556ed.1662565903.git.stefan@agner.ch>
+Message-Id: <c0ddd45166d5aa922045da915202540db3ef2dc2.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:44:23 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: Mux debug UART5
+Subject: [PATCH 03/10] ARM: dts: bcm2711: yellow: Mux debug UART5
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
@@ -46,5 +46,5 @@ index 8db71876a78c..d1dea0a214a6 100644
  
  	aliases {
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0004-ARM-dts-bcm2711-yellow-Enable-I2C6-by-default.patch

@@ -1,10 +1,10 @@
-From 8ec364f50abcd9f5fa89f421a7ef8f70dfb2564a Mon Sep 17 00:00:00 2001
+From 606dcdc896ffc18001ad4983d45a2e23cacd040a Mon Sep 17 00:00:00 2001
-Message-Id: <8ec364f50abcd9f5fa89f421a7ef8f70dfb2564a.1662565903.git.stefan@agner.ch>
+Message-Id: <606dcdc896ffc18001ad4983d45a2e23cacd040a.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 14:48:48 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: Enable I2C6 by default
+Subject: [PATCH 04/10] ARM: dts: bcm2711: yellow: Enable I2C6 by default
 
 The main I2C bus used on Yellow is I2C6. Enable it by default.
 
@@ -31,5 +31,5 @@ index d1dea0a214a6..0bdbfdd44aed 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2s_pins>;
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0005-ARM-dts-bcm2711-yellow-add-I2S-audio-codec.patch

@@ -1,10 +1,10 @@
-From 50abc7980f8c575930cc4c928d356763742e81fb Mon Sep 17 00:00:00 2001
+From 298d5254c1c2151b34eaf87f7e2f44205d34d909 Mon Sep 17 00:00:00 2001
-Message-Id: <50abc7980f8c575930cc4c928d356763742e81fb.1662565903.git.stefan@agner.ch>
+Message-Id: <298d5254c1c2151b34eaf87f7e2f44205d34d909.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 4 Mar 2021 17:19:01 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: add I2S audio codec
+Subject: [PATCH 05/10] ARM: dts: bcm2711: yellow: add I2S audio codec
 
 Add TI PCM5122 I2S audio codec.
 
@@ -63,5 +63,5 @@ index 0bdbfdd44aed..f6f42bf45c92 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&audio_pins>;
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0006-ARM-dts-bcm2711-yellow-enable-GPIO-keys.patch

@@ -1,10 +1,10 @@
-From 67751f4575c3837ada1bdec85184c77ea917b83a Mon Sep 17 00:00:00 2001
+From 41127a02d66d07d0a17e904557899b15a067a692 Mon Sep 17 00:00:00 2001
-Message-Id: <67751f4575c3837ada1bdec85184c77ea917b83a.1662565903.git.stefan@agner.ch>
+Message-Id: <41127a02d66d07d0a17e904557899b15a067a692.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 9 Mar 2021 15:02:53 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: enable GPIO keys
+Subject: [PATCH 06/10] ARM: dts: bcm2711: yellow: enable GPIO keys
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
@@ -68,5 +68,5 @@ index f6f42bf45c92..e2fa42a11cc9 100644
  		brcm,pins = <9 10 11>;
  		brcm,function = <BCM2835_FSEL_ALT0>;
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0007-ARM-dts-bcm2711-yellow-add-user-LED.patch

@@ -1,10 +1,10 @@
-From e4db609b1080e4aabb027394966c07e050e02aab Mon Sep 17 00:00:00 2001
+From efe5e827dc0653066ebc9f71de2ccf391a4bb27e Mon Sep 17 00:00:00 2001
-Message-Id: <e4db609b1080e4aabb027394966c07e050e02aab.1662565903.git.stefan@agner.ch>
+Message-Id: <efe5e827dc0653066ebc9f71de2ccf391a4bb27e.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 28 Oct 2021 19:38:04 +0200
-Subject: [PATCH] ARM: dts: bcm2711: yellow: add user LED
+Subject: [PATCH 07/10] ARM: dts: bcm2711: yellow: add user LED
 
 Add yellow user LED.
 
@@ -39,5 +39,5 @@ index e2fa42a11cc9..6039c7894796 100644
  
  &pwm1 {
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0008-ARM-dts-bcm2711-yellow-add-NXP-PCF85063A-RTC.patch

@@ -1,10 +1,10 @@
-From 6625adc479a3e89873127a91064a94881449c0d8 Mon Sep 17 00:00:00 2001
+From 31ab383d0803e39e94472eea192e712fcc6e3cd6 Mon Sep 17 00:00:00 2001
-Message-Id: <6625adc479a3e89873127a91064a94881449c0d8.1662565903.git.stefan@agner.ch>
+Message-Id: <31ab383d0803e39e94472eea192e712fcc6e3cd6.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 12 Nov 2021 17:33:32 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC
+Subject: [PATCH 08/10] ARM: dts: bcm2711: yellow: add NXP PCF85063A RTC
 
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
@@ -28,5 +28,5 @@ index 6039c7894796..f78428ea64f3 100644
  
  &i2s {
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0009-ARM-dts-bcm2711-yellow-enable-USB-host-mode-by-defau.patch

@@ -1,10 +1,11 @@
-From 1acd279eca810707856e5038438f52d694a62170 Mon Sep 17 00:00:00 2001
+From f1553f413c8f53694d2f27db5b5c43d19cf1ff4f Mon Sep 17 00:00:00 2001
-Message-Id: <1acd279eca810707856e5038438f52d694a62170.1662565903.git.stefan@agner.ch>
+Message-Id: <f1553f413c8f53694d2f27db5b5c43d19cf1ff4f.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 7 Jan 2022 17:10:00 +0100
-Subject: [PATCH] ARM: dts: bcm2711: yellow: enable USB host mode by default
+Subject: [PATCH 09/10] ARM: dts: bcm2711: yellow: enable USB host mode by
+ default
 
 The DWC2 controller is disable by default. Enable it since Home
 Assistant Yellow has a USB hub and USB ports connected to it.
@@ -35,5 +36,5 @@ index f78428ea64f3..711a09441ad0 100644
  	led-modes = <0x00 0x08>; /* link/activity link */
  };
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0010-ARM-dts-bcm2711-yellow-use-generic-activity-trigger-.patch

@@ -1,11 +1,11 @@
-From 92332ba4302096777ea47e408f3406da0b2ef2c5 Mon Sep 17 00:00:00 2001
+From 6f5e8133651df38d187c05bc27fd8fa25f0216da Mon Sep 17 00:00:00 2001
-Message-Id: <92332ba4302096777ea47e408f3406da0b2ef2c5.1662565903.git.stefan@agner.ch>
+Message-Id: <6f5e8133651df38d187c05bc27fd8fa25f0216da.1651085802.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+In-Reply-To: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
+References: <2d3d8c091bc692999a1c519c1dc1570cc8be2358.1651085802.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 27 Apr 2022 20:36:19 +0200
-Subject: [PATCH] ARM: dts: bcm2711: yellow: use generic activity trigger for
+Subject: [PATCH 10/10] ARM: dts: bcm2711: yellow: use generic activity trigger
- green LED
+ for green LED
 
 Use the generic trigger "activity" for the green LED so that any
 system activity is shown.
@@ -29,5 +29,5 @@ index 711a09441ad0..f2f4f1a49592 100644
  	};
  
 -- 
-2.37.3
+2.36.0
 

buildroot-external/board/raspberrypi/yellow/patches/linux/0011-ARM-dts-bcm2711-yellow-use-USB-OTG-mode-by-default.patch

@@ -1,32 +0,0 @@
-From 59e44006c1e7406bd1fc52aa9b1fc88a67652ddd Mon Sep 17 00:00:00 2001
-Message-Id: <59e44006c1e7406bd1fc52aa9b1fc88a67652ddd.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Tue, 26 Jul 2022 15:53:59 +0200
-Subject: [PATCH] ARM: dts: bcm2711: yellow: use USB OTG mode by default
-
-OTG seems to work fine, and allows to use the USB-C port as a USB
-peripheral (e.g. in U-Boot via UMS command).
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index f2f4f1a49592..f354bfb69093 100644
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -601,7 +601,7 @@ &sdhost {
- 
- &usb {
- 	compatible = "brcm,bcm2835-usb";
--	dr_mode = "host";
-+	dr_mode = "otg";
- 	g-np-tx-fifo-size = <32>;
- 	g-rx-fifo-size = <558>;
- 	g-tx-fifo-size = <512 512 512 512 512 256 256>;
--- 
-2.37.3
-

buildroot-external/board/raspberrypi/yellow/patches/linux/0012-ARM-dts-bcm2711-yellow-Add-LED-overrides.patch

@@ -1,68 +0,0 @@
-From f69ef30ade36371215d02546d603143cc13adef2 Mon Sep 17 00:00:00 2001
-Message-Id: <f69ef30ade36371215d02546d603143cc13adef2.1662565903.git.stefan@agner.ch>
-In-Reply-To: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-References: <b28a8f5b591841f88f19cbf9850d713a602d912e.1662565903.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Sat, 30 Jul 2022 11:21:31 +0200
-Subject: [PATCH] ARM: dts: bcm2711: yellow: Add LED overrides
-
-Add device tree overrides for all three LEDs.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-index f354bfb69093..2d272a02128b 100644
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-yellow.dts
-@@ -621,20 +621,24 @@ audio_pins: audio_pins {
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
-+		label = "act";
- 		linux,default-trigger = "activity";
-+		default-state = "off";
- 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
-+		label = "pwr";
- 		linux,default-trigger = "default-on";
-+		default-state = "off";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
- 	};
- 
--	user_led: led-user {
--		label = "led2";
-+	usr_led: led-usr {
-+		label = "usr";
- 		linux,default-trigger = "heartbeat";
-+		default-state = "off";
-+		panic-indicator;
- 		gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
- 	};
- };
-@@ -670,14 +674,13 @@ cam0_reg: &cam1_reg {
- 
- / {
- 	__overrides__ {
--		act_led_gpio = <&act_led>,"gpios:4";
--		act_led_activelow = <&act_led>,"gpios:8";
- 		act_led_trigger = <&act_led>,"linux,default-trigger";
- 
--		pwr_led_gpio = <&pwr_led>,"gpios:4";
- 		pwr_led_activelow = <&pwr_led>,"gpios:8";
- 		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
- 
-+		usr_led_trigger = <&usr_led>,"linux,default-trigger";
-+
- 		eth_led0 = <&phy1>,"led-modes:0";
- 		eth_led1 = <&phy1>,"led-modes:4";
- 
--- 
-2.37.3
-

buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush

@@ -20,22 +20,12 @@ 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 systemd.machine_id=${MACHINE_ID} cgroup_enable=memory fsck.repair=yes"
 
-# Red Button pressed?
 if gpio input GPIO27; then
   sleep 1
-  # ... and Blue Button Pressed?
-  if gpio input GPIO26; then
-    echo "Boot wipe has been pressed, deleting boot files to trigger USB boot..."
-    fatrm mmc 0:1 /start4.elf
-    reset
-  fi
-  # Red still pressed?
   if gpio input GPIO27; then
     echo "Device wipe button has been pressed, setting wipe flag..."
     setenv bootargs_hassos "${bootargs_hassos} haos.wipe=1"
   fi
-elif gpio input GPIO26; then
-  ums 0 mmc 0
 fi
 
 # HassOS system A/B

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

@@ -1,3 +1,2 @@
 CONFIG_CMD_NVME=y
 CONFIG_NVME=y
-CONFIG_CMD_USB_MASS_STORAGE=y

buildroot-external/configs/generic_aarch64_defconfig

@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64 $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -71,11 +71,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/generic_x86_64_defconfig

@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -71,11 +71,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/khadas_vim3_defconfig

@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3 $(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/kernel-vim.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -58,12 +58,8 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/odroid_c2_defconfig

@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -58,12 +58,8 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/odroid_c4_defconfig

@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -56,12 +56,8 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/odroid_n2_defconfig

@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
@@ -58,12 +58,8 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/odroid_xu4_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -58,12 +58,8 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/ova_defconfig

@@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -71,11 +71,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/rpi2_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220830.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -62,11 +62,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/rpi3_64_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220830.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -64,11 +64,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/rpi3_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220830.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -65,11 +65,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/rpi4_64_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220830.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -65,11 +65,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/rpi4_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220830.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -64,11 +64,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/tinker_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.65"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.55"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -60,11 +60,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/yellow_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220830.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -64,11 +64,7 @@ BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
-BR2_PACKAGE_DBUS_BROKER=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/kernel/device-support.config

@@ -1,10 +1,3 @@
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VUDC=m
-
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_OPTION=m
@@ -35,6 +28,9 @@ CONFIG_USB_NET_SMSC95XX=m
 
 CONFIG_MEDIA_CEC_SUPPORT=y
 
+CONFIG_BT=y
+CONFIG_BT_BREDR=y
+CONFIG_BT_LE=y
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m

buildroot-external/kernel/docker.config

@@ -2,6 +2,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_NET_SCHED=y
 
 CONFIG_CGROUPS=y
@@ -47,10 +48,6 @@ CONFIG_NF_CONNTRACK=y
 CONFIG_NF_NAT=y
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_NAT=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
@@ -74,6 +71,7 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_OVERLAY_FS=y
+CONFIG_OVERLAY_FS_REDIRECT_DIR=y
 CONFIG_OVERLAY_FS_METACOPY=y
 
 CONFIG_CRYPTO_CCM=m

buildroot-external/kernel/hassos.config

@@ -2,8 +2,6 @@ CONFIG_KERNEL_LZ4=y
 CONFIG_CMDLINE=""
 CONFIG_PANIC_TIMEOUT=5
 
-CONFIG_MODULE_COMPRESS_NONE=y
-
 CONFIG_ZRAM=y
 CONFIG_ZSMALLOC=y
 
@@ -34,21 +32,8 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_LOGO is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 
-CONFIG_BT=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_LE=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_LEDS=y
-
 CONFIG_IPV6=y
 CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_SIT=m
 
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y

buildroot-external/meta

@@ -1,7 +1,7 @@
-VERSION_MAJOR=9
+VERSION_MAJOR=8
-VERSION_BUILD=0
+VERSION_BUILD=4
 
 HASSOS_NAME="Home Assistant OS"
 HASSOS_ID="haos"
 
-DEPLOYMENT="development"
+DEPLOYMENT="production"

buildroot-external/ota/rauc-hook

@@ -56,23 +56,6 @@ install_spl() {
     fi
 }
 
-check_grubenv() {
-    BOOT_MNT=/mnt/boot
-
-    # Mount boot
-    if ! systemctl -q is-active mnt-boot.mount; then
-        systemctl start mnt-boot.mount
-    fi
-
-    # If GRUB is installed, check if GRUB environment has been currupted
-    if command -v grub-editenv > /dev/null; then
-        if ! grub-editenv "${BOOT_MNT}/EFI/BOOT/grubenv" list > /dev/null; then
-            echo "GRUB environment seems to be corrupted. Recreating a new environment."
-            grub-editenv "${BOOT_MNT}"/EFI/BOOT/grubenv create
-        fi
-    fi
-}
-
 post_install_kernel() {
     BOOT_MNT=/mnt/boot
 
@@ -96,9 +79,6 @@ post_install_kernel() {
 case "$1" in
      install-check)
          if [ "$RAUC_MF_COMPATIBLE" = "$RAUC_SYSTEM_COMPATIBLE" ]; then
-             # Check if GRUB env has been corrupted. This is only problematic
-             # with OS 8, where compatible matches.
-             check_grubenv
              exit 0
          fi
          # Be compatible with hassos OS ID

buildroot-external/package/hassio/dind-import-containers.sh

@@ -10,19 +10,15 @@ while ! docker version 2> /dev/null > /dev/null; do
 done
 
 # Install Supervisor, plug-ins and landing page
-echo "Loading container images..."
+echo "Loading containers..."
-
+for image in /build/images/*.tar; do
-# Make sure to order images by size (largest first)
-# It seems docker load requires space during operation
-# shellcheck disable=SC2045
-for image in $(ls -S /build/images/*.tar); do
 	docker load --input "${image}"
 done
 
 # Tag the Supervisor how the OS expects it to be tagged
 supervisor=$(docker images --filter "label=io.hass.type=supervisor" --quiet)
 arch=$(docker inspect --format '{{ index .Config.Labels "io.hass.arch" }}' "${supervisor}")
-docker tag "${supervisor}" "ghcr.io/home-assistant/${arch}-hassio-supervisor:latest"
+docker tag "${supervisor}" "homeassistant/${arch}-hassio-supervisor:latest"
 
 # Setup AppArmor
 mkdir -p "/data/supervisor/apparmor"

buildroot-external/package/os-agent/os-agent.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OS_AGENT_VERSION = 1.3.0
+OS_AGENT_VERSION = 1.2.1
 OS_AGENT_SITE = $(call github,home-assistant,os-agent,$(OS_AGENT_VERSION))
 OS_AGENT_LICENSE = Apache License 2.0
 OS_AGENT_LICENSE_FILES = LICENSE

buildroot-external/patches/network-manager/0001-connectivity-handle-NoNameServers-resolved-error-and.patch

@@ -1,46 +0,0 @@
-From 88f63699c444e43096e765b2603aa211a8ae58bb Mon Sep 17 00:00:00 2001
-Message-Id: <88f63699c444e43096e765b2603aa211a8ae58bb.1661980860.git.stefan@agner.ch>
-From: Thomas Haller <thaller@redhat.com>
-Date: Fri, 8 Apr 2022 15:33:39 +0200
-Subject: [PATCH] connectivity: handle "NoNameServers" resolved error and don't
- callback to system resolver
-
-No need to try further. The verdict is clear.
-
-From the log:
-
-  <debug> [1649424031.1507] connectivity: (wlan0,IPv4,427) can't resolve a name via systemd-resolved: GDBus.Error:org.freedesktop.resolve1.NoNameServers: No appropriate name servers or networks for name found
-  <debug> [1649424031.1507] connectivity: (wlan0,IPv4,427) start request to 'http://fedoraproject.org/static/hotspot.txt' (try resolving 'fedoraproject.org' using system resolver)
-
-(cherry picked from commit 5b779c1ab7fb53857db235383af8274ab824a55e)
-(altered to apply to 1.34.0)
----
- src/core/nm-connectivity.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
-index 13fb026514..3e4914ee3b 100644
---- a/src/core/nm-connectivity.c
-+++ b/src/core/nm-connectivity.c
-@@ -719,8 +719,17 @@ resolve_cb(GObject *object, GAsyncResult *res, gpointer user_data)
-     g_clear_object(&cb_data->concheck.resolve_cancellable);
- 
-     if (!result) {
--        /* Never mind. Just let do curl do its own resolving. */
-+        gs_free char *dbus_error = NULL;
-+
-         _LOG2D("can't resolve a name via systemd-resolved: %s", error->message);
-+
-+        dbus_error = g_dbus_error_get_remote_error(error);
-+        if (nm_streq0(dbus_error, "org.freedesktop.resolve1.NoNameServers")) {
-+            cb_data_complete(cb_data, NM_CONNECTIVITY_LIMITED, "resolve-error");
-+            return;
-+        }
-+
-+        /* Never mind. Just let do curl do its own resolving. */
-         do_curl_request(cb_data);
-         return;
-     }
--- 
-2.37.2
-

buildroot-external/rootfs-overlay/etc/docker/daemon.json

@@ -1,11 +0,0 @@
-{
-    "storage-driver": "overlay2",
-    "log-driver": "journald",
-    "experimental": true,
-    "ip6tables": true,
-    "log-opts": {
-        "tag": "{{.Name}}"
-    },
-    "data-root": "/mnt/data/docker",
-    "deprecated-key-path": "/mnt/overlay/etc/docker/key.json"
-}

buildroot-external/rootfs-overlay/etc/systemd/system/dbus-broker.service.d/haos.conf

@@ -1,3 +0,0 @@
-[Service]
-PrivateTmp=false
-PrivateDevices=false

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

@@ -1,6 +1,2 @@
 [Unit]
 FailureAction=reboot
-
-[Service]
-ExecStartPre=/usr/libexec/docker-disk-check
-ExecStopPost=/usr/libexec/docker-failure

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

@@ -2,4 +2,5 @@
 RequiresMountsFor=/etc/docker /mnt/data /var/lib/docker
 
 [Service]
-OOMScoreAdjust=-400
+ExecStart=
+ExecStart=/usr/bin/dockerd -H fd:// --cpu-rt-runtime=950000 --storage-driver=overlay2 --log-driver=journald --log-opt tag="{{.ImageName}}/{{.Name}}" --data-root /mnt/data/docker

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/systemd-time-wait-sync.service.d/network-online.conf

@@ -1,6 +0,0 @@
-[Unit]
-Wants=network-online.target
-
-[Install]
-WantedBy=
-WantedBy=time-sync.target

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

@@ -1,60 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1-or-later
-#
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Network Time Synchronization
-Documentation=man:systemd-timesyncd.service(8)
-ConditionCapability=CAP_SYS_TIME
-ConditionVirtualization=!container
-DefaultDependencies=no
-After=systemd-sysusers.service
-Before=time-set.target shutdown.target
-Conflicts=shutdown.target
-Wants=time-set.target
-
-[Service]
-AmbientCapabilities=CAP_SYS_TIME
-BusName=org.freedesktop.timesync1
-CapabilityBoundingSet=CAP_SYS_TIME
-# Turn off DNSSEC validation for hostname look-ups, since those need the
-# correct time to work, but we likely won't acquire that without NTP. Let's
-# break this chicken-and-egg cycle here.
-Environment=SYSTEMD_NSS_RESOLVE_VALIDATE=0
-ExecStart=!!/usr/lib/systemd/systemd-timesyncd
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-NoNewPrivileges=yes
-PrivateDevices=yes
-PrivateTmp=yes
-ProtectProc=invisible
-ProtectControlGroups=yes
-ProtectHome=yes
-ProtectHostname=yes
-ProtectKernelLogs=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=strict
-Restart=always
-RestartSec=0
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-RestrictNamespaces=yes
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-RuntimeDirectory=systemd/timesync
-StateDirectory=systemd/timesync
-SystemCallArchitectures=native
-SystemCallErrorNumber=EPERM
-SystemCallFilter=@system-service @clock
-Type=notify
-User=systemd-timesync
-WatchdogSec=3min
-
-[Install]
-WantedBy=time-sync.target
-Alias=dbus-org.freedesktop.timesync1.service

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

@@ -1,3 +1,2 @@
 [Unit]
 RequiresMountsFor=/var/lib/systemd
-After=network-online.target

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

@@ -1,4 +1,2 @@
 [Time]
 FallbackNTP=time.cloudflare.com
-# Speed-up boot as first attempt is done before network is up
-ConnectionRetrySec=10

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

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

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

@@ -1,11 +1,11 @@
 [Unit]
 Description=HassOS supervisor
-Requires=docker.service rauc.service dbus.socket
+Requires=docker.service rauc.service dbus.service
 Wants=network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket
-After=docker.service rauc.service dbus.socket network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket
+After=docker.service rauc.service dbus.service network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket
 RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay
-StartLimitIntervalSec=30m
+StartLimitIntervalSec=60
-StartLimitBurst=3
+StartLimitBurst=5
 ConditionPathExists=/run/dbus/system_bus_socket
 ConditionPathExists=/run/docker.sock
 

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

@@ -12,7 +12,6 @@ Wants=systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service systemd-growfs@mn
 What=/dev/disk/by-label/hassos-data
 Where=/mnt/data
 Type=ext4
-Options=commit=30
 
 [Install]
 WantedBy=local-fs.target

buildroot-external/rootfs-overlay/usr/libexec/docker-disk-check

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Check if less than 128MiB is available on /mnt/data (4k block size).
-if [ "$(stat -f /mnt/data -c '%f')" -lt 32768 ]; then
-    echo "The system is very low on disk space!"
-    echo "This can cause Docker to fail to start, causing a boot loop."
-    echo "Asking systemd-journald to free up some space."
-    # systemd-journald defaults to 10% of disk size. So this should free up
-    # space for any system which has been running for a while (presumably it
-    # has when there is no space) and has a disk size larger than ~2.5GiB.
-    journalctl --vacuum-size=256M
-fi

buildroot-external/rootfs-overlay/usr/libexec/docker-failure

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ "$SERVICE_RESULT" = "exit-code" ] && [ "$EXIT_STATUS" = "1" ]; then
-    echo "Docker exited with exit status 1, this might be caused by corrupted key.json."
-    size=$(stat -c %s "/etc/docker/key.json")
-    echo "key.json: ${size} bytes"
-    if ! jq < "/etc/docker/key.json" > /dev/null || [ "${size}" -eq 0 ]; then
-        echo "key.json appears to be corrupted, it is not parsable. Removing it."
-        rm -f "/etc/docker/key.json"
-    fi
-fi

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

@@ -12,7 +12,7 @@ set -e
 SUPERVISOR_DATA=/mnt/data/supervisor
 SUPERVISOR_STARTUP_MARKER="/run/supervisor/startup-marker"
 SUPERVISOR_STARTSCRIPT_VERSION="/mnt/data/.hassos-supervisor-version"
-SUPERVISOR_IMAGE="ghcr.io/home-assistant/${SUPERVISOR_ARCH}-hassio-supervisor"
+SUPERVISOR_IMAGE="homeassistant/${SUPERVISOR_ARCH}-hassio-supervisor"
 
 SUPERVISOR_IMAGE_ID=$(docker images --no-trunc --filter "reference=${SUPERVISOR_IMAGE}:latest" --format "{{.ID}}" || echo "")
 SUPERVISOR_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor || echo "")
@@ -33,13 +33,6 @@ fi
 # If Supervisor image is missing, pull it
 mkdir -p "$(dirname ${SUPERVISOR_STARTUP_MARKER})"
 touch ${SUPERVISOR_STARTUP_MARKER}
-if [ -z "${SUPERVISOR_IMAGE_ID}" ]; then
-    # Try tagging legacy image with current name and try get its ID
-    echo "[WARNING] Supervisor image missing, trying to use the legacy image name"
-    docker tag "homeassistant/${SUPERVISOR_ARCH}-hassio-supervisor:latest" "${SUPERVISOR_IMAGE}:latest" || true
-    SUPERVISOR_IMAGE_ID=$(docker images --no-trunc --filter "reference=${SUPERVISOR_IMAGE}:latest" --format "{{.ID}}" || echo "")
-fi
-
 if [ -z "${SUPERVISOR_IMAGE_ID}" ]; then
     # Get the latest from update information
     # Using updater information instead of config. If the config version is
@@ -87,9 +80,7 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
     docker container create \
         --name hassio_supervisor \
         --privileged --security-opt apparmor="hassio-supervisor" \
-        --oom-score-adj=-300 \
         -v /run/docker.sock:/run/docker.sock:rw \
-        -v /run/docker/containerd/containerd.sock:/run/docker/containerd/containerd.sock:rw \
         -v /run/systemd-journal-gatewayd.sock:/run/systemd-journal-gatewayd.sock:rw \
         -v /run/dbus:/run/dbus:ro \
         -v /run/supervisor:/run/os:rw \
@@ -98,6 +89,7 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
         -v ${SUPERVISOR_DATA}:/data:rw \
         -e SUPERVISOR_SHARE=${SUPERVISOR_DATA} \
         -e SUPERVISOR_NAME=hassio_supervisor \
+        -e SUPERVISOR_CPU_RT=1 \
         -e SUPERVISOR_MACHINE=${SUPERVISOR_MACHINE} \
         "${SUPERVISOR_IMAGE}:latest"
 

scripts/update-kernel-rpi.sh

@@ -11,9 +11,9 @@ if [ -z "$2" ]; then
     exit 1
 fi
 
-defconfigs=(buildroot-external/configs/{rpi*,yellow}_defconfig)
+defconfigs=(buildroot-external/configs/rpi*_defconfig)
 sed -i "s|BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/raspberrypi/linux/.*\"|BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/raspberrypi/linux/archive/$1.tar.gz\"|g" "${defconfigs[@]}"
-sed -i "s/| \(Raspberry Pi.*\|Home Assistant Yellow\) | .* |/| \1 | $2 |/g" Documentation/kernel.md
+sed -i "s/| Raspberry Pi\(.*\) | .* |/| Raspberry Pi\1 | $2 |/g" Documentation/kernel.md
 git commit -m "RaspberryPi: Update kernel $2 - $1" "${defconfigs[@]}" Documentation/kernel.md
 
 ./scripts/check-kernel-patches.sh