summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Becker <chemobejk@gmail.com>2018-03-12 12:34:09 (GMT)
committerPeter Korsgaard <peter@korsgaard.com>2018-03-12 22:50:17 (GMT)
commitf437bf547ca44849db4578c31707afdd96b85018 (patch)
tree0895dc027ee96e1a626ec93ebf35315bf44ae6ed
parent03b5b444f155ead9c73c2ed2596948de671c5fb9 (diff)
downloadbuildroot-f437bf547ca44849db4578c31707afdd96b85018.tar.gz
buildroot-f437bf547ca44849db4578c31707afdd96b85018.tar.bz2
uboot: fix build for older uboot source trees
The change in commit bf733342324b414a1142b57781504111f81c97ea only works for newer uboot source trees. Add a check that scripts/dtc/libfdt directory exists before making this change. [Peter: add comment explaining why] Signed-off-by: Stefan Becker <chemobejk@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--boot/uboot/uboot.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 58dd906..b7032d5 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -191,8 +191,12 @@ 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)
define UBOOT_FIXUP_LIBFDT_INCLUDE
- $(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile
+ if [ -d $(@D)/scripts/dtc/libfdt ]; then \
+ $(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile; \
+ fi
endef
UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE