Merge branch 'dev' into kernel

README.md

@@ -109,8 +109,8 @@ main SkiffOS repository:
 | [RockPro64]           | [pine64/rockpro64]        | ✔ U-Boot (bin)   | ✔ megi-6.6-pre  |
 | [Sipeed LicheeRV]     | [allwinner/licheerv]      | ✔ U-Boot 2022.07 | ✔ sm-5.19-rc1   |
 | [VisionFive]          | [starfive/visionfive]     | ✔ U-Boot 2021.04 | ✔ sv-5.19-rc3   |
-| [VisionFive2] v1.2    | [starfive/visionfive2_12] | ✔ U-Boot 2021.10 | ✔ 6.10.7        |
-| [VisionFive2] v1.3    | [starfive/visionfive2]    | ✔ U-Boot 2021.10 | ✔ 6.10.7        |
+| [VisionFive2] v1.2    | [starfive/visionfive2_12] | ✔ U-Boot 2024.07 | ✔ 6.10.7        |
+| [VisionFive2] v1.3    | [starfive/visionfive2]    | ✔ U-Boot 2024.07 | ✔ 6.10.7        |
 | [USBArmory Mk2]       | [usbarmory/mk2]           | ✔ U-Boot 2020.10 | ✔ 6.10.7        |
 | Valve [Steam Deck]    | [valve/deck]              | N/A              | ✔ valve-6.5.0   |
 | [Wandboard]           | [freescale/wandboard]     | ✔ U-Boot 2022.04 | ✔ 6.10.7        |

configs/starfive/visionfive2/buildroot/firmware

@@ -0,0 +1,8 @@
+BR2_TARGET_OPENSBI=y
+BR2_TARGET_OPENSBI_PLAT="generic"
+# BR2_TARGET_OPENSBI_UBOOT_PAYLOAD is not set
+BR2_TARGET_OPENSBI_FW_FDT_PATH=y
+# BR2_TARGET_OPENSBI_CUSTOM_TARBALL is not set
+BR2_TARGET_OPENSBI_LATEST_VERSION=y
+BR2_TARGET_OPENSBI_INSTALL_DYNAMIC_IMG=y
+BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG=y

configs/starfive/visionfive2/buildroot/uboot

@@ -1,13 +1,7 @@
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-
-# BR2_TARGET_UBOOT_LATEST_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-
-# branch: JH7110_VisionFive2_devel
-# source: https://github.com/starfive-tech/u-boot/tree/JH7110_VisionFive2_devel
-# 59cf9af678dbfa3d73f6cb86ed1ae7219da9f5c9
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,u-boot,ac0ac696256abf412826d74ee918dd417e207d7b)/u-boot-visionfive2-ac0ac6-r2.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
 
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2"
 
@@ -21,4 +15,4 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y
 # BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS is not set
 # BR2_TARGET_UBOOT_NEEDS_OPENSSL is not set
 # BR2_TARGET_UBOOT_NEEDS_LZOP is not set
-# BR2_TARGET_UBOOT_NEEDS_OPENSBI is not set
+BR2_TARGET_UBOOT_NEEDS_OPENSBI=y

configs/virt/incus/extensions/Makefile

@@ -1,5 +1,5 @@
 buildimage:
-	@$(SKIFF_CURRENT_CONF_DIR)/scripts/buildimage.sh
+	@FAKEROOTDONTTRYCHOWN=1 ${BUILDROOT_DIR}/host/bin/fakeroot -- $(SKIFF_CURRENT_CONF_DIR)/scripts/buildimage.sh
 run:
 	@$(SKIFF_CURRENT_CONF_DIR)/scripts/run.sh
 exec:

configs/virt/incus/scripts/buildimage.sh

@@ -1,16 +1,13 @@
 #!/bin/bash
 set -eu
 
-IMAGE_NAME=skiffos/testing
-CONTAINER=skiff
-OUTPUT_PATH="$BUILDROOT_DIR/output"
 IMAGES_PATH="$BUILDROOT_DIR/images"
 INCUS_IMAGE_PATH="${IMAGES_PATH}/incus.tar.gz"
 roottar="${IMAGES_PATH}/rootfs.tar"
 
 TMPDIR="${BUILDROOT_DIR}/incus-tmp"
-trap 'rm -rf "$TMPDIR";' EXIT
 rm -rf "$TMPDIR"
+trap 'rm -rf "$TMPDIR";' EXIT
 mkdir -p "${TMPDIR}/rootfs"
 tar -xf "$roottar" -C "$TMPDIR/rootfs"
 pushd "$TMPDIR"
@@ -25,4 +22,4 @@ echo "${INCUS_METADATA:-"${default_metadata}"}" >"${TMPDIR}/metadata.yaml"
 tar caf "${INCUS_IMAGE_PATH}" rootfs metadata.yaml
 popd
 
-echo "Incus image generated successfully as ${IMAGE_NAME}"
+echo "Incus image generated successfully at ${INCUS_IMAGE_PATH}"