boot/uboot: cover more u-boot versions when fixing up libfdt include paths
PATCH 1/1 boot/uboot: cover more u-boot versions when fixing up libfdt include paths
From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
The original UBOOT_FIXUP_LIBFDT_INCLUDE hook only works for u-boot versions starting from v2017.11.
As older u-boot versions are still in common use today, e.g. in the ci20_defconfig, extend the hook to cover a wider range of u-boot versions.
The main code change was proposed by Arnout Vandecappelle in [1]. Testing and comment changes were done by Thomas De Schampheleire.
[1] http://lists.busybox.net/pipermail/buildroot/2019-May/251231.html
--- boot/uboot/uboot.mk | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-)
Arnout: I hope you don't mind attributing this commit to you. Otherwise, do let me know... (I take the blame for all problems with it :-D)
boot/uboot/uboot.mk +27 -7
@@ -201,15 +201,35 @@ define UBOOT_APPLY_LOCAL_PATCHES endef UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES -# This is equivalent to upstream commit -# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a. It -# fixes a build failure when libfdt-devel is installed system-wide. -# This only works when scripts/dtc/libfdt exists (E.G. versions containing -# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=c0e032e0090d6541549b19cc47e06ccd1f302893) +# Fixup inclusion of libfdt headers, which can fail in older u-boot versions +# when libfdt-devel is installed system-wide. +# The core change is equivalent to upstream commit +# e0d20dc1521e74b82dbd69be53a048847798a90a (first in v2018.03). However, the fixup +# is complicated by the fact that the underlying u-boot code changed multiple +# times in history: +# - The directory scripts/dtc/libfdt only exists since upstream commit +# c0e032e0090d6541549b19cc47e06ccd1f302893 (first in v2017.11). For earlier +# versions, create a dummy scripts/dtc/libfdt directory with symlinks for the +# fdt-related files. This allows to use the same -I<path> option for both +# cases. +# - The variable 'srctree' used to be called 'SRCTREE' before upstream commit +# 01286329b27b27eaeda045b469d41b1d9fce545a (first in v2014.04). +# - The original location for libfdt, 'lib/libfdt/', used to be simply +# 'libfdt' before upstream commit 0de71d507157c4bd4fddcd3a419140d2b986eed2 +# (first in v2010.06). Make the 'lib' part optional in the substitution to +# handle this. define UBOOT_FIXUP_LIBFDT_INCLUDE - if [ -d $(@D)/scripts/dtc/libfdt ]; then \ - $(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile; \ + $(Q)if [ ! -d $(@D)/scripts/dtc/libfdt ]; then \ + mkdir -p $(@D)/scripts/dtc/libfdt; \ + cd $(@D)/scripts/dtc/libfdt; \ + ln -s ../../../include/fdt.h .; \ + ln -s ../../../include/libfdt*.h .; \ + ln -s ../../../lib/libfdt/libfdt_internal.h .; \ fi + $(Q)$(SED) \ + 's%-I\ *\$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%; \ + s%-I\ *\$$(SRCTREE)\(/lib\)\?/libfdt%-I$$(SRCTREE)/scripts/dtc/libfdt%' \ + $(@D)/tools/Makefile endef UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE
Signature · 1 line
2.21.0
PATCH 1/1 boot/uboot: cover more u-boot versions when fixing up libfdt include paths
Hello,
Quoted 90 lines · On Wed, Jun 12, 2019, 17:06 Thomas De Schampheleire <…
From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
The original
UBOOT_FIXUP_LIBFDT_INCLUDEhook only works for u-boot versions starting from v2017.11.As older u-boot versions are still in common use today, e.g. in the
ci20_defconfig, extend the hook to cover a wider range of u-boot versions.The main code change was proposed by Arnout Vandecappelle in [1]. Testing and comment changes were done by Thomas De Schampheleire.
[1] http://lists.busybox.net/pipermail/buildroot/2019-May/251231.html
Signed-off-by Thomas De Schampheleire <[email protected]>--- boot/uboot/uboot.mk | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-)Arnout: I hope you don't mind attributing this commit to you. Otherwise, do let
me know... (I take the blame for all problems with it :-D)boot/uboot/uboot.mk +0
-2@@ -201,15 +201,35 @@ define UBOOT_APPLY_LOCAL_PATCHES endef UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES -# This is equivalent to upstream commit -#http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a.
Itboot/uboot/uboot.mk +0
-3-# fixes a build failure when libfdt-devel is installed system-wide. -# This only works when scripts/dtc/libfdt exists (E.G. versions containing -#http://git.denx.de/?p=u-boot.git;a=commitdiff;h=c0e032e0090d6541549b19cc47e06ccd1f302893
)
+# Fixup inclusion of libfdt headers, which can fail in older u-boot versionsboot/uboot/uboot.mk +3
-0+# when libfdt-devel is installed system-wide. +# The core change is equivalent to upstream commit +# e0d20dc1521e74b82dbd69be53a048847798a90a (first in v2018.03). However,the fixup
+# is complicated by the fact that the underlying u-boot code changed multipleboot/uboot/uboot.mk +3
-0+# times in history: +# - The directory scripts/dtc/libfdt only exists since upstream commit +# c0e032e0090d6541549b19cc47e06ccd1f302893 (first in v2017.11). Forearlier
+# versions, create a dummyscripts/dtc/libfdtdirectory with symlinks
for the
+# fdt-related files. This allows to use the same -I<path> option for
bothboot/uboot/uboot.mk +2
-0+# cases. +# - The variable 'srctree' used to be called 'SRCTREE' before upstreamcommit
boot/uboot/uboot.mk +3
-0+# 01286329b27b27eaeda045b469d41b1d9fce545a (first in v2014.04). +# - The original location for libfdt, 'lib/libfdt/', used to be simply +# 'libfdt' before upstream commit
0de71d507157c4bd4fddcd3a419140d2b986eed2
+# (first in v2010.06). Make the 'lib' part optional in the substitution
toboot/uboot/uboot.mk +1
-2+# handle this. define UBOOT_FIXUP_LIBFDT_INCLUDE - if [ -d $(@D)/scripts/dtc/libfdt ]; then \ - $(SED)'s%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile; \
boot/uboot/uboot.mk +8
-0+ $(Q)if [ ! -d $(@D)/scripts/dtc/libfdt ]; then \ + mkdir -p $(@D)/scripts/dtc/libfdt; \ + cd $(@D)/scripts/dtc/libfdt; \ + ln -s ../../../include/fdt.h .; \ + ln -s ../../../include/libfdt*.h .; \ + ln -s ../../../lib/libfdt/libfdt_internal.h .; \ fi + $(Q)$(SED) \ + 's%-I\*\$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%; \
+ s%-I\
*\$$(SRCTREE)\(/lib\)\?/libfdt%-I$$(SRCTREE)/scripts/dtc/libfdt%' \
+ $(@D)/tools/Makefile
endef
UBOOT_POST_PATCH_HOOKS+=UBOOT_FIXUP_LIBFDT_INCLUDE
Quoted 3 lines
--
2.21.0
This patch is still pending but I'm not aware of any problems with it (we're using it in our instance). I guess it fell through the cracks.
Could we take it up again? If there is no comment or rejection, I could rebase it if needed (I haven't checked yet if it still applies).
Thanks,
Thomas
Quoted 2 lines
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20191027/0c05c534/attachment.html>