Bump version to 9.4

Bump buildroot (#2253 )
* buildroot 54eff73a8f...80bb9553ec (1): > Merge tag '2022.02.7' into 2022.02.x-haos
2025-08-01 17:27:41 +00:00 · 2022-12-01 09:25:53 +01:00 · 2022-12-01 09:25:46 +01:00 · 2022-11-30 10:31:55 +01:00 · 2022-11-30 10:31:46 +01:00 · 2022-11-30 10:31:46 +01:00
448 changed files with 15525 additions and 26089 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,5 +1,6 @@
-name: Report an issue with Home Assistant Operating System
+name: Bug Report Form
 description: Report an issue related to the Home Assistant Operating System.
+labels: bug
 body:
  - type: markdown
    attributes:
@ -22,15 +23,12 @@ body:
      required: true
    attributes:
      label: What operating system image do you use?
-      default: 0
      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)
-        - odroid-m1 (Hardkernel ODROID-M1)
-        - odroid-m1s (Hardkernel ODROID-M1S)
        - odroid-n2 (Hardkernel ODROID-N2/N2+)
        - odroid-xu4 (Hardkernel ODROID-XU4)
        - ova (for Virtual Machines)
@ -39,14 +37,12 @@ body:
        - rpi3-64 (Raspberry Pi 3 64-bit OS)
        - rpi4  (Raspberry Pi 4/400 32-bit OS)
        - rpi4-64  (Raspberry Pi 4/400 64-bit OS)
-        - rpi5-64  (Raspberry Pi 5 64-bit OS)
        - tinker (ASUS Tinker Board/Tinker Board S)
        - yellow (Home Assistant Yellow)
-        - green (Home Assistant Green)
      description: >
-        Can be found in [Settings -> System -> Repairs -> System Information](https://my.home-assistant.io/redirect/system_health/). It is listed as the `Board` value.
+        Can be found in the [Configuration panel -> Settings -> Info](https://my.home-assistant.io/redirect/info/). It is listed as the `Board` value.

-        [![Open your Home Assistant instance and show health information about your system.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
+        [![Open your Home Assistant instance and show your Home Assistant version information.](https://my.home-assistant.io/badges/info.svg)](https://my.home-assistant.io/redirect/info/)
  - type: input
    validations:
      required: true
@ -54,26 +50,15 @@ body:
      label: What version of Home Assistant Operating System is installed?
      placeholder: "6.6"
      description: >
-        Can be found in [Settings -> System -> Repairs -> System Information (top right menu)](https://my.home-assistant.io/redirect/system_health/). It is listed as the `Host Operating System` value.
+        Can be found in the [Configuration panel -> Settings -> Info](https://my.home-assistant.io/redirect/info/). It is listed as the `Host Operating System` value.
  - type: dropdown
    validations:
      required: true
    attributes:
-      label: Did the problem occur after upgrading the Operating System?
-      default: 0
+      label: Did you upgrade the Operating System.
      options:
-        - "No"
        - "Yes"
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Hardware details
-      description: >
-        Provide details about the hardware used for your install.
-        This is especially important for bare-metal x86 installations.
-        If you have any USB devices attached, please list them here.
-        For VMs, include the hypervisor type and version.
+        - "No"
  - type: textarea
    validations:
      required: true
@ -93,10 +78,9 @@ body:
    attributes:
      label: Anything in the Supervisor logs that might be useful for us?
      description: >
-        Supervisor Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/?provider=supervisor)
-        then choose `Supervisor` in the top right. Alternatively enter `ha supervisor logs` in the Home Assistant CLI.
+        Supervisor Logs can be found under [Configuration panel -> Add-ons, Backup & Supervisor -> System](https://my.home-assistant.io/redirect/supervisor_logs/), then choose Log Provider `Supervisor`.

-        [![Open your Home Assistant instance and show your Supervisor system logs.](https://my.home-assistant.io/badges/supervisor_logs.svg)](https://my.home-assistant.io/redirect/logs/?provider=supervisor)
+        [![Open your Home Assistant instance and show your Supervisor system logs.](https://my.home-assistant.io/badges/supervisor_logs.svg)](https://my.home-assistant.io/redirect/supervisor_logs/)
      render: txt
  - type: textarea
    validations:
@ -104,19 +88,16 @@ body:
    attributes:
      label: Anything in the Host logs that might be useful for us?
      description: >
-        Host Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/?provider=host)
-        then choose `Host` in the top right. Alternatively enter `ha host logs` in the Home Assistant CLI.
+        Supervisor Logs can be found under [Configuration panel -> Add-ons, Backup & Supervisor -> System](https://my.home-assistant.io/redirect/supervisor_logs/), then choose Log Provider `Host`.
      render: txt
  - type: textarea
    attributes:
-      label: System information
+      label: System Health information
      description: >
        **Optional** Copy the full System Health in this text area.

-        System information can be found in [Settings -> System -> Repairs -> System Information (top right menu)](https://my.home-assistant.io/redirect/system_health/),
-        Click the copy button at the bottom of the pop-up and paste it here.
-        
-        [![Open your Home Assistant instance and show health information about your system.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
+        Can be found in the [Configuration panel -> Settings -> Info](https://my.home-assistant.io/redirect/info/).
+        Use the copy icon on top right and choose `For GitHub`.
  - type: textarea
    attributes:
      label: Additional information
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -9,7 +9,7 @@ contact_links:
    about: Our developer documentation has its own issue tracker. Please report issues with the website there.

  - name: Request a feature for the Operating System
-    url: https://github.com/orgs/home-assistant/discussions
+    url: https://community.home-assistant.io/c/feature-requests
    about: Request an new feature for the Operating System.

  - name: I have a question or need support
--- a/.github/actions/bump-rpi-imager-version/action.yml
+++ b/.github/actions/bump-rpi-imager-version/action.yml
@ -1,97 +0,0 @@
-name: 'Bump RPi Imager OS version'
-description: 'Bump version of Home Assistant OS in RPi Imager'
-inputs:
-  version:
-    required: true
-    description: "Version of Home Assistant OS to bump to."
-  release-date:
-    required: true
-    description: "Release date as ISO 8601 date string."
-runs:
-  using: "composite"
-  steps:
-    - shell: bash
-      id: validate-input
-      env:
-        INPUTS_DATE: ${{ inputs.release-date }}
-      run: |
-        if [[ -z "$INPUTS_DATE" ]] || [[ ! "$INPUTS_DATE" =~ ^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$ ]]; then
-          echo "::error::Argument 'release-date' must be an ISO 8601 date string."
-          exit 1
-        else
-          echo "date=$(date --date=${INPUTS_DATE} +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
-        fi
-
-    - shell: bash
-      run: git clone --depth 1 https://github.com/home-assistant/version.git /tmp/version
-
-    - shell: bash
-      env:
-        INPUTS_VERSION: ${{ inputs.version }}
-      run: |
-        function bump_entry() {
-          json=$1
-          version=$2
-          release_date=$3
-          image_id=$4
-          image_name=$5
-          url="https://github.com/home-assistant/operating-system/releases/download/${version}/haos_${image_id}-${version}.img.xz"
-          temp_image=$(mktemp --suffix=.img.xz)
-          temp_out=$(mktemp)
-
-          curl -fsL -o "$temp_image" "$url"
-          image_download_size=$(stat --printf="%s" "$temp_image")
-          image_download_sha256=$(sha256sum "$temp_image" | awk '{print $1}')
-          unxz "$temp_image"
-          temp_unpacked="${temp_image%.*}"
-          extract_size=$(stat --printf="%s" "$temp_unpacked")
-          extract_sha256=$(sha256sum "$temp_unpacked" | awk '{print $1}')
-
-          entry_name="Home Assistant OS ${version} (${image_name})"
-
-            jq '
-              . as $data
-              | $data
-              | .os_list = [
-                  .os_list[]
-                  | if .name | test("Home Assistant OS .* \\(" + $image_name + "\\)") then
-                    .name = "Home Assistant OS " + $version + " (" + $image_name + ")"
-                    | .url = $url
-                    | .extract_size = ($extract_size | tonumber)
-                    | .extract_sha256 = $extract_sha256
-                    | .release_date = $release_date
-                    | .image_download_size = ($image_download_size | tonumber)
-                    | .image_download_sha256 = $image_download_sha256
-                  else .
-                  end
-                ]' \
-              --arg version "$version" \
-              --arg image_name "$image_name" \
-              --arg entry_name "$entry_name" \
-              --arg release_date "$release_date" \
-              --arg url "$url" \
-              --arg image_download_size "$image_download_size" \
-              --arg image_download_sha256 "$image_download_sha256" \
-              --arg extract_size "$extract_size" \
-              --arg extract_sha256 "$extract_sha256" \
-              "$json" > "$temp_out"
-
-          mv "$temp_out" "$json"
-          rm -rf "$temp_unpacked" "$temp_out"
-        }
-
-        bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi3-64" "RPi 3"
-        bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi4-64" "RPi 4/400"
-        bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi5-64" "RPi 5"
-        bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "yellow" "Yellow"
-
-    - shell: bash
-      env:
-        INPUTS_VERSION: ${{ inputs.version }}
-      run: |
-        cd /tmp/version
-        git commit -am "Bump Home Assistant OS to ${INPUTS_VERSION} for RPi Imager"
-        git push
-
-    - shell: bash
-      run: rm -rf /tmp/version
--- a/.github/actions/haos-builder-command/action.yml
+++ b/.github/actions/haos-builder-command/action.yml
@ -1,22 +0,0 @@
-name: "Run command in HAOS build container"
-inputs:
-  image:
-    description: "HAOS builder image to use"
-    required: true
-  command:
-    description: "Command to run in the container"
-    required: true
-runs:
-  using: 'composite'
-  steps:
-  - name: "Run command in HAOS build container"
-    shell: bash
-    run: |
-      docker run --rm --privileged \
-        -e BUILDER_UID="$(id -u)" \
-        -e BUILDER_GID="$(id -g)" \
-        -v "${GITHUB_WORKSPACE}:/build" \
-        -v "/mnt/cache:/cache" \
-        -v "/mnt/output:/build/output" \
-        ${{ inputs.image }} \
-        ${{ inputs.command }}
--- a/.github/label-actions.yml
+++ b/.github/label-actions.yml
@ -8,7 +8,6 @@ assume-fixed:
    release. You can find the latest stable release at
    https://github.com/home-assistant/operating-system/releases/latest
  close: true
-  close-reason: not planned

 core-issue:
  comment: >
@ -20,19 +19,6 @@ core-issue:
    repository, the issue might have been reported already. Open a new issue
    in that repository if you can't find a matching issue.
  close: true
-  close-reason: not planned
-
-frontend-issue:
-  comment: >
-    :wave: @{issue-author}, thanks for reporting an issue!
-
-
-    It looks like this issue is related to Home Assistant Frontend. Please
-    check the [Home Assistant Frontend](https://github.com/home-assistant/frontend/issues)
-    repository, the issue might have been reported already. Open a new issue
-    in that repository if you can't find a matching issue.
-  close: true
-  close-reason: not planned

 supervisor-issue:
  comment: >
@ -44,16 +30,3 @@ supervisor-issue:
    repository, the issue might have been reported already. Open a new issue
    in that repository if you can't find a matching issue.
  close: true
-  close-reason: not planned
-
-new-feature:
-  comment: >
-    :wave: @{issue-author}, thanks for your input!
-
-    We use this issue tracker to track issues of currently supported features.
-    Your request appears to request a new feature. We track potential new
-    features in the [Feature Request section of our Community Forum](https://community.home-assistant.io/c/feature-requests/13).
-    Please check if someone already requested a similar feature, or create
-    a new feature request with the "haos" tag in that forum. Thank you!
-  close: true
-  close-reason: not planned
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@ -1,15 +1,14 @@
-name-template: Home Assistant OS $RESOLVED_VERSION
-tag-template: $RESOLVED_VERSION
+name-template: Home Assistant OS $NEXT_MINOR_VERSION
 version-template: "$MAJOR.$MINOR"
 categories:
  - title: 'Home Assistant Operating System'
    label: 'os'
+  - title: 'Build System'
+    label: 'build'
  - title: 'Raspberry Pi'
    label: 'board/raspberrypi'
  - title: 'Home Assistant Yellow'
    label: 'board/yellow'
-  - title: 'Home Assistant Green'
-    label: 'board/green'
  - title: 'Open Virtual Appliance'
    label: 'board/ova'
  - title: 'Generic x86-64'
@ -22,19 +21,8 @@ categories:
    label: 'board/khadas'
  - title: 'Generic aarch64'
    label: 'board/generic-aarch64'
-  - title: 'Documentation'
-    label: 'documentation'
-  - title: 'Build System'
-    label: 'build'
-  - title: 'Dependencies'
-    label: 'dependencies'
 filter-by-commitish: true
 template: |
  ## Changes

  $CHANGES
-version-resolver:
-  major:
-    labels:
-      - 'major'
-  default: minor
--- a/.github/workflows/artifacts-index.yaml
+++ b/.github/workflows/artifacts-index.yaml
@ -1,102 +0,0 @@
-name: Update artifacts index
-
-on:
-  # Manual run for specified version
-  workflow_dispatch:
-    inputs:
-      version:
-        description: Version of HAOS to build index for
-        required: true
-        type: string
-
-  # Called by other workflows (e.g. build.yaml)
-  workflow_call:
-    inputs:
-      version:
-        description: Version of HAOS to build index for
-        required: true
-        type: string
-    secrets:
-      R2_OS_ARTIFACTS_ID:
-        required: true
-      R2_OS_ARTIFACTS_KEY:
-        required: true
-      R2_OS_ARTIFACTS_BUCKET:
-        required: true
-      R2_OS_ARTIFACTS_ENDPOINT:
-        required: true
-      CF_ZONE:
-        required: true
-      CF_PURGE_TOKEN:
-        required: true
-
-env:
-  PYTHON_VERSION: "3.13"
-
-jobs:
-  build-index:
-    name: Build Home Assistant OS artifacts index
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Setup Python version ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - name: Install AWS CLI
-        run: pip install 'awscli<1.37.0'
-
-      - name: Create build index
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
-        run: |
-          aws s3api list-objects-v2 \
-            --bucket "${{ secrets.R2_OS_ARTIFACTS_BUCKET }}" \
-            --endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
-            --prefix "${{ inputs.version }}/" \
-            --query 'Contents[].Key' | jq 'map(split("/")[1]) | sort' > "${{ inputs.version }}.json"
-          aws s3 cp \
-            "${{ inputs.version }}.json" \
-            s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/indexes/ \
-            --endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}"
-
-      - name: Regenerate artifacts index
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
-        run: |
-          aws s3api list-objects-v2 \
-            --bucket "${{ secrets.R2_OS_ARTIFACTS_BUCKET }}" \
-            --endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
-            --prefix "indexes/" \
-            --query 'Contents[].Key' | jq 'map(capture("indexes/(?<version>[[:digit:]].+).json").version) | sort' > .os-artifacts/index.json
-          aws s3 sync \
-            .os-artifacts/ \
-            s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/ \
-            --endpoint-url "${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}" \
-
-      - name: Flush CloudFlare cache
-        run: |
-          # Create purge list of all artifacts
-          jq -r '. | map("https://os-artifacts.home-assistant.io/${{ inputs.version }}/" + .) | join("\n")' < "${{ inputs.version }}.json" > purge_list
-          # Add indexes to purge list too
-          echo "https://os-artifacts.home-assistant.io/indexes/${{ inputs.version }}.json" >> purge_list
-          echo "https://os-artifacts.home-assistant.io/index.html" >> purge_list
-          echo "https://os-artifacts.home-assistant.io/index.json" >> purge_list
-          # Split to chunks of 30 files (limit of CF API)
-          split -d -l30 purge_list purge_list_chunked
-          # Convert chunked lists to JSON arrays and call CF purge API
-          for f in purge_list_chunked*; do
-            files=$(jq -R -s 'split("\n")[:-1]' < "$f")
-            curl --silent --show-error --fail -X POST \
-              "https://api.cloudflare.com/client/v4/zones/${{ secrets.CF_ZONE }}/purge_cache" \
-              -H "Authorization: Bearer ${{ secrets.CF_PURGE_TOKEN }}" \
-              -H "Content-Type: application/json" \
-              --data "{\"files\": ${files}}"
-          done
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@ -1,475 +0,0 @@
-# Home Assistant Operating System build workflow
-
-name: OS build
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-    inputs:
-      boards:
-        description: 'List of boards to build (comma separated identifiers)'
-        required: false
-        type: string
-      publish:
-        description: 'Publish build artifacts to R2 (not applicable to forks)'
-        required: true
-        type: boolean
-        default: true
-      hassio_channel:
-        description: 'Release channel to use (default: stable for GH releases, dev otherwise)'
-        type: choice
-        required: true
-        default: default
-        options:
-          - default
-          - stable
-          - beta
-          - dev
-
-env:
-  PYTHON_VERSION: "3.13"
-
-jobs:
-  prepare:
-    name: Prepare build
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-      pull-requests: read
-      packages: write
-    outputs:
-      version_dev: ${{ steps.version_dev.outputs.version_dev }}
-      version_main: ${{ steps.version.outputs.version_main }}
-      version_full: ${{ steps.version.outputs.version_full }}
-      channel: ${{ steps.channel.outputs.channel }}
-      hassio_channel_option: ${{ steps.channel.outputs.hassio_channel_option }}
-      matrix: ${{ steps.generate_matrix.outputs.result }}
-      build_container_image: ghcr.io/${{ github.repository_owner }}/haos-builder@${{ steps.build_haos_builder.outputs.digest }}
-      publish_build: ${{ steps.check_publish.outputs.publish_build }}
-      self_signed_cert: ${{ steps.generate_signing_key.outputs.self_signed_cert }}
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Check if build should be published
-        id: check_publish
-        env:
-          PUBLISH_FLAG: ${{ inputs.publish }}
-        run: |
-          if [ "${{ github.repository }}" == "home-assistant/operating-system" ]; then
-            if [ "${PUBLISH_FLAG}" != "true" ] && [ "${{ github.event_name }}" != "release" ]; then
-              echo "publish_build=false" >> "$GITHUB_OUTPUT"
-            else
-              echo "publish_build=true" >> "$GITHUB_OUTPUT"
-            fi
-          else
-            echo "publish_build=false" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Generate development version
-        shell: bash
-        id: version_dev
-        if: ${{ github.event_name != 'release' }}
-        env:
-          PUBLISH_BUILD: ${{ steps.check_publish.outputs.publish_build }}
-        run: |
-          version_dev="dev$(date --utc +'%Y%m%d')"
-          if [ "${{ env.PUBLISH_BUILD }}" != "true" ]; then
-            version_dev="dev$(date +%s)"
-          fi
-          echo "Development version \"${version_dev}\""
-          echo "version_dev=${version_dev}" >> $GITHUB_OUTPUT
-
-      - name: Set version suffix
-        if: ${{ github.event_name != 'release' }}
-        env:
-          VERSION_DEV: ${{ steps.version_dev.outputs.version_dev }}
-        run: |
-          sed -i -E "s/(^VERSION_SUFFIX=\").*(\"$)/\1${VERSION_DEV}\2/" buildroot-external/meta
-
-      - name: Get version
-        id: version
-        run: |
-          . ${GITHUB_WORKSPACE}/buildroot-external/meta
-          echo "version_main=${VERSION_MAJOR}.${VERSION_MINOR}" >> $GITHUB_OUTPUT
-          if [ -z "${VERSION_SUFFIX}" ]; then
-            version_full="${VERSION_MAJOR}.${VERSION_MINOR}"
-          else
-            version_full="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUFFIX}"
-          fi
-          echo "version_full=${version_full}" >> $GITHUB_OUTPUT
-          echo "Full version number of this release is \"${version_full}\"."
-
-      - name: Validate version
-        id: version_check
-        if: ${{ github.event_name == 'release' }}
-        run: |
-          if [ "${{ steps.version.outputs.version_full }}" != "${{ github.event.release.tag_name }}" ]; then
-            echo "Version number in Buildroot metadata does not match tag (${{ steps.version.outputs.version_full }} vs ${{ github.event.release.tag_name }})."
-            exit 1
-          fi
-
-      - name: Get channel
-        id: channel
-        run: |
-          if [[ "${{ github.event_name }}" == "release" ]]; then
-            if [[ "${{ github.event.release.prerelease }}" == "true" ]]; then
-              echo "channel=beta" >> "$GITHUB_OUTPUT"
-            else
-              echo "channel=stable" >> "$GITHUB_OUTPUT"
-            fi
-          else
-            echo "channel=dev" >> "$GITHUB_OUTPUT"
-          fi
-
-          if [[ "${{ inputs.hassio_channel }}" == "default" ]]; then
-            if [[ "${{ github.event_name }}" == "release" ]]; then
-              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_STABLE" >> "$GITHUB_OUTPUT"
-            else
-              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_DEV" >> "$GITHUB_OUTPUT"
-            fi
-          else
-            if [[ "${{ inputs.hassio_channel }}" == "stable" ]]; then
-              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_STABLE" >> "$GITHUB_OUTPUT"
-            elif [[ "${{ inputs.hassio_channel }}" == "beta" ]]; then
-              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_BETA" >> "$GITHUB_OUTPUT"
-            elif [[ "${{ inputs.hassio_channel }}" == "dev" ]]; then
-              echo "hassio_channel_option=BR2_PACKAGE_HASSIO_CHANNEL_DEV" >> "$GITHUB_OUTPUT"
-            fi
-          fi
-
-      - name: Create build matrix
-        uses: actions/github-script@v7
-        id: generate_matrix
-        with:
-          script: |
-            const boards = require('./.github/workflows/matrix.json')
-            if ("${{ github.event_name }}" == "release") {
-              return { "board": boards }
-            }
-
-            const boardFilter = "${{ github.event.inputs.boards }}"
-            if (boardFilter == "") {
-              console.log("Run full build for all boards")
-              return { "board": boards }
-            } else {
-              console.log("Run partial build")
-              const boardSet = new Set(boardFilter.split(","))
-              const buildBoards = boards.filter(b => boardSet.has(b.id))
-              return { "board": buildBoards }
-            }
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.4.0
-        with:
-            registry: ghcr.io
-            username: ${{ github.repository_owner }}
-            password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and Push
-        uses: docker/build-push-action@v6.18.0
-        id: build_haos_builder
-        with:
-          context: .
-          file: Dockerfile
-          tags: ghcr.io/${{ github.repository_owner }}/haos-builder
-          cache-from: ghcr.io/${{ github.repository_owner }}/haos-builder:cache-${{ steps.version.outputs.version_main }}
-          cache-to: ghcr.io/${{ github.repository_owner }}/haos-builder:cache-${{ steps.version.outputs.version_main }}
-          push: true
-
-      - name: Generate self-signed certificate
-        id: generate_signing_key
-        env:
-          RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
-          RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
-        if: env.RAUC_CERTIFICATE == '' || env.RAUC_PRIVATE_KEY == ''
-        run: |
-          echo "::warning:: RAUC certificate or key is missing in the repository secrets. Building with a public self-signed certificate!"
-          buildroot-external/scripts/generate-signing-key.sh cert.pem key.pem
-          echo "self_signed_cert=true" >> $GITHUB_OUTPUT
-
-      - name: Create signing key
-        uses: actions/upload-artifact@v4
-        if: steps.generate_signing_key.outcome == 'success'
-        with:
-          name: signing-key
-          path: |
-            cert.pem
-            key.pem
-
-  build:
-    name: Build for ${{ matrix.board.id }}
-    permissions:
-      contents: write  # for actions/upload-release-asset to upload release asset
-    needs: prepare
-    strategy:
-      fail-fast: ${{ github.event_name == 'release' }}
-      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-          persist-credentials: false
-
-      - name: Setup Python version ${{ env.PYTHON_VERSION }}
-        if: ${{ github.event_name != 'release' }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - name: Install AWS CLI
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
-        run: pip install 'awscli<1.37.0'
-
-      - name: Set version suffix
-        if: ${{ github.event_name != 'release' }}
-        env:
-          VERSION_DEV: ${{ needs.prepare.outputs.version_dev }}
-        run: |
-          sed -i -E "s/(^VERSION_SUFFIX=\").*(\"$)/\1${VERSION_DEV}\2/" buildroot-external/meta
-
-      - name: 'Add release PKI certs'
-        if: ${{ needs.prepare.outputs.self_signed_cert != 'true' }}
-        env:
-          RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
-          RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
-        run: |
-          echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
-          echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
-
-      - name: Get self-signed certificate from the prepare job
-        if: ${{ needs.prepare.outputs.self_signed_cert == 'true' }}
-        uses: actions/download-artifact@v4
-        with:
-          name: signing-key
-
-      - name: Free space on build drive
-        run: |
-          # Inspired by https://github.com/easimon/maximize-build-space/blob/v7/action.yml
-          df -h
-          sudo rm -rf /usr/local/lib/android/sdk/ndk
-          sudo rm -rf /opt/hostedtoolcache/CodeQL
-          sudo mkdir /mnt/cache
-          sudo mkdir /mnt/output
-          WORKSPACE_OWNER="$(stat -c '%U:%G' "${GITHUB_WORKSPACE}")"
-          # output directory is symlinked for easier access from workspace
-          # but for build container it must be mounted as a volume
-          sudo ln -sf /mnt/output "${GITHUB_WORKSPACE}/output"
-          sudo chown -R "${WORKSPACE_OWNER}" /mnt/cache
-          sudo chown -R "${WORKSPACE_OWNER}" /mnt/output
-          df -h
-
-      - name: "Restore cache: object files"
-        uses: actions/cache/restore@v4
-        with:
-          path: /mnt/cache/cc
-          key: haos-cc-${{ matrix.board.id }}
-
-      - name: Generate build config
-        uses: "./.github/actions/haos-builder-command"
-        with:
-          image: ${{ needs.prepare.outputs.build_container_image }}
-          command: make ${{ matrix.board.defconfig }}_defconfig
-
-      - name: Override release channel
-        if: ${{ needs.prepare.outputs.hassio_channel_option != 'BR2_PACKAGE_HASSIO_CHANNEL_STABLE' }}
-        uses: "./.github/actions/haos-builder-command"
-        with:
-          image: ${{ needs.prepare.outputs.build_container_image }}
-          command: |
-            bash -c 'echo "${{ needs.prepare.outputs.hassio_channel_option }}=y" >> /build/output/.config && make olddefconfig'
-
-      - name: Build
-        uses: "./.github/actions/haos-builder-command"
-        with:
-          image: ${{ needs.prepare.outputs.build_container_image }}
-          command: make
-
-      - name: Check Linux config
-        uses: "./.github/actions/haos-builder-command"
-        with:
-          image: ${{ needs.prepare.outputs.build_container_image }}
-          command: |
-            make BR2_CHECK_DOTCONFIG_OPTS="--github-format --strip-path-prefix=/build/" linux-check-dotconfig
-
-      - name: Upload artifacts
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
-        working-directory: output/images/
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
-        run: |
-          aws s3 sync \
-            ./ \
-            s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/${{ needs.prepare.outputs.version_full }}/ \
-            --exclude "*" \
-            --include "haos_*" \
-            --endpoint-url ${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}
-
-      - name: Upload release assets
-        if: ${{ github.event_name == 'release' }}
-        uses: shogo82148/actions-upload-release-asset@v1
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: output/images/haos_*
-
-      - name: Print cache stats
-        run: |
-          echo "Cache size: $(du -sh /mnt/cache/cc)"
-          echo "Files total: $(find /mnt/cache/cc -mindepth 1 -type f | wc -l)"
-          echo "Old files to remove: $(find /mnt/cache/cc -mindepth 1 -type f -not -anewer output/Makefile | wc -l)"
-          find /mnt/cache/cc -mindepth 1 -type f -not -anewer output/Makefile -delete
-          echo "Cache size after pruning: $(du -sh /mnt/cache/cc)"
-
-      - name: "Save cache: object files"
-        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@v4
-        with:
-          path: /mnt/cache/cc
-          key: haos-cc-${{ matrix.board.id }}-${{ github.run_id }}
-
-      - name: Generate build summary
-        run: |
-          echo "# ${{ matrix.board.id }} build summary" >> $GITHUB_STEP_SUMMARY
-          echo "## Artifacts" >> $GITHUB_STEP_SUMMARY
-          echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
-          echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
-          for f in output/images/haos_*; do
-            echo "| $(basename $f) | $(du -b $f | cut -f1) | $(du -bh $f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
-          done
-          echo "## Partitions" >> $GITHUB_STEP_SUMMARY
-          echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
-          echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
-          for f in boot.vfat kernel.img rootfs.erofs overlay.ext4 data.ext4; do
-            echo "| ${f} | $(du -b output/images/$f | cut -f1) | $(du -bh output/images/$f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
-          done
-
-      - name: Upload OS image artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id != 'ova' }}
-        with:
-          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz
-          path: |
-            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.img.xz
-
-      - name: Upload RAUC bundle artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' }}
-        with:
-          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
-          path: |
-            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
-
-      - name: Upload Open Virtualization Format (OVA) artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
-        with:
-          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
-          path: |
-            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
-
-      - name: Upload QEMU disk image artifact
-        uses: actions/upload-artifact@v4
-        # Create artifact for ova every time - it's used by the called tests workflow
-        if: ${{ matrix.board.id == 'ova' || (github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'generic-aarch64') }}
-        with:
-          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
-          path: |
-            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
-
-      - name: Upload VMware Virtual Machine Disk (VMDK) artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && (matrix.board.id == 'generic-aarch64' || matrix.board.id == 'ova') }}
-        with:
-          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
-          path: |
-            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
-
-      - name: Upload VirtualBox Virtual Disk Image (VDI) artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
-        with:
-          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
-          path: |
-            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
-
-      - name: Upload Virtual Hard Disk v2 (VHDX) artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
-        with:
-          name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
-          path: |
-            output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
-
-  test:
-    name: Test OS image
-    needs: [ build, prepare ]
-    uses: ./.github/workflows/test.yaml
-    with:
-      version: ${{ needs.prepare.outputs.version_full }}
-
-  update_index:
-    name: Update artifacts index
-    if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
-    needs: [ build, prepare ]
-    uses: home-assistant/operating-system/.github/workflows/artifacts-index.yaml@dev
-    with:
-      version: ${{ needs.prepare.outputs.version_full }}
-    secrets:
-      R2_OS_ARTIFACTS_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
-      R2_OS_ARTIFACTS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
-      R2_OS_ARTIFACTS_BUCKET: ${{ secrets.R2_OS_ARTIFACTS_BUCKET }}
-      R2_OS_ARTIFACTS_ENDPOINT: ${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}
-      CF_ZONE: ${{ secrets.CF_ZONE }}
-      CF_PURGE_TOKEN: ${{ secrets.CF_PURGE_TOKEN }}
-
-  bump_version:
-    name: Bump ${{ needs.prepare.outputs.channel }} channel version
-    if: ${{ github.repository == 'home-assistant/operating-system' && needs.prepare.outputs.publish_build == 'true' }}
-    environment: ${{ needs.prepare.outputs.channel }}
-    needs: [ build, prepare ]
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Checkout source
-      uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-
-    - name: Initialize git
-      uses: home-assistant/actions/helpers/git-init@master
-      with:
-        name: ${{ secrets.GIT_NAME }}
-        email: ${{ secrets.GIT_EMAIL }}
-        token: ${{ secrets.GIT_TOKEN }}
-
-    - name: Bump Home Assistant OS ${{ needs.prepare.outputs.channel }} channel version
-      uses: home-assistant/actions/helpers/version-push@master
-      with:
-        key: "hassos[]"
-        key-description: "Home Assistant OS"
-        version: ${{ needs.prepare.outputs.version_full }}
-        channel: ${{ needs.prepare.outputs.channel }}
-
-    - name: Bump Home Assistant OS beta channel version on stable release
-      if: ${{ needs.prepare.outputs.channel == 'stable' }}
-      uses: home-assistant/actions/helpers/version-push@master
-      with:
-        key: "hassos[]"
-        key-description: "Home Assistant OS"
-        version: ${{ needs.prepare.outputs.version_full }}
-        channel: beta
-
-    - name: Bump stable Home Assistant version for RPi Imager
-      if: ${{ github.event_name == 'release' && needs.prepare.outputs.channel == 'stable' }}
-      uses: "./.github/actions/bump-rpi-imager-version"
-      with:
-        version: ${{ needs.prepare.outputs.version_full }}
-        release-date: ${{ github.event.release.published_at }}
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@ -0,0 +1,143 @@
+# Home Assistant Operating System build workflow
+
+name: Development build
+
+on:
+  workflow_dispatch:
+  pull_request_target:
+    types: [opened,synchronize,labeled]
+
+jobs:
+  prepare:
+    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run-dev-build') }}
+    name: Prepare build
+    runs-on: [ "ubuntu-20.04" ]
+    permissions:
+      contents: read
+      pull-requests: read
+    outputs:
+      version_main: ${{ steps.version_main.outputs.version_main }}
+      version_dev: ${{ steps.version_dev.outputs.version_dev }}${{ steps.version_pr.outputs.version_pr }}
+      matrix: ${{ steps.generate_matrix.outputs.result }}
+    steps:
+      - name: Generate Development build version
+        shell: bash
+        id: version_dev
+        run: |
+          version_dev="dev$(date --utc +'%Y%m%d')"
+          echo "Development version \"${version_dev}\""
+          echo "::set-output name=version_dev::${version_dev}"
+      - name: Generate Development build version for PR
+        if: ${{ github.event.pull_request }}
+        shell: bash
+        id: version_pr
+        run: |
+          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
+      - name: Get Major/Minor version
+        id: version_main
+        run: |
+          major=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_MAJOR | cut -d'=' -f2)
+          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
+        id: generate_matrix
+        with:
+          script: |
+            const boards = require('./.github/workflows/matrix.json')
+
+            if (context.eventName == "workflow_dispatch") {
+              console.log("Run full build for all boards")
+              return { "board": boards }
+            }
+
+            const labels = context.payload.pull_request.labels.map(l => l.name)
+            const labelsSet = new Set(labels)
+            const buildBoards = boards.filter(b => labelsSet.has(b.label))
+
+            return { "board": buildBoards }
+
+  build:
+    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run-dev-build') }}
+    name: Development build for ${{ matrix.board.id }}
+    environment: "dev_build"
+    needs: prepare
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
+    runs-on: ${{ matrix.board.runner }}
+
+    steps:
+      - name: Define git reference
+        uses: actions/github-script@v6
+        id: generate_gitref
+        with:
+          script: |
+            if (context.eventName == "workflow_dispatch")
+              return { "ref": context.ref }
+            return { "ref": context.payload.pull_request.head.sha }
+
+      - name: Checkout source
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          persist-credentials: false
+          ref: ${{ fromJSON(steps.generate_gitref.outputs.result).ref }}
+
+      - name: Build container
+        run: docker build -t haos-builder .
+
+      - name: 'Add release PKI certs'
+        env:
+          RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
+          RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
+        run: |
+          echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
+          echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
+
+      - name: Build
+        run: |
+          BUILDER_UID="$(id -u)"
+          BUILDER_GID="$(id -g)"
+          docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
+            -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
+            -v "${{ matrix.board.runner }}-build-cache:/cache" \
+            -v "/build/output" \
+            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.prepare.outputs.version_dev }} ${{ matrix.board.defconfig }}
+
+      - name: Upload images
+        uses: burnett01/rsync-deployments@5.2
+        with:
+          rsh: -q
+          switches: -aW
+          path: release/
+          remote_path: ${{ secrets.DEV_TARGET_PATH }}/${{ needs.prepare.outputs.version_main }}.${{ needs.prepare.outputs.version_dev }}/
+          remote_host: ${{ secrets.DEV_HOST }}
+          remote_port: ${{ secrets.DEV_PORT }}
+          remote_user: ${{ secrets.DEV_USERNAME }}
+          remote_key: ${{ secrets.DEV_SSH_KEY }}
+
+  bump_version:
+    name: Bump dev channel version
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [ build, prepare ]
+    runs-on: [ "ubuntu-20.04" ]
+
+    steps:
+    - name: Initialize git
+      uses: home-assistant/actions/helpers/git-init@master
+      with:
+        name: ${{ secrets.GIT_NAME }}
+        email: ${{ secrets.GIT_EMAIL }}
+        token: ${{ secrets.GIT_TOKEN }}
+
+    - name: Bump Home Assistant OS dev channel version to ${{ needs.prepare.outputs.version_main }}.${{ needs.prepare.outputs.version_dev }}
+      uses: home-assistant/actions/helpers/version-push@master
+      with:
+        key: "hassos[]"
+        key-description: "Home Assistant OS"
+        version: ${{ needs.prepare.outputs.version_main }}.${{ needs.prepare.outputs.version_dev }}
+        channel: "dev"
--- a/.github/workflows/label-actions.yml
+++ b/.github/workflows/label-actions.yml
@ -14,4 +14,4 @@ jobs:
  action:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/label-actions@v4.0.1
+      - uses: dessant/label-actions@v2
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@ -1,25 +0,0 @@
-name: Lock
-
-on:
-  schedule:
-    - cron: "45 5 * * *"
-
-permissions:
-  discussions: write
-  issues: write
-  pull-requests: write
-
-jobs:
-  lock:
-    if: github.repository_owner == 'home-assistant'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5.0.1
-        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: "30"
-          exclude-issue-created-before: "2025-01-01T00:00:00Z"
-          issue-lock-reason: ""
-          pr-inactive-days: "7"
-          exclude-pr-created-before: "2025-01-01T00:00:00Z"
-          pr-lock-reason: ""
--- a/.github/workflows/matrix.json
+++ b/.github/workflows/matrix.json
@ -2,115 +2,91 @@
  {
    "id": "ova",
    "defconfig": "ova",
-    "architecture": "x86-64",
+    "runner": "x86-64-runner",
    "label": "board/ova"
  },
  {
    "id": "generic-x86-64",
    "defconfig": "generic_x86_64",
-    "architecture": "x86-64",
+    "runner": "x86-64-runner",
    "label": "board/generic-x86-64"
  },
  {
    "id": "generic-aarch64",
    "defconfig": "generic_aarch64",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/generic-aarch64"
  },
  {
    "id": "khadas-vim3",
    "defconfig": "khadas_vim3",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/khadas"
  },
  {
    "id": "odroid-c2",
    "defconfig": "odroid_c2",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/odroid"
  },
  {
    "id": "odroid-c4",
    "defconfig": "odroid_c4",
-    "architecture": "aarch64",
-    "label": "board/odroid"
-  },
-  {
-    "id": "odroid-m1",
-    "defconfig": "odroid_m1",
-    "architecture": "aarch64",
-    "label": "board/odroid"
-  },
-  {
-    "id": "odroid-m1s",
-    "defconfig": "odroid_m1s",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/odroid"
  },
  {
    "id": "odroid-n2",
    "defconfig": "odroid_n2",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/odroid"
  },
  {
    "id": "odroid-xu4",
    "defconfig": "odroid_xu4",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/odroid"
  },
  {
    "id": "rpi2",
    "defconfig": "rpi2",
-    "architecture": "arm",
+    "runner": "arm-runner",
    "label": "board/raspberrypi"
  },
  {
    "id": "rpi3",
    "defconfig": "rpi3",
-    "architecture": "arm",
+    "runner": "arm-runner",
    "label": "board/raspberrypi"
  },
  {
    "id": "rpi3-64",
    "defconfig": "rpi3_64",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/raspberrypi"
  },
  {
    "id": "rpi4",
    "defconfig": "rpi4",
-    "architecture": "arm",
+    "runner": "arm-runner",
    "label": "board/raspberrypi"
  },
  {
    "id": "rpi4-64",
    "defconfig": "rpi4_64",
-    "architecture": "aarch64",
-    "label": "board/raspberrypi"
-  },
-  {
-    "id": "rpi5-64",
-    "defconfig": "rpi5_64",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/raspberrypi"
  },
  {
    "id": "yellow",
    "defconfig": "yellow",
-    "architecture": "aarch64",
+    "runner": "aarch64-runner",
    "label": "board/yellow"
  },
-  {
-    "id": "green",
-    "defconfig": "green",
-    "architecture": "aarch64",
-    "label": "board/green"
-  },
  {
    "id": "tinker",
    "defconfig": "tinker",
-    "architecture": "arm",
+    "runner": "arm-runner",
    "label": "board/tinker"
  }
 ]
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@ -6,16 +6,10 @@ on: [pull_request]

 jobs:
  linters:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    steps:
-    - name: Install additional dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get -y install \
-          python3-flake8
-
    - name: Check out code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
        submodules: true

@ -25,10 +19,10 @@ jobs:
        dockerfile: Dockerfile

    - name: Check shell scripts
-      uses: ludeeus/action-shellcheck@2.0.0
+      uses: ludeeus/action-shellcheck@1.1.0
      with:
-        ignore_paths: buildroot
+        ignore: buildroot buildroot-external/package/xe-guest-utilities

    - name: Check buildroot-external packages
      run: |
-        buildroot/utils/check-package --exclude PackageHeader --exclude Upstream --br2-external buildroot-external/package/*/*
+        buildroot/utils/check-package --exclude PackageHeader --br2-external buildroot-external/package/*/*
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@ -3,7 +3,6 @@ name: Release Drafter
 on:
  push:
    branches:
-      - dev
      - rel-*

 jobs:
@ -13,6 +12,6 @@ jobs:
      pull-requests: read  # for release-drafter/release-drafter to read PR content and labels
    runs-on: ubuntu-latest
    steps:
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@v5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -0,0 +1,177 @@
+# Home Assistant Operating System release build workflow
+
+name: Release build
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  validate_release:
+    name: Validate release
+    runs-on: [ "ubuntu-20.04" ]
+    outputs:
+      version: ${{ steps.version_check.outputs.version }}
+      version_dev: ${{ steps.version_check.outputs.version_dev }}
+      matrix: ${{ steps.generate_matrix.outputs.result }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Validate version
+        id: version_check
+        run: |
+          major=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_MAJOR | cut -d'=' -f2)
+          build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
+          tag_major=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 1)
+          tag_build=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 2)
+          tag_dev=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 3)
+          if [ "${major}.${build}" != "${tag_major}.${tag_build}" ]; then
+            echo "Version number in Buildroot metadata is does not match tag (${major}.${build} vs ${{ github.event.release.tag_name }})."
+            exit 1
+          fi
+          if [ "" != "${tag_dev}" ]; then
+            echo "Note: Release build with custom dev part: ${tag_dev}."
+            echo "::set-output name=version::${major}.${build}.${tag_dev}"
+          else
+            echo "::set-output name=version::${major}.${build}"
+          fi
+          echo "::set-output name=version_dev::${tag_dev}"
+      - name: Create build matrix
+        uses: actions/github-script@v6
+        id: generate_matrix
+        with:
+          script: |
+            const boards = require('./.github/workflows/matrix.json')
+            return { "board": boards }
+
+  build:
+    permissions:
+      contents: write  # for actions/upload-release-asset to upload release asset
+    name: Release build for ${{ matrix.board.id }}
+    needs: validate_release
+    strategy:
+      matrix: ${{ fromJson(needs.validate_release.outputs.matrix) }}
+    runs-on: ${{ matrix.board.runner }}
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Build container
+        run: docker build -t haos-builder .
+
+      - name: 'Add release PKI certs'
+        env:
+          RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
+          RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
+        run: |
+          echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
+          echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
+
+      - name: Build
+        run: |
+          BUILDER_UID="$(id -u)"
+          BUILDER_GID="$(id -g)"
+          docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
+            -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
+            -v "${{ matrix.board.runner }}-build-cache:/cache" \
+            -v "/build/output" \
+            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.validate_release.outputs.version_dev }} ${{ matrix.board.defconfig }}
+
+      - name: Upload disk image
+        if: ${{ matrix.board.id != 'ova' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.img.xz
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.img.xz
+          asset_content_type: application/x-xz
+
+      - name: Upload rauc update
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.raucb
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.raucb
+          asset_content_type: application/octet-stream
+
+      - name: Upload ova image
+        if: ${{ matrix.board.id == 'ova' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.ova
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.ova
+          asset_content_type: application/x-tar
+
+      - name: Upload qcow2 image
+        if: ${{ matrix.board.id == 'ova' || matrix.board.id == 'generic-aarch64' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
+          asset_content_type: application/x-xz
+
+      - name: Upload vdi image
+        if: ${{ matrix.board.id == 'ova' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vdi.zip
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vdi.zip
+          asset_content_type: application/zip
+
+      - name: Upload vhdx image
+        if: ${{ matrix.board.id == 'ova' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
+          asset_content_type: application/zip
+
+      - name: Upload vmdk image
+        if: ${{ matrix.board.id == 'ova' || matrix.board.id == 'generic-aarch64' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
+          asset_name: haos_${{ matrix.board.id }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
+          asset_content_type: application/zip
+
+  bump_version:
+    name: Bump dev version to ${{ needs.validate_release.outputs.version }}
+    needs: [ build, validate_release ]
+    runs-on: [ "ubuntu-20.04" ]
+
+    steps:
+    - name: Initialize git
+      uses: home-assistant/actions/helpers/git-init@master
+      with:
+        name: ${{ secrets.GIT_NAME }}
+        email: ${{ secrets.GIT_EMAIL }}
+        token: ${{ secrets.GIT_TOKEN }}
+
+    - name: Bump Home Assistant OS beta version
+      uses: home-assistant/actions/helpers/version-push@master
+      with:
+        key: "hassos[]"
+        key-description: "Home Assistant OS"
+        version: ${{ needs.validate_release.outputs.version }}
+        channel: "beta"
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -3,7 +3,7 @@ name: Stale
 # yamllint disable-line rule:truthy
 on:
  schedule:
-    - cron: "40 5 * * *"
+    - cron: "0 * * * *"
  workflow_dispatch:

 jobs:
@ -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@v9.1.0
+        uses: actions/stale@v5
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 90
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@ -1,101 +0,0 @@
-name: Test HAOS image
-run-name: "Test HAOS ${{ inputs.version || format('(OS build #{0})', github.event.workflow_run.run_number) }}"
-
-on:
-  # Manual test of specified version
-  workflow_dispatch:
-    inputs:
-      version:
-        description: Version of HAOS to test
-        required: true
-        type: string
-
-  # Called by other workflows (e.g. build.yaml)
-  workflow_call:
-    inputs:
-      use-artifact:
-        # Workaround for GH weirdness: https://github.com/actions/runner/discussions/1884
-        description: Download OS image using actions/download-artifact
-        required: false
-        type: boolean
-        default: true
-      version:
-        description: Version of HAOS to test (as used in the name of the qcow2 image artifact)
-        required: true
-        type: string
-
-jobs:
-  test:
-    if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
-
-    name: Test in QEMU
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Install system dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y qemu-system-x86 ovmf
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-
-      - name: Install Python requirements
-        run:
-          pip install -r tests/requirements.txt
-
-      - name: Download HAOS image
-        if: ${{ !inputs.use-artifact }}
-        run: |
-          curl -sfL -o haos.qcow2.xz  https://os-artifacts.home-assistant.io/${{github.event.inputs.version}}/haos_ova-${{github.event.inputs.version}}.qcow2.xz
-
-      - name: Get OS image artifact
-        if: ${{ inputs.use-artifact }}
-        uses: actions/download-artifact@v4
-        with:
-          name: haos_ova-${{ inputs.version }}.qcow2.xz
-
-      - name: Extract OS image
-        run: |
-          xz -dc haos*.qcow2.xz > tests/haos.qcow2
-          rm haos*.qcow2.xz
-
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Run tests
-        run: |
-          ./tests/run_tests.sh --durations=0 --durations-min=5.0
-
-      - name: Archive logs
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: logs
-          path: |
-            tests/lg_logs/**
-
-      - name: Archive JUnit reports
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: junit_reports
-          path: |
-            tests/junit_reports/*.xml
-
-      - name: Publish test report
-        uses: mikepenz/action-junit-report@v5
-        if: always()
-        with:
-          report_paths: 'tests/junit_reports/*.xml'
-          annotate_only: true
-          detailed_summary: true
--- a/.gitignore
+++ b/.gitignore
@ -1,12 +1,4 @@
-# OS generated files
 .DS_Store
-
-# Build output dirs
 /release
-output*/
-
-# Certificates
 *.pem
-
-# vscode generated files
-.vscode*
+output*/
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
 [submodule "buildroot"]
 	path = buildroot
 	url = https://github.com/home-assistant/buildroot.git
-	branch = 2024.02.x-haos
+	branch = 2021.02.x-haos
--- a/.os-artifacts/index.html
+++ b/.os-artifacts/index.html
@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Home Assistant OS - development builds</title>
-        <link rel="shortcut icon" href="https://brands.home-assistant.io/homeassistant/icon.png">
-        <style>
-            body {
-                font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-            }
-
-            .error {
-                color: maroon;
-            }
-            </style>
-    </head>
-    <body>
-        <h1>Home Assistant OS - development builds</h1>
-        <select id="os-builds"></select>
-        <div id="os-builds-list"></div>
-        <script>
-            const buildSelect = document.getElementById('os-builds');
-            const osBuildsList = document.getElementById('os-builds-list');
-
-            const fillVersions = async () => {
-                try {
-                    const response = await fetch('/index.json');
-                    if (!response.ok) {
-                        const p = document.createElement('p');
-                        p.className = "error";
-                        p.textContent = "Could not load version index file.";
-                        osBuildsList.appendChild(p);
-                        return;
-                    }
-                    const items = await response.json();
-                    items.reverse();
-
-                    items.forEach(buildVersion => {
-                        buildSelect.appendChild(new Option(buildVersion, buildVersion));
-                    });
-
-                    buildSelect.dispatchEvent(new Event('change'));
-                } catch (error) {
-                    console.error('Error fetching data:', error);
-                }
-            }
-
-            buildSelect.addEventListener('change', async function() {
-                osBuildsList.innerHTML = '';
-
-                const buildVersion = this.value;
-
-                try {
-                    const response = await fetch(`/indexes/${buildVersion}.json`);
-                    if (!response.ok) {
-                        const p = document.createElement('p');
-                        p.className = "error";
-                        p.textContent = `Could not load index file for version ${buildVersion}.`;
-                        osBuildsList.appendChild(p);
-                        return;
-                    }
-                    const images = await response.json();
-
-                    const ul = document.createElement('ul');
-                    images.forEach(image => {
-                        const li = document.createElement('li');
-                        const a = document.createElement('a');
-                        a.href =`/${buildVersion}/${image}`;
-                        a.textContent = image;
-                        li.appendChild(a);
-                        ul.appendChild(li);
-                    });
-
-                    osBuildsList.appendChild(ul);
-                } catch (error) {
-                    console.error('Error fetching images:', error);
-                }
-            });
-
-            fillVersions();
-        </script>
-    </body>
-</html>
--- a/9
+++ b/9
@ -12,16 +12,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
        gpg \
        dirmngr \
        software-properties-common \
-    && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/docker.gpg \
-    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/docker.gpg] \
-        https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
+    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
    && apt-get update && apt-get install -y --no-install-recommends \
        docker-ce \
    && rm -rf /var/lib/apt/lists/*

 # Build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        automake \
        bash \
        bc \
        binutils \
@ -31,14 +29,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
        file \
        git \
        graphviz \
-        help2man \
        jq \
        make \
        ncurses-dev \
        openssh-client \
        patch \
        perl \
-        pigz \
        python3 \
        python3-matplotlib \
        python-is-python3 \
@ -46,7 +42,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
        rsync \
        skopeo \
        sudo \
-        texinfo \
        unzip \
        vim \
        wget \
--- a/Documentation/boards/README.md
+++ b/Documentation/boards/README.md
@ -4,30 +4,27 @@

 The following boards/devices are supported:

- Nabu Casa
-  - [Home Assistant Green](https://www.home-assistant.io/green/)
-  - [Home Assistant Yellow](https://www.home-assistant.io/yellow/) (based custom carrier board and powered by a Raspberry Pi 4 Compute Module)
-  - [Home Assistant Blue](https://www.home-assistant.io/blue/) (based on ODROID-N2+)
 - Raspberry Pi
-  - Pi 5 ([4 GB](https://www.raspberrypi.com/products/raspberry-pi-5/?variant=raspberry-pi-5-4gb) and [8 GB](https://www.raspberrypi.com/products/raspberry-pi-5/?variant=raspberry-pi-5-8gb) model) 64-bit
-  - Pi 4 Model B ([1 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-1gb), [2 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-2gb), [4 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-4gb) and [8 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-8gb) model) 32-bit or 64-bit (recommended)
-  - [Pi 3 Model B](https://www.raspberrypi.com/products/raspberry-pi-3-model-b/) and [B+](https://www.raspberrypi.com/products/raspberry-pi-3-model-b-plus/) 32-bit or 64-bit (recommended)
-  - [Pi 2](https://www.raspberrypi.com/products/raspberry-pi-2-model-b/) (not recommended)
+  - Pi 4 Model B (1 GB, 2 GB, 4 GB and 8 GB model) 64-bit (recommended)
+  - Pi 4 Model B (1 GB, 2 GB, 4 GB and 8 GB model) 32-bit
+  - Pi 3 Model B and B+ 64-bit (recommended)
+  - Pi 3 Model B and B+ 32-bit
+  - Pi 2 (not recommended)
+  - Pi Zero-W (not recommended)
+  - Pi (not recommended)
 - Hardkernel
-  - [ODROID-C2](https://www.hardkernel.com/shop/odroid-c2/) (discontinued)
-  - [ODROID-C4](https://www.hardkernel.com/shop/odroid-c4/)
-  - [ODROID-M1](https://www.hardkernel.com/shop/odroid-m1/)
-  - ODROID-M1S [4 GB](https://www.hardkernel.com/shop/odroid-m1s-with-4gbyte-ram/) or [8 GB](https://www.hardkernel.com/shop/odroid-m1s-with-8gbyte-ram/)
-  - [ODROID-N2](https://www.hardkernel.com/shop/odroid-n2/) (discontinued)
-  - ODROID-N2+ [2 GB](https://www.hardkernel.com/shop/odroid-n2-with-2gbyte-ram-2/) or [4 GB](https://www.hardkernel.com/shop/odroid-n2-with-4gbyte-ram-2/)
-  - [ODROID-XU4](https://www.hardkernel.com/shop/odroid-xu4-special-price/)
+  - Odroid-N2
+  - Odroid-N2+
+  - Odroid-C2
+  - Odroid-C4
+  - Odroid-XU4
 - Asus
-  - [Tinker Board](https://tinker-board.asus.com/product/tinker-board.html)
+  - Tinker Board
 - Generic x86-64 (UEFI, not suited for virtualization)
-  - [Intel NUC5CPYH](https://www.intel.com/content/www/us/en/products/sku/85254/intel-nuc-kit-nuc5cpyh/specifications.html)
-  - [Intel NUC6CAYH](https://www.intel.com/content/www/us/en/products/sku/95062/intel-nuc-kit-nuc6cayh/specifications.html)
-  - [Intel NUC10I3FNK2](https://www.intel.com/content/www/us/en/products/sku/195503/intel-nuc-10-performance-kit-nuc10i3fnk/specifications.html)
-  - [Gigabyte GB-BPCE-3455](https://www.gigabyte.com/Mini-PcBarebone/GB-BPCE-3455-rev-10/sp#sp)
+  - Intel NUC5CPYH
+  - Intel NUC6CAYH
+  - Intel NUC10I3FNK2
+  - Gigabyte GB-BPCE-3455
  - Computers supporting x86-64 architecture and UEFI boot should generally work
 - Virtual appliance (x86_64/UEFI):
  - VMDK
@ -43,20 +40,15 @@ Notes:

 |Board|Build|Config|Docs|
 |-----|----|------|----|
-|Green         |`make green`         |[green](../../buildroot-external/configs/green_defconfig)|-|
-|Yellow        |`make yellow`        |[yellow](../../buildroot-external/configs/yellow_defconfig)|-|
-|Pi5 64-bit    |`make rpi5_64`       |[rpi5_64](../../buildroot-external/configs/rpi5_64_defconfig)|[raspberrypi](./raspberrypi/)|
 |Pi4B 64-bit   |`make rpi4_64`       |[rpi4_64](../../buildroot-external/configs/rpi4_64_defconfig)|[raspberrypi](./raspberrypi/)|
 |Pi4B 32-bit   |`make rpi4`          |[rpi4](../../buildroot-external/configs/rpi4_defconfig)|[raspberrypi](./raspberrypi/)|
 |Pi3B 64-bit   |`make rpi3_64`       |[rpi3_64](../../buildroot-external/configs/rpi3_64_defconfig)|[raspberrypi](./raspberrypi/)|
 |Pi3B 32-bit   |`make rpi3`          |[rpi3](../../buildroot-external/configs/rpi3_defconfig)|[raspberrypi](./raspberrypi/)|
 |Pi2           |`make rpi2`          |[rpi2](../../buildroot-external/configs/rpi2_defconfig)|[raspberrypi](./raspberrypi/)|
-|ODROID-C2     |`make odroid_c2`     |[odroid_c2](../../buildroot-external/configs/odroid_c2_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-C4     |`make odroid_c4`     |[odroid_c4](../../buildroot-external/configs/odroid_c4_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-M1     |`make odroid_m1`     |[odroid_m1](../../buildroot-external/configs/odroid_m1_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-M1S    |`make odroid_m1s`    |[odroid_m1s](../../buildroot-external/configs/odroid_m1s_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-N2/N2+ |`make odroid_n2`     |[odroid_n2](../../buildroot-external/configs/odroid_n2_defconfig)|[hardkernel](./hardkernel/)|
-|ODROID-XU4    |`make odroid_xu4`    |[odroid_xu4](../../buildroot-external/configs/odroid_xu4_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-N2/N2+ |`make odroid_n2`     |[odroid_n2](../../buildroot-external/configs/odroid_n2_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-C2     |`make odroid_c2`     |[odroid_c2](../../buildroot-external/configs/odroid_c2_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-C4     |`make odroid_c4`     |[odroid_c4](../../buildroot-external/configs/odroid_c4_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-XU4    |`make odroid_xu4`    |[odroid_xu4](../../buildroot-external/configs/odroid_xu4_defconfig)|[hardkernel](./hardkernel/)|
 |Tinker Board  |`make tinker`        |[tinker](../../buildroot-external/configs/tinker_defconfig)|[asus](./asus/)|
 |Generic x86-64|`make generic_x86_64`|[generic_x86_64](../../buildroot-external/configs/generic_x86_64_defconfig)|[generic-x86-64](./generic-x86-64/)|
 |OVA           |`make ova`           |[ova](../../buildroot-external/configs/ova_defconfig)|[ova](./ova/)|
--- a/Documentation/boards/hardkernel/README.md
+++ b/Documentation/boards/hardkernel/README.md
@ -4,12 +4,10 @@

 | Device         | Release Date  | Support      | Config    |
 |----------------|---------------|--------------|-----------|
-| ODROID-C2      | 2016          | yes          | [odroid_c2](../../../buildroot-external/configs/odroid_c2_defconfig) |
-| ODROID-C4      | 2020          | yes          | [odroid_c4](../../../buildroot-external/configs/odroid_c4_defconfig) |
-| ODROID-M1      | 2022          | yes          | [odroid_m1](../../../buildroot-external/configs/odroid_m1_defconfig) |
-| ODROID-M1S     | 2023          | yes          | [odroid_m1s](../../../buildroot-external/configs/odroid_m1s_defconfig)|
-| ODROID-N2      | 2019          | yes          | [odroid_n2](../../../buildroot-external/configs/odroid_n2_defconfig) |
 | ODROID-XU4     | 2015          | yes          | [odroid_xu4](../../../buildroot-external/configs/odroid_xu4_defconfig)|
+| ODROID-C2      | 2016          | yes          | [odroid_c2](../../../buildroot-external/configs/odroid_c2_defconfig) |
+| ODROID-C4      | 2020          | experimental | [odroid_c4](../../../buildroot-external/configs/odroid_c4_defconfig) |
+| ODROID-N2      | 2019          | yes          | [odroid_n2](../../../buildroot-external/configs/odroid_n2_defconfig) |

 See separate documentation for each board.

--- a/Documentation/boards/hardkernel/odroid-c2.md
+++ b/Documentation/boards/hardkernel/odroid-c2.md
@ -1,4 +1,4 @@
-# ODROID-C2
+# Odroid-C2

 ## eMMC

--- a/Documentation/boards/hardkernel/odroid-c4.md
+++ b/Documentation/boards/hardkernel/odroid-c4.md
@ -1,10 +1,10 @@
-# ODROID-C4
+# Odroid-C4

 ## Experimental

-ODROID-C4 support is based heavily on the Odroid-C2 and N2 configurations. Given the similarity of the SoCs, as well as the comparable level of support in the Linux kernel, the C4 should hopefully present few surprises. However, Home Assistant support should be regarded as experimental.
+Odroid-C4 support is based heavily on the Odroid-C2 and N2 configurations. Given the similarity of the SoCs, as well as the comparable level of support in the Linux kernel, the C4 should hopefully present few surprises. However, Home Assistant support should be regarded as experimental.

-Please also refer to the documentation pages for the [ODROID-C2](./odroid-c2.md) and [Odroid-N2](./odroid-n2.md), as some of that information may apply to the C4 as well.
+Please also refer to the documentation pages for the [Odroid-C2](./odroid-c2.md) and [Odroid-N2](./odroid-n2.md), as some of that information may apply to the C4 as well.

 Common C4 issues that have been specifically tested and appear to be working:
 - boot from SD
--- a/Documentation/boards/hardkernel/odroid-m1.md
+++ b/Documentation/boards/hardkernel/odroid-m1.md
@ -1,50 +0,0 @@
-# ODROID-M1
-
-Home Assistant OS 10 and newer support the ODROID-M1 board.
-
-## SD-card
-
-SD-card boot is supported via on-board bootloader (SPL) or recovery button.
-
-## eMMC
-
-eMMC boot via on-board bootloader requires a newer version of Petitboot
-(spiboot 20230328 or later). To install the latest version download the SPI boot image
-from [linuxfactory.or.kr][1] as follows:
-
-1. Download `spiupdate_odroidm1_20240415.img.xz`
-2. Use balenaEtcher or another tool to flash the updater onto an SD card
-3. Download `spiboot-20240109.img`
-4. Rename the `spiboot-20240109.img` file to`spiboot.img`.
-5. Paste the `spiboot.img` file onto the FAT partition of that same SD card.
-6. Plug-in that SD card to your ODROID-M1. Petitboot will update itself, you can verify the progress on the HDMI output.
-7. If you see the version 20240109 in the top left corner, the installation was successful.\
-   If you see any other version there, the installation failed.
-
-Once Petitboot is updated you can flash Home Assistant OS directly onto an eMMC.
-
-## NVMe
-
-Booting directly from NVMe is not supported. The NVMe card can be used as a data disk.
-
-## Technical notes on boot flow
-
-The Home Assistant OS image is bootable by the SoC directly. This means that no help
-from the Hardkernel provided and pre-installed bootloader Petitboot is necessary.
-However, the ODROID-M1 automatically boots from internal SPI. To boot
-directly off the SD-card or eMMC you need to press the recovery button.
-
-The SPI flashed U-Boot SPL tries searches for an U-Boot binary on the SD-card
-(and from eMMC with Petitboot 20230328 and later). This mechanism allows you to
-boot the Home Assistant OS U-Boot without pressing the recovery button.
-
-## Console
-
-By default, console access is available on the serial header (CON1) and on HDMI.
-The serial console's baudrate is 1500000 by default.
-
-The systemd startup messages will only appear on the serial console by default.
-To show the messages on the HDMI console instead, add the console manually
-to the `cmdline.txt` file on the boot partition (e.g. `console=tty0`).
-
-[1]: http://ppa.linuxfactory.or.kr/images/petitboot/odroidm1/
--- a/Documentation/boards/hardkernel/odroid-m1s.md
+++ b/Documentation/boards/hardkernel/odroid-m1s.md
@ -1,58 +0,0 @@
-# ODROID-M1S
-
-Home Assistant OS 12 and newer support the ODROID-M1S board.
-
-## SD-card
-
-ODROID-M1S can boot HAOS directly from an SD card, as it has higher priority than the system on the eMMC. Simply flash the image to the SD card using your favorite tool and insert it to the micro SD slot on the board. This works even when the eMMC is wiped, or when it contains the factory-default U-Boot SPL loader, which is still able to load U-Boot provided in the HAOS image. In the second case, however, if the SD card fails to probe (e.g. due to a hardware failure), the system on the eMMC may be booted instead of HAOS.
-
-## eMMC
-
-HAOS can be installed directly to the eMMC using a special boot image, to do that:
-
-1. Download the _UMS Utility_ image: [`ODROID-M1S_EMMC2UMS.img`][1]. The _UMS Utility_ is a special image that switches ODROID-M1S to USB Mass Storage device.
-2. Use balenaEtcher or another tool to flash the _UMS utility_ onto an SD card.
-3. Plug-in that SD card to your ODROID-M1S and boot it. Connect your PC to the Micro USB OTG port.
-4. The eMMC will show as a drive on your PC and you can directly flash the HAOS image with balenaEther.
-
-Installing HAOS replaces the firmware and SPL on the eMMC with the mainline version provided by HAOS. As a result, it is not possible to use the SD card with the EMMC2UMS image anymore, because the mainline SPL is not compatible with U-Boot in the EMMC2UMS image at this time (February 2024). This does not pose any problem for standard use, just makes it more complicated in case you want to return to the Hardkernel-provided OS.
-
-A reliable way of reflashing the eMMC in this case is to use HAOS booted from an SD card. To do that, insert the SD card with HAOS to the micro SD slot and plug the board in. Once the device boots to the HA CLI, enter `login` to enter the root shell and use `curl` to download an image and `dd` it to the eMMC block device:
-
-```sh
-curl https://dn.odroid.com/RK3566/ODROID-M1S/Installer/ODROID-M1S_EMMC2UMS.img | dd of=/dev/mmcblk0
-```
-
-This way the device will start in the UMS mode on the next boot with the SD card removed. Alternatively you can use the [Hardkernel installer image][2] directly instead of the EMMC2UMS image.
-
-## NVMe
-
-Booting directly from NVMe is not supported. The NVMe card can be used as a data disk.
-
-## Technical notes on boot flow
-
-The Home Assistant OS image is bootable by the SoC directly. Refer to the [boot sequence documentation][3] for the details on what part of the boot is executed from the eMMC and what from the SD card. The steps documented above should however cover all scenarios that a standard user may encounter during usage.
-
-## Console
-
-By default, console access is available on the serial header (UART) and on HDMI.
-The serial console's baudrate is 1500000 by default.
-
-The systemd startup messages will only appear on the serial console by default.
-To show the messages on the HDMI console instead, add the console manually
-to the `cmdline.txt` file on the boot partition (e.g. `console=tty0`).
-
-## GPIO
-
-Odroid-M1S introduces a new 14pin expansion header. Refer to [the ODROID wiki][4].
-At this point not all functionality is supported by the upstream kernel used by Home Assistant OS.  
-Supported modules include:
- UPS
- Internal USB
- Mini IO board (partial support)
-
-
-[1]: https://dn.odroid.com/RK3566/ODROID-M1S/Installer/ODROID-M1S_EMMC2UMS.img
-[2]: https://wiki.odroid.com/odroid-m1s/getting_started/os_installation_guide#user_installer
-[3]: https://wiki.odroid.com/odroid-m1s/board_support/boot_sequence
-[4]: https://wiki.odroid.com/odroid-m1s/hardware/expansion_connectors
--- a/Documentation/boards/hardkernel/odroid-n2.md
+++ b/Documentation/boards/hardkernel/odroid-n2.md
@ -1,4 +1,4 @@
-# ODROID-N2
+# Odroid-N2

 ## eMMC

--- a/Documentation/boards/raspberrypi/README.md
+++ b/Documentation/boards/raspberrypi/README.md
@ -4,10 +4,10 @@

 | Device              | Release Date  | Support         | Config             |
 |---------------------|---------------|-----------------|--------------------|
+| Raspberry Pi B/B+/A+|2012/2014/2014 | not recommended | [rpi](../../../buildroot-external/configs/rpi_defconfig)              |
 | Raspberry Pi 2 B    |2015           | not recommended | [rpi2](../../../buildroot-external/configs/rpi2_defconfig)             |
 | Raspberry Pi 3 B/B+ |2016/2018      | yes             | [rpi3](../../../buildroot-external/configs/rpi3_defconfig) / [rpi3_64](../../../buildroot-external/configs/rpi3_64_defconfig) |
 | Raspberry Pi 4 B    |2019           | yes             | [rpi4](../../../buildroot-external/configs/rpi4_defconfig) / [rpi4_64](../../../buildroot-external/configs/rpi4_64_defconfig) |
-| Raspberry Pi 5      |2023           | yes (beta)      | [rpi5_64](../../../buildroot-external/configs/rpi5_64_defconfig) |

 ## Serial console

--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@ -25,7 +25,8 @@ hassos-xy.raucb

 Text files that are on USB stick must have Unix (LF) end of line characters. If you create USB stick on Windows machine, be sure to use Notepad++, Visual Studio Code or any other editor, that supports different line endings. In Notepad++ LF EOL can be enabled with setting `Edit -> EOL Conversion -> Unix (LF)`.

-You can put this USB stick into the device and it will be read on startup and files written to the correct places. You can also trigger this process later using `ha os import` from the CLI or by calling `systemctl restart hassos-config` on the OS shell. *The USB Stick just needs to be inserted to the device during this setup process and can be removed afterwards.*
+You can put this USB stick into the device and it will be read on startup and files written to the correct places. You can also trigger this process later over the
+API/UI or by calling `systemctl restart hassos-config` on the host. *The USB Stick just needs to be inserted to the device during this setup process and can be disconnected afterwards.*

 ## Local

@ -53,7 +54,7 @@ Our default NTP configuration look like:

 ```
 [Time]
-NTP=time.cloudflare.com
+NTP=time1.google.com time2.google.com time3.google.com
 FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org
 ```

--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@ -1,24 +1,22 @@

 # Kernel Version

+Default Kernel tree: 5.15
+
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 6.12.40 |
-| Raspberry Pi | 6.12.25 |
-| Raspberry Pi 0-W | 6.12.25 |
-| Raspberry Pi 2 | 6.12.25 |
-| Raspberry Pi 3 | 6.12.25 |
-| Raspberry Pi 4 | 6.12.25 |
-| Raspberry Pi 5 | 6.12.25 |
-| Home Assistant Yellow | 6.12.25 |
-| Home Assistant Green | 6.12.40 |
-| Tinker Board | 6.12.40 |
-| ODROID-C2 | 6.12.40 |
-| ODROID-C4 | 6.12.40 |
-| ODROID-M1 | 6.12.40 |
-| ODROID-M1S | 6.12.40 |
-| ODROID-N2 | 6.12.40 |
-| ODROID-XU4 | 6.12.40 |
-| Generic aarch64 | 6.12.40 |
-| Generic x86-64 | 6.12.40 |
-| Khadas VIM3 | 6.12.40 |
+| Open Virtual Appliance | 5.15.80 |
+| Raspberry Pi | 5.15.76 |
+| Raspberry Pi 0-W | 5.15.76 |
+| Raspberry Pi 2 | 5.15.76 |
+| Raspberry Pi 3 | 5.15.76 |
+| Raspberry Pi 4 | 5.15.76 |
+| Home Assistant Yellow | 5.15.76 |
+| Tinker Board | 5.15.80 |
+| Odroid-C2 | 5.15.80 |
+| Odroid-C4 | 5.15.80 |
+| Odroid-N2 | 5.15.80 |
+| Odroid-XU4 | 5.15.80 |
+| Generic aarch64 | 5.15.80 |
+| Generic x86-64 | 5.15.80 |
+| Khadas VIM3 | 5.15.80 |
--- a/Documentation/network.md
+++ b/Documentation/network.md
@ -188,6 +188,6 @@ If you now view the default connection `cat /etc/NetworkManager/system-connectio

 Doing a `nmcli con reload` does not always work, so restart the virtual machine or the physical system.

-[nm-manual]: https://networkmanager.dev/docs/api/1.40/manpages.html
+[nm-manual]: https://developer.gnome.org/NetworkManager/stable/manpages.html
 [configuration-usb]: configuration.md
-[uuid]: https://www.uuidgenerator.net/version4
+[uuid]: https://www.uuidgenerator.net/
--- a/62
+++ b/62
@ -1,8 +1,11 @@
 BUILDDIR:=$(shell pwd)
+RELEASE_DIR = $(BUILDDIR)/release

 BUILDROOT=$(BUILDDIR)/buildroot
 BUILDROOT_EXTERNAL=$(BUILDDIR)/buildroot-external
 DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
+VERSION_DATE := $(shell date --utc +'%Y%m%d')
+VERSION_DEV := "dev$(VERSION_DATE)"

 TARGETS := $(notdir $(patsubst %_defconfig,%,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
 TARGETS_CONFIG := $(notdir $(patsubst %_defconfig,%-config,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
@ -14,48 +17,41 @@ else
 override O := $(BUILDDIR)/$(O)
 endif

-################################################################################
+.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) all

-COLOR_STEP := $(shell tput smso 2>/dev/null)
-COLOR_WARN := $(shell (tput setab 3; tput setaf 0) 2>/dev/null)
-TERM_RESET := $(shell tput sgr0 2>/dev/null)
+.PHONY: $(TARGETS) $(TARGETS_CONFIG) all clean help

-################################################################################
+all: $(TARGETS)

-.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) default
+$(RELEASE_DIR):
+	mkdir -p $(RELEASE_DIR)

-.PHONY: $(TARGETS) $(TARGETS_CONFIG) default buildroot-help help
-
-# fallback target when target undefined here is given
-.DEFAULT:
-	@echo "$(COLOR_STEP)=== Falling back to Buildroot target '$@' ===$(TERM_RESET)"
-	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$@"
-
-# default target when no target is given - must be first in Makefile
-default:
-	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
+savedefconfig:
+	@echo "config $*"
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "savedefconfig"

 $(TARGETS_CONFIG): %-config:
-	@if [ -f $(O)/.config ] && ! grep -q 'BR2_DEFCONFIG="$(DEFCONFIG_DIR)/$*_defconfig"' $(O)/.config; then \
-		echo "$(COLOR_WARN)WARNING: Output directory '$(O)' already contains files for another target!$(TERM_RESET)"; \
-		echo "         Before running build for a different target, run 'make distclean' first."; \
-		echo ""; \
-		bash -c 'read -t 10 -p "Waiting 10s, press enter to continue or Ctrl-C to abort..."' || true; \
-	fi
-	@echo "$(COLOR_STEP)=== Using $*_defconfig ===$(TERM_RESET)"
+	@echo "config $*"
 	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$*_defconfig"

-$(TARGETS): %: %-config
-	@echo "$(COLOR_STEP)=== Building $@ ===$(TERM_RESET)"
-	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
+$(TARGETS): %: $(RELEASE_DIR) %-config
+	@echo "build $@"
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) VERSION_DEV=$(VERSION_DEV)
+	cp -f $(O)/images/haos_* $(RELEASE_DIR)/

-buildroot-help:
-	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) help
+	# Do not clean when building for one target
+ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)
+	@echo "clean $@"
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) clean
+endif
+	@echo "finished $@"
+
+clean:
+	$(MAKE) -C $(BUILDROOT) O=$(O) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) clean

 help:
-	@echo "Run 'make <target>' to build a target image."
-	@echo "Run 'make <target>-config' to configure buildroot for a target."
-	@echo ""
 	@echo "Supported targets: $(TARGETS)"
-	@echo ""
-	@echo "Unknown Makefile targets fall back to Buildroot make - for details run 'make buildroot-help'"
+	@echo "Run 'make <target>' to build a target image."
+	@echo "Run 'make all' to build all target images."
+	@echo "Run 'make clean' to clean the build output."
+	@echo "Run 'make <target>-config' to configure buildroot for a target."
--- a/README.md
+++ b/README.md
@ -2,9 +2,7 @@

 Home Assistant Operating System (formerly HassOS) is a Linux based operating system optimized to host [Home Assistant](https://www.home-assistant.io) and its [Add-ons](https://www.home-assistant.io/addons/).

-Home Assistant Operating System uses Docker as its container engine. By default it deploys the Home Assistant Supervisor as a container. Home Assistant Supervisor in turn uses the Docker container engine to control Home Assistant Core and Add-Ons in separate containers. Home Assistant Operating System is **not** based on a regular Linux distribution like Ubuntu. It is built using [Buildroot](https://buildroot.org/) and it is optimized to run Home Assistant. It targets single board compute (SBC) devices like the Raspberry Pi or ODROID but also supports x86-64 systems with UEFI.
-
-[![Home Assistant - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/home-assistant.png)](https://www.openhomefoundation.org/)
+Home Assistant Operating System uses Docker as Container engine. It by default deploys the Home Assistant Supervisor as a container. Home Assistant Supervisor in turn uses the Docker container engine to control Home Assistant Core and Add-Ons in separate containers. Home Assistant Operating System is **not** based on a regular Linux distribution like Ubuntu. It is built using [Buildroot](https://buildroot.org/) and it is optimized to run Home Assistant. It targets single board compute (SBC) devices like the Raspberry Pi or ODROID but also supports x86-64 systems with UEFI.

 ## Features

@ -16,7 +14,6 @@ Home Assistant Operating System uses Docker as its container engine. By default

 ## Supported hardware

- Nabu Casa
 - Raspberry Pi
 - Hardkernel ODROID
 - Asus Tinker Board
@ -40,7 +37,7 @@ The Home Assistant Operating System documentation can be found on the [Home Assi
 ### Components

 - **Bootloader:**
-  - [GRUB](https://www.gnu.org/software/grub/) for devices that support UEFI
+  - [Barebox](https://barebox.org/) for devices that support UEFI
  - [U-Boot](https://www.denx.de/wiki/U-Boot) for devices that don't support UEFI
 - **Operating System:**
  - [Buildroot](https://buildroot.org/) LTS Linux
@ -58,4 +55,4 @@ The Home Assistant Operating System documentation can be found on the [Home Assi

 The Development build GitHub Action Workflow is a manually triggered workflow
 which creates Home Assistant OS development builds. The development builds are
-available at [https://os-artifacts.home-assistant.io/index.html](https://os-artifacts.home-assistant.io/index.html).
+available at [os-builds.home-assistant.io](https://os-builds.home-assistant.io/).
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 01604756d2d0fc42e6ad7061fe1eb5bead732374
+Subproject commit 80bb9553ec3ccc5906b8e80e21b70974e2b46faa
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@ -2,20 +2,16 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/gasket/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/generic_raw_uart/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/hailo8-firmware/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/hailo-pci/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/khadas-boot/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/pi-bluetooth/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/lxd-guest-agent/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/rockchip-blobs/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl88x2bu/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8821cu/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/tempio/Config.in.host"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/vcgencmd/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/xe-guest-utilities/Config.in"
--- a/buildroot-external/board/arm-uefi/generic-aarch64/cmdline.txt
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/cmdline.txt
@ -1 +1 @@
-console=ttyS0 console=tty0
+console=tty1 console=ttyS0
--- a/buildroot-external/board/arm-uefi/generic-aarch64/grub.cfg
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/grub.cfg
@ -54,13 +54,9 @@ if [ "$default" -eq 99 ]; then
    fi
 fi

-if [ "$MACHINE_ID" == "" ]; then
-    boot_condition="systemd.condition-first-boot=true"
-fi
-
 save_env A_TRY A_OK B_TRY B_OK ORDER MACHINE_ID

-default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 systemd.machine_id=$MACHINE_ID fsck.repair=yes $boot_condition"
+default_cmdline="rootwait zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=$MACHINE_ID fsck.repair=yes"
 file_env -f ($root)/cmdline.txt cmdline

 # root is a full HDD/partition definition in GRUB format like hd0,gpt1
--- a/buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh
@ -10,9 +10,6 @@ function hassos_pre_image() {
    cp "${BOARD_DIR}/grub.cfg" "${EFIPART_DATA}/EFI/BOOT/grub.cfg"
    cp "${BOARD_DIR}/cmdline.txt" "${EFIPART_DATA}/cmdline.txt"
    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" create
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set ORDER="A B"
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_OK=1
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_TRY=0

    cp -r "${EFIPART_DATA}/"* "${BOOT_DATA}/"
 }
@ -20,12 +17,11 @@ function hassos_pre_image() {

 function hassos_post_image() {
    convert_disk_image_virtual vmdk
-    convert_disk_image_virtual vdi
    convert_disk_image_virtual qcow2

    convert_disk_image_zip vmdk
-    convert_disk_image_zip vdi
    convert_disk_image_xz qcow2

    convert_disk_image_xz
 }
+
--- a/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/kernel.config
@ -1,84 +1,20 @@
 CONFIG_EFI_STUB=y

-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-
-CONFIG_CONNECTOR=y
-
-CONFIG_VSOCKETS=y
-
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_BLK_SCSI=y
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_SCSI_VIRTIO=y
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-CONFIG_VIRTIO_IOMMU=m
-CONFIG_CRYPTO_ENGINE=m
-CONFIG_CRYPTO_DEV_VIRTIO=m
-
-# options for backward compatibility
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_SWP_EMULATION=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_SETEND_EMULATION=y
-
-# These options are needed for virtio-fs
-CONFIG_FUSE_FS=y
-CONFIG_VIRTIO_FS=y
-CONFIG_DAX=y
-CONFIG_FS_DAX=y
-CONFIG_ZONE_DEVICE=y
-
-CONFIG_DMI_SYSFS=m
-CONFIG_FW_CFG_SYSFS=m
+CONFIG_HW_RANDOM_VIRTIO=y

 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_HWMON=y

 CONFIG_DRM_VIRTIO_GPU=m
-
-CONFIG_HYPERV=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_HYPERV_STORAGE=y
-CONFIG_HYPERV_NET=y
-CONFIG_HYPERV_VSOCKETS=m
-CONFIG_PCI_HYPERV=m
-CONFIG_PCI_HYPERV_INTERFACE=m
-CONFIG_FB_HYPERV=y
-
-CONFIG_I6300ESB_WDT=y
-
-# GPIO support
-CONFIG_GPIO_ZYNQ=y
-CONFIG_GPIO_PCA9570=y
-
-# PHY drivers
-CONFIG_PHY_XILINX_ZYNQMP=y
-
-# USB support
-CONFIG_USB_ONBOARD_DEV=y
-CONFIG_USB_ONBOARD_DEV_USB5744=y
-
-# i2c support
-CONFIG_I2C_CADENCE=y
-
-# 1-wire
-CONFIG_W1_MASTER_AMD_AXI=m
-CONFIG_W1_SLAVE_THERM=m
-
-# IIO
-CONFIG_XILINX_AMS=m
-
-# Audio drivers
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_GENERIC=m
--- a/buildroot-external/board/arm-uefi/generic-aarch64/meta
+++ b/buildroot-external/board/arm-uefi/generic-aarch64/meta
@ -3,9 +3,8 @@ BOARD_NAME="Generic aarch64"
 CHASSIS=embedded
 BOOTLOADER=grub
 KERNEL_FILE=Image
-PARTITION_TABLE_TYPE=gpt
-BOOT_SIZE=32M
+BOOT_SYS=efi
 BOOT_SPL=false
-DISK_SIZE=6G
+DISK_SIZE=6
 SUPERVISOR_MACHINE=qemuarm-64
 SUPERVISOR_ARCH=aarch64
--- a/buildroot-external/board/asus/hassos-hook.sh
+++ b/buildroot-external/board/asus/hassos-hook.sh
@ -3,6 +3,7 @@

 function hassos_pre_image() {
    local BOOT_DATA="$(path_boot_dir)"
+    local SPL_IMG="$(path_spl_img)"

    cp -t "${BOOT_DATA}" \
        "${BINARIES_DIR}/boot.scr" \
@ -12,7 +13,14 @@ function hassos_pre_image() {
    mkdir -p "${BOOT_DATA}/overlays"
    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
-    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+
+    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
+
+    # SPL
+    create_spl_image
+
+    dd if="${BINARIES_DIR}/idbloader.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
+    dd if="${BINARIES_DIR}/u-boot-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=8192
 }


--- a/buildroot-external/board/asus/tinker/cmdline.txt
+++ b/buildroot-external/board/asus/tinker/cmdline.txt
@ -1 +0,0 @@
-console=tty0
--- a/buildroot-external/board/asus/tinker/image-spl-spl.cfg
+++ b/buildroot-external/board/asus/tinker/image-spl-spl.cfg
@ -1,13 +0,0 @@
-image spl.img {
-	size = ${BOOT_SPL_SIZE}
-
-	hdimage {
-		partition-table-type = "none"
-		fill = "yes"
-	}
-
-	partition uboot {
-		offset = 32k
-		image = "u-boot-rockchip.bin"
-	}
-}
--- a/buildroot-external/board/asus/tinker/kernel.config
+++ b/buildroot-external/board/asus/tinker/kernel.config
--- a/buildroot-external/board/asus/tinker/meta
+++ b/buildroot-external/board/asus/tinker/meta
@ -3,10 +3,8 @@ BOARD_NAME="Asus TinkerBoard"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-PARTITION_TABLE_TYPE=hybrid
-BOOT_SIZE=24M
+BOOT_SYS=hybrid
 BOOT_SPL=true
-BOOT_SPL_SIZE=8M
 BOOT_ENV_SIZE=0x8000
 SUPERVISOR_MACHINE=tinker
 SUPERVISOR_ARCH=armv7
--- a/buildroot-external/board/asus/tinker/partition-spl-spl.cfg
+++ b/buildroot-external/board/asus/tinker/partition-spl-spl.cfg
@ -1,7 +0,0 @@
-partition spl {
-	size = ${BOOT_SPL_SIZE}
-	image = "spl.img"
-	in-partition-table = "no"
-	offset = 0
-	holes = {"(0; 17k)"}
-}
--- a/buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch
@ -1,4 +1,5 @@
-From 675fbbc309e4f7c805cf4fbd7c463cfc8308b54e Mon Sep 17 00:00:00 2001
+From ff0c5c49024da05b47d4fcc4d115761c43eef7a6 Mon Sep 17 00:00:00 2001
+Message-Id: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 17 Feb 2021 19:55:41 +0100
 Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for
@ -6,14 +7,14 @@ Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for

 This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
 ---
- arch/arm/boot/dts/rockchip/rk3288.dtsi | 8 --------
+ arch/arm/boot/dts/rk3288.dtsi | 8 --------
 1 file changed, 8 deletions(-)

-diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-index 3f1d640afafae..becf3abd8367f 100644
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-@@ -387,8 +387,6 @@ uart0: serial@ff180000 {
+diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
+index 4dcdcf17c977..ff6faa82192b 100644
+--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
+@@ -378,8 +378,6 @@ uart0: serial@ff180000 {
 		reg-io-width = <4>;
 		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
 		clock-names = "baudclk", "apb_pclk";
@ -22,7 +23,7 @@ index 3f1d640afafae..becf3abd8367f 100644
 		pinctrl-names = "default";
 		pinctrl-0 = <&uart0_xfer>;
 		status = "disabled";
-@@ -402,8 +400,6 @@ uart1: serial@ff190000 {
+@@ -393,8 +391,6 @@ uart1: serial@ff190000 {
 		reg-io-width = <4>;
 		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
 		clock-names = "baudclk", "apb_pclk";
@ -31,7 +32,7 @@ index 3f1d640afafae..becf3abd8367f 100644
 		pinctrl-names = "default";
 		pinctrl-0 = <&uart1_xfer>;
 		status = "disabled";
-@@ -430,8 +426,6 @@ uart3: serial@ff1b0000 {
+@@ -421,8 +417,6 @@ uart3: serial@ff1b0000 {
 		reg-io-width = <4>;
 		clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
 		clock-names = "baudclk", "apb_pclk";
@ -40,7 +41,7 @@ index 3f1d640afafae..becf3abd8367f 100644
 		pinctrl-names = "default";
 		pinctrl-0 = <&uart3_xfer>;
 		status = "disabled";
-@@ -445,8 +439,6 @@ uart4: serial@ff1c0000 {
+@@ -436,8 +430,6 @@ uart4: serial@ff1c0000 {
 		reg-io-width = <4>;
 		clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
 		clock-names = "baudclk", "apb_pclk";
@ -49,3 +50,6 @@ index 3f1d640afafae..becf3abd8367f 100644
 		pinctrl-names = "default";
 		pinctrl-0 = <&uart4_xfer>;
 		status = "disabled";
+-- 
+2.36.1
+
--- a/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
@ -1,4 +1,7 @@
-From 37b4467356113f17f55066aef54db55b64daa030 Mon Sep 17 00:00:00 2001
+From e73b4b762a0842cc75b2784e4c4267f6f4fc50c4 Mon Sep 17 00:00:00 2001
+Message-Id: <e73b4b762a0842cc75b2784e4c4267f6f4fc50c4.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 22:15:14 +0100
 Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface
@ -14,14 +17,14 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
 [move change to rk3288-tinker.dtsi]
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 19 +++++++++++++++++++
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

-diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 09618bb7d872c..30430d2e64b93 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-@@ -483,6 +483,25 @@ &sdio0 {
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index 9c1e38c54eae..cf278bcc91ad 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -485,6 +485,25 @@ &sdio0 {
 	status = "okay";
 };
 
@ -47,3 +50,6 @@ index 09618bb7d872c..30430d2e64b93 100644
 &tsadc {
 	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
 	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
+-- 
+2.36.1
+
--- a/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch
@ -1,4 +1,7 @@
-From 1a15fc7f6a241895a31b00c1f324d358d408a610 Mon Sep 17 00:00:00 2001
+From 00de5155d12a178b83961f459ddccd7fa08ec25c Mon Sep 17 00:00:00 2001
+Message-Id: <00de5155d12a178b83961f459ddccd7fa08ec25c.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 4 Sep 2020 21:57:55 +0200
 Subject: [PATCH] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
@ -7,14 +10,14 @@ Enable I2C devices which are accessible via 40-pin header.

 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 8 ++++++++
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

-diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 30430d2e64b93..395afc2b2283c 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-@@ -342,10 +342,18 @@ regulator-state-mem {
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index cf278bcc91ad..f23c6efd39d4 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -344,10 +344,18 @@ regulator-state-mem {
 	};
 };
 
@ -33,3 +36,6 @@ index 30430d2e64b93..395afc2b2283c 100644
 &i2c5 {
 	status = "okay";
 };
+-- 
+2.36.1
+
--- a/buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch
@ -1,4 +1,7 @@
-From d6c44c231fc4518ad69bb7870a193bb10c563f2a Mon Sep 17 00:00:00 2001
+From e45da42e71e4f92995d5ec11679ca00b0971dbfe Mon Sep 17 00:00:00 2001
+Message-Id: <e45da42e71e4f92995d5ec11679ca00b0971dbfe.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Myy Miouyouyou <myy@miouyouyou.fr>
 Date: Thu, 19 Oct 2017 21:24:47 +0200
 Subject: [PATCH] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl
@ -10,14 +13,14 @@ This patch is taken from the patches provided by the ARMbian team.

 Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
 ---
- arch/arm/boot/dts/rockchip/rk3288.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-index becf3abd8367f..e78fa883b9841 100644
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-@@ -320,7 +320,7 @@ spi2: spi@ff130000 {
+diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
+index ff6faa82192b..5061c5418d75 100644
+--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
+@@ -311,7 +311,7 @@ spi2: spi@ff130000 {
 		dma-names = "tx", "rx";
 		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
 		pinctrl-names = "default";
@ -26,3 +29,6 @@ index becf3abd8367f..e78fa883b9841 100644
 		reg = <0x0 0xff130000 0x0 0x1000>;
 		#address-cells = <1>;
 		#size-cells = <0>;
+-- 
+2.36.1
+
--- a/buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch
@ -1,4 +1,7 @@
-From dfb0232e9fae1267d04247aaf171739038c1659e Mon Sep 17 00:00:00 2001
+From e33d3ba4c34d0893d9d07b62ad4eea41d2e8bbc0 Mon Sep 17 00:00:00 2001
+Message-Id: <e33d3ba4c34d0893d9d07b62ad4eea41d2e8bbc0.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 20:16:05 +0100
 Subject: [PATCH] ARM: DTSI: rk3288-tinker: Improving the CPU max voltage
@ -7,14 +10,14 @@ Taken from the various patches provided by @TonyMac32 .

 Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
 ---
- arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 395afc2b2283c..c7e79e5947206 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-@@ -184,7 +184,7 @@ vdd_cpu: DCDC_REG1 {
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index f23c6efd39d4..cdff130d1292 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -186,7 +186,7 @@ vdd_cpu: DCDC_REG1 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <750000>;
@ -23,3 +26,6 @@ index 395afc2b2283c..c7e79e5947206 100644
 				regulator-name = "vdd_arm";
 				regulator-ramp-delay = <6000>;
 				regulator-state-mem {
+-- 
+2.36.1
+
--- a/buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch
@ -1,4 +1,7 @@
-From 4955695e410289df07258b00290d4028c3ac8fb1 Mon Sep 17 00:00:00 2001
+From e073d75cd0dbfbcbbf1b46e565b326db37b75e6a Mon Sep 17 00:00:00 2001
+Message-Id: <e073d75cd0dbfbcbbf1b46e565b326db37b75e6a.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Myy Miouyouyou <myy@miouyouyou.fr>
 Date: Sun, 7 Jan 2018 01:52:44 +0100
 Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot
@ -21,7 +24,7 @@ Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
 1 file changed, 66 insertions(+)

 diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
-index f96260fd143b4..fa779ce8fb661 100644
+index d36991acd6df..a526927e29df 100644
 --- a/drivers/mmc/host/dw_mmc-rockchip.c
 +++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -12,6 +12,11 @@
@ -36,7 +39,7 @@ index f96260fd143b4..fa779ce8fb661 100644
 #include "dw_mmc.h"
 #include "dw_mmc-pltfm.h"
 
-@@ -527,6 +532,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
+@@ -330,6 +335,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
 };
 MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);
 
@ -103,7 +106,7 @@ index f96260fd143b4..fa779ce8fb661 100644
 static int dw_mci_rockchip_probe(struct platform_device *pdev)
 {
 	const struct dw_mci_drv_data *drv_data;
-@@ -554,6 +619,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
+@@ -357,6 +422,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
 	}
 
 	pm_runtime_put_autosuspend(&pdev->dev);
@ -111,3 +114,6 @@ index f96260fd143b4..fa779ce8fb661 100644
 
 	return 0;
 }
+-- 
+2.36.1
+
--- a/buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch
@ -1,4 +1,7 @@
-From 74227462bbe9236dca234dd24cce4191fa71bdf9 Mon Sep 17 00:00:00 2001
+From 392472dc977300a9f2a62159c105a6dfed878643 Mon Sep 17 00:00:00 2001
+Message-Id: <392472dc977300a9f2a62159c105a6dfed878643.1652225232.git.stefan@agner.ch>
+In-Reply-To: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
+References: <ff0c5c49024da05b47d4fcc4d115761c43eef7a6.1652225232.git.stefan@agner.ch>
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 10 May 2022 22:57:26 +0200
 Subject: [PATCH] ARM: dts: rockchip: Add Bluetooth to rk3288-tinker
@ -8,14 +11,14 @@ for Realtek rtl8723bs Bluetooth device.

 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
- arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 26 +++++++++++++++++++
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

-diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index c7e79e5947206..5d261fae6e72a 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-@@ -386,6 +386,20 @@ bl_en: bl-en {
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index cdff130d1292..e904c130dedc 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -388,6 +388,20 @@ bl_en: bl-en {
 		};
 	};
 
@ -36,7 +39,7 @@ index c7e79e5947206..5d261fae6e72a 100644
 	buttons {
 		pwrbtn: pwrbtn {
 			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
-@@ -518,6 +532,18 @@ &tsadc {
+@@ -520,6 +534,18 @@ &tsadc {
 
 &uart0 {
 	status = "okay";
@ -55,3 +58,6 @@ index c7e79e5947206..5d261fae6e72a 100644
 };
 
 &uart1 {
+-- 
+2.36.1
+
--- a/buildroot-external/board/asus/tinker/patches/linux/0008-usb-audio-add-ASUS-TinkerBoard-s-ALC4040.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0008-usb-audio-add-ASUS-TinkerBoard-s-ALC4040.patch
@ -1,32 +0,0 @@
-From eb29ab60a69353f355b3af58b06fff1a89d17992 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Wed, 10 Jan 2024 16:29:59 +0100
-Subject: [PATCH] usb-audio: add ASUS TinkerBoard's ALC4040
-
-Converted to git-series patch from the original plain git diff file
-buildroot-external/board/asus/tinker/patches/linux/3001_Tinkerboard-4.19-audio.patch
-
-Co-authored-by: Pascal Vizeli <pascal.vizeli@syshack.ch>
---
- sound/usb/card.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/sound/usb/card.c b/sound/usb/card.c
-index 9c411b82a218d..672136e25c81d 100644
--- a/sound/usb/card.c
-+++ b/sound/usb/card.c
-@@ -533,6 +533,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
- 	}
- 
- 	strim(card->shortname);
-+
-+	/* Tinker Board ALC4040 CODEC	*/
-+
-+	if(USB_ID_VENDOR(chip->usb_id) == 0x0bda &&
-+		USB_ID_PRODUCT(chip->usb_id) == 0x481a) {
-+			strlcat(card->shortname, " OnBoard", sizeof(card->shortname));
-+	}
-+	
- }
- 
- static void usb_audio_make_longname(struct usb_device *dev,
--- a/buildroot-external/board/asus/tinker/patches/linux/3001_Tinkerboard-4.19-audio.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/3001_Tinkerboard-4.19-audio.patch
@ -0,0 +1,19 @@
+diff --git a/sound/usb/card.c b/sound/usb/card.c
+index 2bfe4e80a..cea93aaf5 100644
+--- a/sound/usb/card.c
+++ b/sound/usb/card.c
+@@ -382,6 +382,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
+ 	}
+ 
+ 	strim(card->shortname);
+
+	/* Tinker Board ALC4040 CODEC	*/
+
+	if(USB_ID_VENDOR(chip->usb_id) == 0x0bda &&
+		USB_ID_PRODUCT(chip->usb_id) == 0x481a) {
+			strlcat(card->shortname, " OnBoard", sizeof(card->shortname));
+	}
+	
+ }
+ 
+ static void usb_audio_make_longname(struct usb_device *dev,
--- a/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch
+++ b/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch
@ -0,0 +1,37 @@
+From 966cd1782632bc8279667955ec315e93c89495e6 Mon Sep 17 00:00:00 2001
+Message-Id: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch>
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Fri, 24 Apr 2020 12:41:50 +0000
+Subject: [PATCH 1/2] SPL: modify load address of U-Boot
+
+Default load address of U-Boot is at sector 16384, which is where HAOS
+has its first partition. Use 0x2000 (8192) instead.
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ configs/tinker-rk3288_defconfig   | 1 +
+ configs/tinker-s-rk3288_defconfig | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
+index a9c9a122f6..b839fdb570 100644
+--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
+@@ -92,3 +92,4 @@ CONFIG_VIDEO_ROCKCHIP=y
+ CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+ CONFIG_CMD_DHRYSTONE=y
+ CONFIG_ERRNO_STR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
+diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
+index f367c9370f..c52b0753ec 100644
+--- a/configs/tinker-s-rk3288_defconfig
+++ b/configs/tinker-s-rk3288_defconfig
+@@ -94,3 +94,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+ CONFIG_CONSOLE_SCROLL_LINES=10
+ CONFIG_CMD_DHRYSTONE=y
+ CONFIG_ERRNO_STR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
+-- 
+2.35.1
+
--- a/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch
+++ b/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch
@ -1,30 +1,34 @@
-From 78bd1a46cfc585773719963ce8e0a380e9676a93 Mon Sep 17 00:00:00 2001
+From 98674c65a6595e7ac554f7ec9d6f0228556756f6 Mon Sep 17 00:00:00 2001
+Message-Id: <98674c65a6595e7ac554f7ec9d6f0228556756f6.1645627366.git.stefan@agner.ch>
+In-Reply-To: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch>
+References: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Fri, 24 Apr 2020 11:37:55 +0000
-Subject: [PATCH] pmic: enable LDO2 vcc33_mipi at bootup
+Subject: [PATCH 2/2] pmic: enable LDO2 vcc33_mipi at bootup

 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
- board/rockchip/tinker_rk3288/tinker-rk3288.c | 36 ++++++++++++++++++++
- 1 file changed, 36 insertions(+)
+ board/rockchip/tinker_rk3288/tinker-rk3288.c | 37 ++++++++++++++++++++
+ 1 file changed, 37 insertions(+)

 diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
-index e966e9f201a..2944d8c084f 100644
+index f85209c649..6fa1bb0c66 100644
 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
 +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
-@@ -9,6 +9,7 @@
- #include <init.h>
- #include <net.h>
+@@ -13,6 +13,7 @@
 #include <netdev.h>
+ #include <asm/arch-rockchip/bootrom.h>
+ #include <asm/io.h>
 +#include <power/regulator.h>
 
 static int get_ethaddr_from_eeprom(u8 *addr)
 {
-@@ -34,3 +35,38 @@ int rk3288_board_late_init(void)
+@@ -48,3 +49,39 @@ int mmc_get_env_dev(void)
 
- 	return 0;
+ 	return 1;
 }
 +
+
 +#ifdef CONFIG_DM_PMIC
 +static int rockchip_set_regulator_on(const char *name, uint uv)
 +{
@ -59,3 +63,6 @@ index e966e9f201a..2944d8c084f 100644
 +	return 0;
 +}
 +#endif
+-- 
+2.35.1
+
--- a/buildroot-external/board/asus/tinker/uboot-boot.ush
+++ b/buildroot-external/board/asus/tinker/uboot-boot.ush
@ -16,15 +16,12 @@ test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
 test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

-# Allows ConditionFirstBoot=
-test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
-
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} fsck.repair=yes"

 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"

 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
--- a/buildroot-external/board/asus/tinker/uboot.config
+++ b/buildroot-external/board/asus/tinker/uboot.config
@ -1,6 +1,3 @@
 # CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
 CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_SPL_PAD_TO=0x3f8000
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
-# CONFIG_ENV_IS_IN_MMC is not set
--- a/buildroot-external/board/hardkernel/kernel-amlogic.config
+++ b/buildroot-external/board/hardkernel/kernel-amlogic.config
--- a/buildroot-external/board/hardkernel/odroid-c2/cmdline.txt
+++ b/buildroot-external/board/hardkernel/odroid-c2/cmdline.txt
@ -1 +1 @@
-console=ttyAML0,115200n8 console=tty0
+console=tty0 console=ttyAML0,115200n8
--- a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
@ -3,6 +3,9 @@

 function hassos_pre_image() {
    local BOOT_DATA="$(path_boot_dir)"
+    local BL1="${BINARIES_DIR}/bl1.bin.hardkernel"
+    local UBOOT_GXBB="${BINARIES_DIR}/u-boot.gxbb"
+    local SPL_IMG="$(path_spl_img)"

    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
    cp "${BINARIES_DIR}/meson-gxbb-odroidc2.dtb" "${BOOT_DATA}/meson-gxbb-odroidc2.dtb"
@ -11,6 +14,13 @@ function hassos_pre_image() {
    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+
+    # SPL
+    create_spl_image
+
+    dd if="${BL1}" of="${SPL_IMG}" conv=notrunc bs=1 count=440
+    dd if="${BL1}" of="${SPL_IMG}" conv=notrunc bs=512 skip=1 seek=1
+    dd if="${UBOOT_GXBB}" of="${SPL_IMG}" conv=notrunc bs=512 seek=97
 }


--- a/buildroot-external/board/hardkernel/odroid-c2/image-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-c2/image-spl-spl.cfg
@ -1,20 +0,0 @@
-image spl.img {
-	size = ${BOOT_SPL_SIZE}
-
-	hdimage {
-		partition-table-type = "none"
-		fill = "yes"
-	}
-
-	partition bl1 {
-		in-partition-table = "no"
-		image = "bl1.bin.hardkernel"
-		offset = 0
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.gxbb"
-		offset = 97s
-	}
-}
--- a/buildroot-external/board/hardkernel/odroid-c2/meta
+++ b/buildroot-external/board/hardkernel/odroid-c2/meta
@ -1,12 +1,10 @@
 BOARD_ID=odroid-c2
-BOARD_NAME="Hardkernel ODROID-C2"
+BOARD_NAME="Hardkernel Odroid-C2"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-PARTITION_TABLE_TYPE=mbr
-BOOT_SIZE=24M
+BOOT_SYS=mbr
 BOOT_SPL=true
-BOOT_SPL_SIZE=8M
 BOOT_ENV_SIZE=0x2000
 SUPERVISOR_MACHINE=odroid-c2
 SUPERVISOR_ARCH=aarch64
--- a/buildroot-external/board/hardkernel/odroid-c2/partition-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-c2/partition-spl-spl.cfg
@ -1,8 +0,0 @@
-partition spl {
-	size = ${BOOT_SPL_SIZE}
-	image = "spl.img"
-	in-partition-table = "no"
-	offset = 0
-	holes = {"(440; 512)"}
-}
-
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
@ -18,15 +18,12 @@ test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
 test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

-# Allows ConditionFirstBoot=
-test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
-
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} fsck.repair=yes"

 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"

 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
--- a/buildroot-external/board/hardkernel/odroid-c4/cmdline.txt
+++ b/buildroot-external/board/hardkernel/odroid-c4/cmdline.txt
@ -1 +1 @@
-console=ttyAML0,115200n8 console=tty0
+console=tty0 console=ttyAML0,115200n8
--- a/buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh
@ -3,6 +3,8 @@

 function hassos_pre_image() {
    local BOOT_DATA="$(path_boot_dir)"
+    local UBOOT_SM1="${BINARIES_DIR}/u-boot.sm1"
+    local SPL_IMG="$(path_spl_img)"

    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
    cp "${BINARIES_DIR}/meson-sm1-odroid-c4.dtb" "${BOOT_DATA}/meson-sm1-odroid-c4.dtb"
@ -11,6 +13,11 @@ function hassos_pre_image() {
    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+
+    # SPL
+    create_spl_image
+
+    dd if="${UBOOT_SM1}" of="${SPL_IMG}" conv=notrunc bs=512 seek=1
 }


--- a/buildroot-external/board/hardkernel/odroid-c4/image-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-c4/image-spl-spl.cfg
@ -1,13 +0,0 @@
-image spl.img {
-	size = ${BOOT_SPL_SIZE}
-
-	hdimage {
-		partition-table-type = "none"
-		fill = "yes"
-	}
-
-	partition uboot {
-		offset = 512
-		image = "u-boot.sm1"
-	}
-}
--- a/buildroot-external/board/hardkernel/odroid-c4/meta
+++ b/buildroot-external/board/hardkernel/odroid-c4/meta
@ -1,12 +1,10 @@
 BOARD_ID=odroid-c4
-BOARD_NAME="Hardkernel ODROID-C4"
+BOARD_NAME="Hardkernel Odroid-C4"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-PARTITION_TABLE_TYPE=mbr
-BOOT_SIZE=24M
+BOOT_SYS=mbr
 BOOT_SPL=true
-BOOT_SPL_SIZE=8M
 BOOT_ENV_SIZE=0x2000
 SUPERVISOR_MACHINE=odroid-c4
 SUPERVISOR_ARCH=aarch64
--- a/buildroot-external/board/hardkernel/odroid-c4/partition-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-c4/partition-spl-spl.cfg
@ -1,7 +0,0 @@
-partition spl {
-	size = ${BOOT_SPL_SIZE}
-	image = "spl.img"
-	in-partition-table = "no"
-	offset = 0
-	holes = {"(0; 512)"}
-}
--- a/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush
@ -18,15 +18,12 @@ test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
 test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

-# Allows ConditionFirstBoot=
-test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
-
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u"

 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"

 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
--- a/buildroot-external/board/hardkernel/odroid-m1/boot-env.txt
+++ b/buildroot-external/board/hardkernel/odroid-m1/boot-env.txt
--- a/buildroot-external/board/hardkernel/odroid-m1/cmdline.txt
+++ b/buildroot-external/board/hardkernel/odroid-m1/cmdline.txt
@ -1 +0,0 @@
-console=tty0
--- a/buildroot-external/board/hardkernel/odroid-m1/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-m1/hassos-hook.sh
@ -1,18 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-
-    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
-    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
-
-    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
-    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_xz
-}
-
--- a/buildroot-external/board/hardkernel/odroid-m1/image-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-m1/image-spl-spl.cfg
@ -1,13 +0,0 @@
-image spl.img {
-	size = ${BOOT_SPL_SIZE}
-
-	hdimage {
-		partition-table-type = "none"
-		fill = "yes"
-	}
-
-	partition uboot {
-		offset = 32k
-		image = "u-boot-rockchip.bin"
-	}
-}
--- a/buildroot-external/board/hardkernel/odroid-m1/kernel.config
+++ b/buildroot-external/board/hardkernel/odroid-m1/kernel.config
@ -1,12 +0,0 @@
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_SENSORS_GPIO_FAN=y
-
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
-
-CONFIG_MMC_SDHCI_OF_DWCMSHC=y
-
-# CONFIG_DW_WATCHDOG is not set
--- a/buildroot-external/board/hardkernel/odroid-m1/meta
+++ b/buildroot-external/board/hardkernel/odroid-m1/meta
@ -1,12 +0,0 @@
-BOARD_ID=odroid-m1
-BOARD_NAME="Hardkernel ODROID-M1"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=Image
-PARTITION_TABLE_TYPE=hybrid
-BOOT_SIZE=16M
-BOOT_SPL=true
-BOOT_SPL_SIZE=16M
-BOOT_ENV_SIZE=0x8000
-SUPERVISOR_MACHINE=odroid-m1
-SUPERVISOR_ARCH=aarch64
--- a/buildroot-external/board/hardkernel/odroid-m1/partition-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-m1/partition-spl-spl.cfg
@ -1,17 +0,0 @@
-partition spl {
-	size = ${BOOT_SPL_SIZE}
-	image = "spl.img"
-	in-partition-table = "no"
-	offset = 0
-	holes = {"(0; 17k)", "(8M; 16M)"}
-}
-
-partition uboot {
-	size = 8M
-	offset = 8M
-	# FIXME: hdd-image intended to use the following, but the next one
-	# is in the img because of the _fix_disk_spl_gpt function
-	# partition-type-uuid = "21686148-6449-6e6f-744e-656564454649"
-	partition-type-uuid = "e3c9e316-0b5c-4db8-817d-f92df00215ae"
-	# no image here - already contains data from spl.img
-}
--- a/buildroot-external/board/hardkernel/odroid-m1/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-m1/uboot-boot.ush
@ -1,98 +0,0 @@
-part start ${devtype} ${devnum} hassos-bootstate mmc_env
-${devtype} dev ${devnum}
-
-setenv loadbootstate " \
-    echo 'loading env...'; \
-    ${devtype} read ${ramdisk_addr_r} ${mmc_env} 0x40; \
-    env import -c ${ramdisk_addr_r} 0x8000;"
-
-setenv storebootstate " \
-    echo 'storing env...'; \
-    env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
-    ${devtype} write ${ramdisk_addr_r} ${mmc_env} 0x40;"
-
-run loadbootstate
-test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
-test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
-test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
-
-# Allows ConditionFirstBoot=
-test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
-
-# HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
-
-# HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
-
-part number ${devtype} ${devnum} hassos-boot boot_partnum
-
-# Load environment from haos-config.txt
-if test -e ${devtype} ${devnum}:${boot_partnum} haos-config.txt; then
-  fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} haos-config.txt
-  env import -t ${ramdisk_addr_r} ${filesize}
-fi
-
-# Load extraargs
-fileenv ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} cmdline.txt cmdline
-
-# Load device tree
-setenv fdtfile rk3568-odroid-m1.dtb
-echo "Loading standard device tree ${fdtfile}"
-fatload ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
-fdt addr ${fdt_addr_r}
-
-# load dt overlays
-fdt resize 65536
-for overlay_file in ${overlays}; do
-  if fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
-    echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
-    fdt apply ${ramdisk_addr_r} || setenv overlay_error "true"
-  fi
-done
-if test "${overlay_error}" = "true"; then
-  echo "Error applying DT overlays, restoring original DT"
-  fatload ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
-fi
-
-setenv bootargs
-for BOOT_SLOT in "${BOOT_ORDER}"; do
-  if test "x${bootargs}" != "x"; then
-    # skip remaining slots
-  elif test "x${BOOT_SLOT}" = "xA"; then
-    if test ${BOOT_A_LEFT} -gt 0; then
-      setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
-      echo "Trying to boot slot A, ${BOOT_A_LEFT} attempts remaining. Loading kernel ..."
-      part number ${devtype} ${devnum} hassos-kernel0 kernel_partnum
-      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
-      fi
-    fi
-  elif test "x${BOOT_SLOT}" = "xB"; then
-    if test ${BOOT_B_LEFT} -gt 0; then
-      setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
-      echo "Trying to boot slot B, ${BOOT_B_LEFT} attempts remaining. Loading kernel ..."
-      part number ${devtype} ${devnum} hassos-kernel1 kernel_partnum
-      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
-      fi
-    fi
-  fi
-done
-
-if test -n "${bootargs}"; then
-  run storebootstate
-else
-  echo "No valid slot found, resetting tries to 3"
-  setenv BOOT_A_LEFT 3
-  setenv BOOT_B_LEFT 3
-  run storebootstate
-  reset
-fi
-
-echo "Starting kernel"
-booti ${kernel_addr_r} - ${fdt_addr_r}
-
-echo "Boot failed, resetting..."
-reset
--- a/buildroot-external/board/hardkernel/odroid-m1/uboot.config
+++ b/buildroot-external/board/hardkernel/odroid-m1/uboot.config
@ -1,2 +0,0 @@
-# CONFIG_DWC_ETH_QOS is not set
-# CONFIG_DWC_ETH_QOS_ROCKCHIP is not set
--- a/buildroot-external/board/hardkernel/odroid-m1s/boot-env.txt
+++ b/buildroot-external/board/hardkernel/odroid-m1s/boot-env.txt
--- a/buildroot-external/board/hardkernel/odroid-m1s/cmdline.txt
+++ b/buildroot-external/board/hardkernel/odroid-m1s/cmdline.txt
@ -1 +0,0 @@
-console=tty0
--- a/buildroot-external/board/hardkernel/odroid-m1s/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-m1s/hassos-hook.sh
@ -1,18 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-
-    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
-    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
-
-    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
-    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_xz
-}
-
--- a/buildroot-external/board/hardkernel/odroid-m1s/image-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-m1s/image-spl-spl.cfg
@ -1,13 +0,0 @@
-image spl.img {
-	size = ${BOOT_SPL_SIZE}
-
-	hdimage {
-		partition-table-type = "none"
-		fill = "yes"
-	}
-
-	partition uboot {
-		offset = 32k
-		image = "u-boot-rockchip.bin"
-	}
-}
--- a/buildroot-external/board/hardkernel/odroid-m1s/kernel.config
+++ b/buildroot-external/board/hardkernel/odroid-m1s/kernel.config
@ -1,12 +0,0 @@
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_SENSORS_GPIO_FAN=y
-
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
-
-CONFIG_MMC_SDHCI_OF_DWCMSHC=y
-
-# CONFIG_DW_WATCHDOG is not set
--- a/buildroot-external/board/hardkernel/odroid-m1s/meta
+++ b/buildroot-external/board/hardkernel/odroid-m1s/meta
@ -1,12 +0,0 @@
-BOARD_ID=odroid-m1s
-BOARD_NAME="Hardkernel ODROID-M1S"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=Image
-PARTITION_TABLE_TYPE=hybrid
-BOOT_SIZE=16M
-BOOT_SPL=true
-BOOT_SPL_SIZE=16M
-BOOT_ENV_SIZE=0x8000
-SUPERVISOR_MACHINE=odroid-m1
-SUPERVISOR_ARCH=aarch64
--- a/buildroot-external/board/hardkernel/odroid-m1s/partition-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-m1s/partition-spl-spl.cfg
@ -1,17 +0,0 @@
-partition spl {
-	size = ${BOOT_SPL_SIZE}
-	image = "spl.img"
-	in-partition-table = "no"
-	offset = 0
-	holes = {"(0; 17k)", "(8M; 16M)"}
-}
-
-partition uboot {
-	size = 8M
-	offset = 8M
-	# FIXME: hdd-image intended to use the following, but the next one
-	# is in the img because of the _fix_disk_spl_gpt function
-	# partition-type-uuid = "21686148-6449-6e6f-744e-656564454649"
-	partition-type-uuid = "e3c9e316-0b5c-4db8-817d-f92df00215ae"
-	# no image here - already contains data from spl.img
-}
--- a/buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0001-arm64-dts-rockchip-Enable-Rockchip-TRNG-on-ODROID-M1.patch
+++ b/buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0001-arm64-dts-rockchip-Enable-Rockchip-TRNG-on-ODROID-M1.patch
@ -1,32 +0,0 @@
-From 60b24f8c30181ef60964ce186c2a6d05b85f3be1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Fri, 31 Jan 2025 16:13:48 +0100
-Subject: [PATCH] arm64: dts: rockchip: Enable Rockchip TRNG on ODROID-M1S
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-HAOS with 6.6 kernel had the RNG disbled because of a downstream patch. Now the
-rk356x.dtsi has it's enabled only in rk3568.dtsi. We want it enabled also for
-RK3566 on ODROID-M1S.
-
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
---
- arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-index 33bc5249d729b..a0d912b5ce4aa 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -551,6 +551,10 @@ &pmu_io_domains {
- 	status = "okay";
- };
- 
-+&rng {
-+	status = "okay";
-+};
-+
- &saradc {
- 	vref-supply = <&vcca_1v8>;
- 	status = "okay";
--- a/buildroot-external/board/hardkernel/odroid-m1s/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-m1s/uboot-boot.ush
@ -1,98 +0,0 @@
-part start ${devtype} ${devnum} hassos-bootstate mmc_env
-${devtype} dev ${devnum}
-
-setenv loadbootstate " \
-    echo 'loading env...'; \
-    ${devtype} read ${ramdisk_addr_r} ${mmc_env} 0x40; \
-    env import -c ${ramdisk_addr_r} 0x8000;"
-
-setenv storebootstate " \
-    echo 'storing env...'; \
-    env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
-    ${devtype} write ${ramdisk_addr_r} ${mmc_env} 0x40;"
-
-run loadbootstate
-test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
-test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
-test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
-
-# Allows ConditionFirstBoot=
-test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
-
-# HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
-
-# HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
-
-part number ${devtype} ${devnum} hassos-boot boot_partnum
-
-# Load environment from haos-config.txt
-if test -e ${devtype} ${devnum}:${boot_partnum} haos-config.txt; then
-  fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} haos-config.txt
-  env import -t ${ramdisk_addr_r} ${filesize}
-fi
-
-# Load extraargs
-fileenv ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} cmdline.txt cmdline
-
-# Load device tree
-setenv fdtfile rk3566-odroid-m1s.dtb
-echo "Loading standard device tree ${fdtfile}"
-fatload ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
-fdt addr ${fdt_addr_r}
-
-# load dt overlays
-fdt resize 65536
-for overlay_file in ${overlays}; do
-  if fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
-    echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
-    fdt apply ${ramdisk_addr_r} || setenv overlay_error "true"
-  fi
-done
-if test "${overlay_error}" = "true"; then
-  echo "Error applying DT overlays, restoring original DT"
-  fatload ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
-fi
-
-setenv bootargs
-for BOOT_SLOT in "${BOOT_ORDER}"; do
-  if test "x${bootargs}" != "x"; then
-    # skip remaining slots
-  elif test "x${BOOT_SLOT}" = "xA"; then
-    if test ${BOOT_A_LEFT} -gt 0; then
-      setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
-      echo "Trying to boot slot A, ${BOOT_A_LEFT} attempts remaining. Loading kernel ..."
-      part number ${devtype} ${devnum} hassos-kernel0 kernel_partnum
-      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
-      fi
-    fi
-  elif test "x${BOOT_SLOT}" = "xB"; then
-    if test ${BOOT_B_LEFT} -gt 0; then
-      setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
-      echo "Trying to boot slot B, ${BOOT_B_LEFT} attempts remaining. Loading kernel ..."
-      part number ${devtype} ${devnum} hassos-kernel1 kernel_partnum
-      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
-          setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
-      fi
-    fi
-  fi
-done
-
-if test -n "${bootargs}"; then
-  run storebootstate
-else
-  echo "No valid slot found, resetting tries to 3"
-  setenv BOOT_A_LEFT 3
-  setenv BOOT_B_LEFT 3
-  run storebootstate
-  reset
-fi
-
-echo "Starting kernel"
-booti ${kernel_addr_r} - ${fdt_addr_r}
-
-echo "Boot failed, resetting..."
-reset
--- a/buildroot-external/board/hardkernel/odroid-m1s/uboot.config
+++ b/buildroot-external/board/hardkernel/odroid-m1s/uboot.config
@ -1 +0,0 @@
-
--- a/buildroot-external/board/hardkernel/odroid-n2/cmdline.txt
+++ b/buildroot-external/board/hardkernel/odroid-n2/cmdline.txt
@ -1 +1 @@
-console=ttyAML0,115200n8 console=tty0
+console=tty0 console=ttyAML0,115200n8
--- a/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh
@ -3,6 +3,8 @@

 function hassos_pre_image() {
    local BOOT_DATA="$(path_boot_dir)"
+    local UBOOT_G12B="${BINARIES_DIR}/u-boot.g12b"
+    local SPL_IMG="$(path_spl_img)"

    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
@ -11,6 +13,11 @@ function hassos_pre_image() {
    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+
+    # SPL
+    create_spl_image
+
+	dd if="${UBOOT_G12B}" of="${SPL_IMG}" conv=notrunc bs=512 seek=1
 }


--- a/buildroot-external/board/hardkernel/odroid-n2/image-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-n2/image-spl-spl.cfg
@ -1,13 +0,0 @@
-image spl.img {
-	size = ${BOOT_SPL_SIZE}
-
-	hdimage {
-		partition-table-type = "none"
-		fill = "yes"
-	}
-
-	partition uboot {
-		offset = 512
-		image = "u-boot.g12b"
-	}
-}
--- a/buildroot-external/board/hardkernel/odroid-n2/kernel.config
+++ b/buildroot-external/board/hardkernel/odroid-n2/kernel.config
@ -1,4 +1,3 @@
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

 CONFIG_THERMAL_GOV_BANG_BANG=y
--- a/buildroot-external/board/hardkernel/odroid-n2/meta
+++ b/buildroot-external/board/hardkernel/odroid-n2/meta
@ -1,12 +1,10 @@
 BOARD_ID=odroid-n2
-BOARD_NAME="Hardkernel ODROID-N2"
+BOARD_NAME="Hardkernel Odroid-N2"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-PARTITION_TABLE_TYPE=mbr
-BOOT_SIZE=24M
+BOOT_SYS=mbr
 BOOT_SPL=true
-BOOT_SPL_SIZE=8M
 BOOT_ENV_SIZE=0x2000
 SUPERVISOR_MACHINE=odroid-n2
 SUPERVISOR_ARCH=aarch64
--- a/buildroot-external/board/hardkernel/odroid-n2/partition-spl-spl.cfg
+++ b/buildroot-external/board/hardkernel/odroid-n2/partition-spl-spl.cfg
@ -1,7 +0,0 @@
-partition spl {
-	size = ${BOOT_SPL_SIZE}
-	image = "spl.img"
-	in-partition-table = "no"
-	offset = 0
-	holes = {"(0; 512)"}
-}
--- a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
@ -18,15 +18,12 @@ test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
 test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

-# Allows ConditionFirstBoot=
-test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"
-
 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} fsck.repair=yes"

 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"

 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then
--- a/buildroot-external/board/hardkernel/odroid-xu4/cmdline.txt
+++ b/buildroot-external/board/hardkernel/odroid-xu4/cmdline.txt
@ -1 +1 @@
-console=ttySAC2,115200 console=tty0
+console=tty1 console=ttySAC2,115200
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stefan Agner	c473e3be71	Bump version to 9.4	2022-12-01 09:25:53 +01:00
Stefan Agner	9546acdea3	Bump buildroot (#2253 ) * buildroot 54eff73a8f...80bb9553ec (1): > Merge tag '2022.02.7' into 2022.02.x-haos	2022-12-01 09:25:46 +01:00
Stefan Agner	85ede0804a	Enable experimental APIs for Bluetooth daemon (#2251 ) To get access to the experimental advertisement monitor api experimental mode is required. This eanbles the experimental D-Bus API by default. See also: https://github.com/hbldh/bleak/pull/884	2022-11-30 10:31:55 +01:00
Stefan Agner	bfd2943ac6	Use iptables with NFT backend (#2250 ) * Bump buildroot * buildroot 215e54fe41...54eff73a8f (1): > package/iptables: Allow to use iptables with nf_tables backend * Use iptables with NFT backend	2022-11-30 10:31:46 +01:00
Stefan Agner	033a2edc41	Linux: Update kernel 5.15.80 (#2249 ) * Linux: Update kernel 5.15.80 * Drop unnecessary patch	2022-11-30 10:31:46 +01:00
Stefan Agner	340ebdab15	Decrease network size of Docker default bridge (#2246 )	2022-11-30 10:31:46 +01:00
Stefan Agner	1358593396	Bump Raspberry Pi kernel and firmware to 1.20221104 (#2178 ) (#2236 ) * Bump buildroot * buildroot 48c0c35f09...215e54fe41 (1): > package/rpi-firmware: bump version to 1.20221104 * RaspberryPi: Update kernel 5.15.76 - 1.20221104	2022-11-30 10:28:36 +01:00
Stefan Agner	77ba5b1a51	Linux: Update kernel 5.15.79 (#2233 )	2022-11-30 10:28:30 +01:00
Stefan Agner	14f0ecceb0	Disable CONFIG_FW_LOADER_USER_HELPER(/_FALLBACK) (#2222 ) (#2229 ) This slows down firmware loading which causes Bluetooth initialization to delay unecessarily.	2022-11-30 10:28:29 +01:00
Lasse Bang Mikkelsen	d13d193b15	Add QEMU Guest Agent to generic_aarch64 target (#2213 ) This is to allow graceful shutdown when run as QEMU VM.	2022-11-30 10:27:07 +01:00
Stefan Agner	bad2fbb76a	Enable Intel specific CPU idle driver (#2209 )	2022-11-30 10:25:13 +01:00
Stefan Agner	1ca81bf1ee	Add fq_codel network packet scheduler algorithm by default (#2203 ) The fq_codel network scheduler is the de-facto standard nowadays in most distros. Systemd enables the scheduler by default if available. Make sure all boards have the necessary kernel module activated.	2022-11-30 10:24:46 +01:00
Stefan Agner	c1e4758399	Bump version to 9.3	2022-10-20 23:14:20 +02:00
Stefan Agner	7eed8d594f	Bump buildroot (#2199 ) * buildroot 8c952a2d00...48c0c35f09 (1): > boot/grub2: fix GRUB2 patch merge error	2022-10-20 21:49:39 +02:00
Stefan Agner	a9f4399a62	Bump buildroot (#2198 ) * buildroot 325737ba29...8c952a2d00 (2): > package/containerd: bump to version 1.6.8 > Merge tag '2022.02.6' into 2022.02.x-haos	2022-10-20 21:49:39 +02:00
Stefan Agner	925aea5e2c	Bump buildroot (#2195 ) * buildroot 5468d36a26...325737ba29 (1): > package/openvmtools: fix local privilege escalation vulnerability	2022-10-20 14:47:30 +02:00
Stefan Agner	77898b30f9	Fix S-ATA on ODROID-HC1 (#2194 ) The ODROID-XU4 is largely compatible with the ODROID-HC1. It seems that the image used to work until recently, where a stable kernel update broke access to the S-ATA disk. Revert the offending stable kernel patch to fix S-ATA disk on ODROID-HC1.	2022-10-20 14:47:25 +02:00
Stefan Agner	3b8d6886f8	Linux: Update kernel 5.15.74 (#2191 )	2022-10-20 14:47:08 +02:00
Stefan Agner	98a9c96834	Bump version to 9.2	2022-10-07 10:11:25 +02:00
Stefan Agner	95c9a28ed0	Revert "Fix proxmox mem hotplug/improve virtual hw support (#2138 )" This reverts commit ad1befbe07bae58d4c68293209f8eb35637c0a6f.	2022-10-07 10:10:34 +02:00
Stefan Agner	e3cd6e8a82	Bump version to 9.1	2022-10-06 23:58:51 +02:00
Stefan Agner	f25a44160a	Yellow: Support wipeing boot files on NVMe (#2173 )	2022-10-06 23:57:57 +02:00
Stefan Agner	e1236751b6	Linux: Update kernel 5.15.72 (#2171 )	2022-10-06 23:57:18 +02:00
Pascal Vizeli	1219e80a3d	Streamline CONFIG_RT_GROUP_SCHED (#2169 ) * Disable RT_GROUP_SCHED	2022-10-06 23:55:33 +02:00
Stefan Agner	81874b61d3	Remove HDMI fix applied in Linux 5.15.68 (#2166 )	2022-10-06 23:55:27 +02:00
Carsten Hiort	5b478090a7	Allow multicast forwarding for IPv4 (#2160 ) * Allow multicast forwarding for IPv4 * Move MCast fordwarding to seperate group * Remove whitespace	2022-10-06 23:54:01 +02:00
Pascal Vizeli	371ab7520e	Add OS-Agent 1.4.1 support (#2157 ) * Add OS-Agent 1.4.0 support * Update OS-Agent 1.4.1	2022-10-06 23:53:46 +02:00
ioctl2	ad1befbe07	Fix proxmox mem hotplug/improve virtual hw support (#2138 )	2022-10-06 23:52:33 +02:00
Stefan Agner	f1beaa5669	Set deployment type to production	2022-09-13 14:32:14 +02:00
Stefan Agner	7da1cdf074	Backport patch to fix ODROID-N2 HDMI (#2128 )	2022-09-13 14:24:35 +02:00
Mike Degatano	a2d1cae069	Connectivity check interval to 10 minutes (#2127 )	2022-09-13 14:24:35 +02:00
Stefan Agner	a85d1959ec	Linux: Update kernel 5.15.67 (#2126 )	2022-09-13 14:24:35 +02:00
Stefan Agner	78b5aeb82d	Fix Docker key.json corruption check (#2125 ) * Fix Docker key.json corruption check Since /etc/docker does not get bind mounted anymore (see #2116), key.json from the overlay partition is used directly. * Use -e flag for jq to get useful exit code	2022-09-13 14:24:35 +02:00
Stefan Agner	cdf1110f42	Drop unused cgroup_enable=memory kernel parameter (#2124 ) The cgroup_enable parameter is a Raspberry Pi kernel specific kernel parameter. Upstream based kernel do not have the parameter, and hence do not do anything. This gets rid of the following message during boot: Unknown kernel command line parameters "cgroup_enable=memory", will be passed to user space.	2022-09-13 14:24:35 +02:00
Stefan Agner	5a3aaa46f4	Add Qualcomm QCA6174/QCA6174A Bluetooth support (#2122 ) (#2123 ) * Add Qualcomm QCA6174/QCA6174A Bluetooth support (#2122)	2022-09-13 14:24:34 +02:00
Stefan Agner	786dd75a15	Remvoe image name from journald tag/identifier (#2118 ) The image name is stored in a separate field IMAGE_NAME as well. This allows to use the container name (e.g. `hassio_supervisor`) to get logs of all Supervisors independent of the image name (which differs for every version).	2022-09-08 12:20:37 +02:00
Stefan Agner	b614ceb2ba	Bump Raspberry Pi kernel and firmware to 1.20220830 (#2117 ) * RaspberryPi: Update kernel 5.15.61 - 1.20220830 * Add Yellow to the Raspberry Pi kernel update script * Bump Yellow to kernel 5.15.61 - 1.20220830 Also drop the work around for the LED polarity as the new firmware has been fixed. * Explicitly select no kernel module compression Home Assistant OS uses a compressed rootfs already, no compression for kernel modules necessary. * Bump buildroot * buildroot d7e4c223e5...5468d36a26 (1): > package/rpi-firmware: bump version to 1.20220830	2022-09-08 12:00:23 +02:00
Stefan Agner	366087cf97	Move Docker configuration to daemon.json (#2116 ) This is more readable than passing arguments to the daemon directly. It also shortens the ExecStart command significantly, which is stored in every log entry in systemd-journald.	2022-09-08 12:00:23 +02:00
Stefan Agner	c63968dfc0	Linux: Update kernel 5.15.65 (#2114 )	2022-09-08 12:00:23 +02:00
Stefan Agner	ba64be61b3	Try using old image name of the Supervisor image (#2111 ) (#2113 ) * Try using old image name of the Supervisor image * Tag the old image with the new name so recreation works	2022-09-08 12:00:23 +02:00
Stefan Agner	2726547bf6	Try booting up to 3 times on GRUB2 based systems (#2112 ) * Retry up to 3 times By default, HAOS used to retry 3 times. That is still true for U-Boot based boards. Apply the same logic for GRUB2 based systems for consistency. This can help to remedy intermittent internet/connectivity issuese. Altough hacky, in practise it makes sense to give the newly installed OS another go. * Also apply to generic-aarch64	2022-09-08 12:00:23 +02:00
Stefan Agner	ddd472896a	Bump buildroot (#2109 ) * buildroot 9dbf8d5e86...d7e4c223e5 (1): > Merge tag '2022.02.5' into 2022.02.x-haos	2022-09-08 12:00:20 +02:00