home-assistant · sairon · Jun 18, 2024 · Apr 26, 2024 · Apr 26, 2024 · Apr 26, 2024
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -23,6 +23,7 @@ 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)
@@ -59,10 +60,21 @@ body:
     validations:
       required: true
     attributes:
-      label: Did you upgrade the Operating System.
+      label: Did the problem occur after upgrading the Operating System?
+      default: 0
       options:
-        - "Yes"
         - "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.
   - type: textarea
     validations:
       required: true

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -138,13 +138,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.3.0
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
             registry: ghcr.io
             username: ${{ github.repository_owner }}
             password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v5.4.0
         id: build_haos_builder
         with:
           context: .

diff --git a/Documentation/kernel.md b/Documentation/kernel.md
@@ -5,22 +5,22 @@ Default Kernel tree: 6.1
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 6.6.29 |
-| Raspberry Pi | 6.6.28 |
-| Raspberry Pi 0-W | 6.6.28 |
-| Raspberry Pi 2 | 6.6.28 |
-| Raspberry Pi 3 | 6.6.28 |
-| Raspberry Pi 4 | 6.6.28 |
-| Raspberry Pi 5 | 6.6.28 |
-| Home Assistant Yellow | 6.6.28 |
-| Home Assistant Green | 6.6.29 |
-| Tinker Board | 6.6.29 |
-| ODROID-C2 | 6.6.29 |
-| ODROID-C4 | 6.6.29 |
-| ODROID-M1 | 6.6.29 |
-| ODROID-M1S | 6.6.29 |
-| ODROID-N2 | 6.6.29 |
-| ODROID-XU4 | 6.6.29 |
-| Generic aarch64 | 6.6.29 |
-| Generic x86-64 | 6.6.29 |
-| Khadas VIM3 | 6.6.29 |
+| Open Virtual Appliance | 6.6.33 |
+| Raspberry Pi | 6.6.31 |
+| Raspberry Pi 0-W | 6.6.31 |
+| Raspberry Pi 2 | 6.6.31 |
+| Raspberry Pi 3 | 6.6.31 |
+| Raspberry Pi 4 | 6.6.31 |
+| Raspberry Pi 5 | 6.6.31 |
+| Home Assistant Yellow | 6.6.31 |
+| Home Assistant Green | 6.6.33 |
+| Tinker Board | 6.6.33 |
+| ODROID-C2 | 6.6.33 |
+| ODROID-C4 | 6.6.33 |
+| ODROID-M1 | 6.6.33 |
+| ODROID-M1S | 6.6.33 |
+| ODROID-N2 | 6.6.33 |
+| ODROID-XU4 | 6.6.33 |
+| Generic aarch64 | 6.6.33 |
+| Generic x86-64 | 6.6.33 |
+| Khadas VIM3 | 6.6.33 |
diff --git a/buildroot b/buildroot
diff --git a/buildroot-external/board/arm-uefi/generic-aarch64/cmdline.txt b/buildroot-external/board/arm-uefi/generic-aarch64/cmdline.txt
@@ -1 +1 @@
-console=tty1 console=ttyS0
+console=ttyS0 console=tty0
diff --git a/buildroot-external/board/arm-uefi/generic-aarch64/meta b/buildroot-external/board/arm-uefi/generic-aarch64/meta
@@ -3,9 +3,9 @@ BOARD_NAME="Generic aarch64"
 CHASSIS=embedded
 BOOTLOADER=grub
 KERNEL_FILE=Image
-BOOT_SYS=efi
+PARTITION_TABLE_TYPE=gpt
 BOOT_SIZE=32M
 BOOT_SPL=false
-DISK_SIZE=6
+DISK_SIZE=6G
 SUPERVISOR_MACHINE=qemuarm-64
 SUPERVISOR_ARCH=aarch64
diff --git a/buildroot-external/board/asus/hassos-hook.sh b/buildroot-external/board/asus/hassos-hook.sh
@@ -3,7 +3,6 @@
 
 function hassos_pre_image() {
     local BOOT_DATA="$(path_boot_dir)"
-    local SPL_IMG="$(path_spl_img)"
 
     cp -t "${BOOT_DATA}" \
         "${BINARIES_DIR}/boot.scr" \
@@ -13,13 +12,7 @@ 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"
-
-    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
-
-    # SPL
-    create_spl_image
-
-    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
 }
 
 

diff --git a/buildroot-external/board/asus/tinker/cmdline.txt b/buildroot-external/board/asus/tinker/cmdline.txt
@@ -0,0 +1 @@
+console=tty0
diff --git a/buildroot-external/board/asus/tinker/image-spl-spl.cfg b/buildroot-external/board/asus/tinker/image-spl-spl.cfg
@@ -0,0 +1,13 @@
+image spl.img {
+	size = ${BOOT_SPL_SIZE}
+
+	hdimage {
+		partition-table-type = "none"
+		fill = "yes"
+	}
+
+	partition uboot {
+		offset = 32k
+		image = "u-boot-rockchip.bin"
+	}
+}
diff --git a/buildroot-external/board/asus/tinker/meta b/buildroot-external/board/asus/tinker/meta
@@ -3,7 +3,7 @@ BOARD_NAME="Asus TinkerBoard"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=hybrid
+PARTITION_TABLE_TYPE=hybrid
 BOOT_SIZE=24M
 BOOT_SPL=true
 BOOT_SPL_SIZE=8M

diff --git a/buildroot-external/board/asus/tinker/partition-spl-spl.cfg b/buildroot-external/board/asus/tinker/partition-spl-spl.cfg
@@ -0,0 +1,7 @@
+partition spl {
+	size = ${BOOT_SPL_SIZE}
+	image = "spl.img"
+	in-partition-table = "no"
+	offset = 0
+	holes = {"(0; 17k)"}
+}
diff --git a/buildroot-external/board/hardkernel/odroid-c2/cmdline.txt b/buildroot-external/board/hardkernel/odroid-c2/cmdline.txt
@@ -1 +1 @@
-console=tty0 console=ttyAML0,115200n8
+console=ttyAML0,115200n8 console=tty0
diff --git a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
@@ -3,9 +3,6 @@
 
 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"
@@ -14,13 +11,6 @@ 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
 }
 
 

diff --git a/buildroot-external/board/hardkernel/odroid-c2/image-spl-spl.cfg b/buildroot-external/board/hardkernel/odroid-c2/image-spl-spl.cfg
@@ -0,0 +1,20 @@
+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
+	}
+}
diff --git a/buildroot-external/board/hardkernel/odroid-c2/meta b/buildroot-external/board/hardkernel/odroid-c2/meta
@@ -3,7 +3,7 @@ BOARD_NAME="Hardkernel ODROID-C2"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-BOOT_SYS=mbr
+PARTITION_TABLE_TYPE=mbr
 BOOT_SIZE=24M
 BOOT_SPL=true
 BOOT_SPL_SIZE=8M

diff --git a/buildroot-external/board/hardkernel/odroid-c2/partition-spl-spl.cfg b/buildroot-external/board/hardkernel/odroid-c2/partition-spl-spl.cfg
@@ -0,0 +1,8 @@
+partition spl {
+	size = ${BOOT_SPL_SIZE}
+	image = "spl.img"
+	in-partition-table = "no"
+	offset = 0
+	holes = {"(440; 512)"}
+}
+
diff --git a/buildroot-external/board/hardkernel/odroid-c4/cmdline.txt b/buildroot-external/board/hardkernel/odroid-c4/cmdline.txt
@@ -1 +1 @@
-console=tty0 console=ttyAML0,115200n8
+console=ttyAML0,115200n8 console=tty0
diff --git a/buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh
@@ -3,8 +3,6 @@
 
 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"
@@ -13,11 +11,6 @@ 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
 }
 
 

diff --git a/buildroot-external/board/hardkernel/odroid-c4/image-spl-spl.cfg b/buildroot-external/board/hardkernel/odroid-c4/image-spl-spl.cfg
@@ -0,0 +1,13 @@
+image spl.img {
+	size = ${BOOT_SPL_SIZE}
+
+	hdimage {
+		partition-table-type = "none"
+		fill = "yes"
+	}
+
+	partition uboot {
+		offset = 512
+		image = "u-boot.sm1"
+	}
+}
diff --git a/buildroot-external/board/hardkernel/odroid-c4/meta b/buildroot-external/board/hardkernel/odroid-c4/meta
@@ -3,7 +3,7 @@ BOARD_NAME="Hardkernel ODROID-C4"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-BOOT_SYS=mbr
+PARTITION_TABLE_TYPE=mbr
 BOOT_SIZE=24M
 BOOT_SPL=true
 BOOT_SPL_SIZE=8M

diff --git a/buildroot-external/board/hardkernel/odroid-c4/partition-spl-spl.cfg b/buildroot-external/board/hardkernel/odroid-c4/partition-spl-spl.cfg
@@ -0,0 +1,7 @@
+partition spl {
+	size = ${BOOT_SPL_SIZE}
+	image = "spl.img"
+	in-partition-table = "no"
+	offset = 0
+	holes = {"(0; 512)"}
+}
diff --git a/buildroot-external/board/hardkernel/odroid-m1/cmdline.txt b/buildroot-external/board/hardkernel/odroid-m1/cmdline.txt
@@ -0,0 +1 @@
+console=tty0
diff --git a/buildroot-external/board/hardkernel/odroid-m1/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-m1/hassos-hook.sh
@@ -3,18 +3,12 @@
 
 function hassos_pre_image() {
     local BOOT_DATA="$(path_boot_dir)"
-    local SPL_IMG="$(path_spl_img)"
 
     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"
-
-    # SPL
-    create_spl_image
-
-    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
 }
 
 

diff --git a/buildroot-external/board/hardkernel/odroid-m1/image-spl-spl.cfg b/buildroot-external/board/hardkernel/odroid-m1/image-spl-spl.cfg
@@ -0,0 +1,13 @@
+image spl.img {
+	size = ${BOOT_SPL_SIZE}
+
+	hdimage {
+		partition-table-type = "none"
+		fill = "yes"
+	}
+
+	partition uboot {
+		offset = 32k
+		image = "u-boot-rockchip.bin"
+	}
+}
diff --git a/buildroot-external/board/hardkernel/odroid-m1/meta b/buildroot-external/board/hardkernel/odroid-m1/meta
@@ -3,7 +3,7 @@ BOARD_NAME="Hardkernel ODROID-M1"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-BOOT_SYS=gpt
+PARTITION_TABLE_TYPE=hybrid
 BOOT_SIZE=16M
 BOOT_SPL=true
 BOOT_SPL_SIZE=16M

diff --git a/buildroot-external/board/hardkernel/odroid-m1/partition-spl-spl.cfg b/buildroot-external/board/hardkernel/odroid-m1/partition-spl-spl.cfg
@@ -0,0 +1,17 @@
+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
+}
diff --git a/buildroot-external/board/hardkernel/odroid-m1s/cmdline.txt b/buildroot-external/board/hardkernel/odroid-m1s/cmdline.txt
@@ -0,0 +1 @@
+console=tty0
diff --git a/buildroot-external/board/hardkernel/odroid-m1s/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-m1s/hassos-hook.sh
@@ -3,18 +3,12 @@
 
 function hassos_pre_image() {
     local BOOT_DATA="$(path_boot_dir)"
-    local SPL_IMG="$(path_spl_img)"
 
     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"
-
-    # SPL
-    create_spl_image
-
-    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
 }
 
 

diff --git a/buildroot-external/board/hardkernel/odroid-m1s/image-spl-spl.cfg b/buildroot-external/board/hardkernel/odroid-m1s/image-spl-spl.cfg
@@ -0,0 +1,13 @@
+image spl.img {
+	size = ${BOOT_SPL_SIZE}
+
+	hdimage {
+		partition-table-type = "none"
+		fill = "yes"
+	}
+
+	partition uboot {
+		offset = 32k
+		image = "u-boot-rockchip.bin"
+	}
+}
diff --git a/buildroot-external/board/hardkernel/odroid-m1s/meta b/buildroot-external/board/hardkernel/odroid-m1s/meta
@@ -3,7 +3,7 @@ BOARD_NAME="Hardkernel ODROID-M1S"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-BOOT_SYS=gpt
+PARTITION_TABLE_TYPE=hybrid
 BOOT_SIZE=16M
 BOOT_SPL=true
 BOOT_SPL_SIZE=16M
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		console=tty1 console=ttyS0
		console=ttyS0 console=tty0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		console=tty0 console=ttyAML0,115200n8
		console=ttyAML0,115200n8 console=tty0