On Tue, Mar 11, 2025 at 03:27:04PM -0700, Vagrant Cascadian wrote:
>...
> This patch works for me with flash-kernel and u-boot-menu installed,
> with U_BOOT_SYNC_DTBS=true|false, but slightly changes the behavior of
> U_BOOT_SYNC_DTBS to put files in a different location.
>
> diff --git a/read-config b/read-config
> index d25edcc..8798d44 100644
> --- a/read-config
> +++ b/read-config
> @@ -47,7 +47,7 @@ then
> _BOOT_PATH="/boot"
> if [ "${U_BOOT_SYNC_DTBS}" = "true" ]
> then
> - _FDT_DIR="/dtb-"
> + _FDT_DIR="/dtbs/"
> fi
> else
> # / and /boot are on the same filesystem
> diff --git a/u-boot-update b/u-boot-update
> index 6b20e7f..4a35420 100755
> --- a/u-boot-update
> +++ b/u-boot-update
> @@ -142,7 +142,7 @@ do
> elif [ -d "${_BOOT_PATH}${U_BOOT_FDT_DIR}${_VERSION}/" ]
> then
> _FDT="fdtdir ${U_BOOT_FDT_DIR}${_VERSION}/"
> - elif [ -f "${_BOOT_PATH}/${U_BOOT_FDT:-dtb-${_VERSION}}" ] && [
> /usr/lib/linux-image- = "${U_BOOT_FDT_DIR}" ]
> + elif [ -f "${_BOOT_PATH}/${U_BOOT_FDT:-dtb-${_VERSION}}" ] # && [
> /usr/lib/linux-image- = "${U_BOOT_FDT_DIR}" ]
> then
> _FDT="fdt /${U_BOOT_FDT:-dtb-${_VERSION}}"
> else
>
> I am not sure if the /usr/lib/linux-image- check is guarding anything
> important for other use-cases...
>
>
> I have not yet checked behavior when /boot and / are on the same
> partition where it should just directly use fdtdir
> /usr/lib/linux-image-VERSION/ ...
This bug needs some fixing soon (in the worst case a partial revert to
the bookworm code), or the package will not be in trixie.
> live well,
> vagrant
cu
Adrian
