diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-04-12 15:59:40 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2018-04-12 15:59:40 +0930 |
| commit | a8d11267c2bfad3ff410ea342778f2791982da51 (patch) | |
| tree | 98f7058a6f58fc3f63d1e8bb499531a0a01e15fd /boot/uboot | |
| parent | e17668bbe3538d42b0a0fab64251e60ff6c81d68 (diff) | |
| parent | 9565a37e0d2aa3c5fb9a4148760c490f2e5226d4 (diff) | |
| download | buildroot-2018.02-op-build.tar.gz buildroot-2018.02-op-build.zip | |
Merge tag '2018.02.1' into 2018.02-op-build2018.02-op-build
Release 2018.02.1
Diffstat (limited to 'boot/uboot')
| -rw-r--r-- | boot/uboot/uboot.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 5da339850d..b7032d5901 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -188,6 +188,18 @@ 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) +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; \ + fi +endef +UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE + ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) define UBOOT_CONFIGURE_CMDS $(TARGET_CONFIGURE_OPTS) \ |
