Package: u-boot-menu
Version: 2
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
When using a separate /boot partition, it is not possible to pass
U_BOOT_FDT, because it checks existence of the device-tree file when
menufile is generated, using same path as is then passed to U-boot.
The fix is to test both with and without _BOOT_DIRECTORY set:
diff --git a/u-boot-update b/u-boot-update
index ed0ff46..aa41853 100755
- --- a/u-boot-update
+++ b/u-boot-update
@@ -156,7 +156,10 @@ do
else
_INITRD=""
fi
- - if [ -e ${U_BOOT_FDT_DIR}${_VERSION}/${U_BOOT_FDT} ] && [ -n
"${U_BOOT_FDT}" ]
+ if [ -n "${_BOOT_DIRECTORY}" ] && [ -e
${U_BOOT_FDT_DIR}${_VERSION}/${U_BOOT_FDT} ] && [ -n "${U_BOOT_FDT}" ]
+ then
+ _FDT="fdt ${U_BOOT_FDT_DIR}${_VERSION}/${U_BOOT_FDT}"
+ elif [ -z "${_BOOT_DIRECTORY}" ] && [ -e
/boot${U_BOOT_FDT_DIR}${_VERSION}/${U_BOOT_FDT} ] && [ -n "${U_BOOT_FDT}" ]
then
_FDT="fdt ${U_BOOT_FDT_DIR}${_VERSION}/${U_BOOT_FDT}"
elif [ -d ${U_BOOT_FDT_DIR}${_VERSION}/ ]
- Jonas
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAluX51wACgkQLHwxRsGg
ASEf8A//bu5YeJ12AcAipaPQbxZvaK82Sb+iesH7AsXCOvhPtgHGUZiyS1DkI7Zk
hA8c5YHzbRNJU90nIWylh3cuRuv+3lJE6Aegmj1+Fi2WIff4cQEi3Wda3C2Co11v
rnCR5Wkr/miHBjTeXi3wyt3B9V8DbaxgsmzvlaLxvZMQj/GQrFdR0MRvX2TiLQjB
v1s59Zm1lEDyOYaoXVY+cuD5TgdI6avSvg1RgICtlLZbk7a0AyP+7ZHdHtEwvhN+
QRBZg4XAjEjB/X6tLyLgMy8I4sHR2DhxpLeoIgzXfwT3J/aZnv06kqfRZO4vC34K
okfojS0xeaOwi6SRsrei7e0URqqJvyBWFmVy2ittoCq4P4Fj5RpEiqT25rdqqrpT
7d+dNWP3b6hQKvNxhgfr/CKzmMc2XBMvwspypEhaLk/UILLgRPXhO/Zp9t02GibU
dW8D8mVDvi4BLxSenP/ac0jrGm/sDeh+l8FP7yKS5o+WWutXzoArJlVhMO0HlHtZ
i+kG3YZXxROrEQK8j//Tgwq5PsUwO12hNGjF6V5nPmG1sUAGlqB+m80GExk8PmiQ
wZRdE0d25m85kw6f5KgIcJTmBUcVj3qgIe51dFz0fb7GXtxZwYNY5HurnSkskWU0
Try/XR7gQoUUbip6D1ZPOWztmPfgjKsIW8Lximc0OmTXjZ4ycYw=
=NdJY
-----END PGP SIGNATURE-----
