aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jörg Krause <joerg.krause@embedded.rocks>2017-07-13 08:19:05 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-07-21 09:52:00 +0200
commit2638b3f305da06705692343d0deec8d34757945a (patch)
tree76b06d80ee6ee058e0388c42b27272cafe27a972
parent19904538a4acb179470d6408d1c9a9742e78b6d5 (diff)
downloadbuildroot-2638b3f305da06705692343d0deec8d34757945a.tar.gz
buildroot-2638b3f305da06705692343d0deec8d34757945a.tar.bz2
uboot-tools: disable libfdt swig wrapper for host
Commit f4891c398e599f18bbf41eb33885930431f5e1c8 [1] added a workaround to disable the build of the python libfdt module if swig is available on the host. This workaround is also necessary when building the host uboot-tools. Note, that the issue was introduced in upstream commit 1905c8fc711a527ff10550425498bc77e4db9ac3 [2] and released in version U-Boot version 2017.03 and fixed in version 2017.07 (see [3]). [1] https://git.busybox.net/buildroot/commit/package/uboot-tools?h=master&id=f4891c398e599f18bbf41eb33885930431f5e1c8 [2] http://git.denx.de/?p=u-boot.git;a=commit;h=1905c8fc711a527ff10550425498bc77e4db9ac3 [3] http://patchwork.ozlabs.org/patch/787412/ Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Acked-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/uboot-tools/uboot-tools.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 352f53d690..4096a0c937 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -23,7 +23,7 @@ UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \
# This option was added through an additional patch
# and allows the disabling of a host python swig
-# detect which as of 2017.5 assumes the host systems swig.
+# detect which as of 2017.3 assumes the host systems swig.
UBOOT_TOOLS_MAKE_OPTS += CONFIG_TOOLS_PYTHON_WRAPPER_DISABLE=y
ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),y)
@@ -92,6 +92,10 @@ HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \
HOSTCFLAGS="$(HOST_CFLAGS)" \
HOSTLDFLAGS="$(HOST_LDFLAGS)"
+# Workaround to disable building the host python libfdt module. See comment
+# above when setting the target uboot-tools make options.
+HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_TOOLS_PYTHON_WRAPPER_DISABLE=y
+
ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),y)
HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y
HOST_UBOOT_TOOLS_DEPENDENCIES += host-dtc