From patchwork Thu Jul 13 06:19:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 787523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7QdT2w6kz9s0g for ; Thu, 13 Jul 2017 16:19:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b="bIkQscTO"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D2B0887BAA; Thu, 13 Jul 2017 06:19:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yI3lZnm6LE7S; Thu, 13 Jul 2017 06:19:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0628E87B9F; Thu, 13 Jul 2017 06:19:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B44CB1C0F61 for ; Thu, 13 Jul 2017 06:19:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AE46D89FF8 for ; Thu, 13 Jul 2017 06:19:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BrYdbV+KM515 for ; Thu, 13 Jul 2017 06:19:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by hemlock.osuosl.org (Postfix) with ESMTPS id 2B29289CD6 for ; Thu, 13 Jul 2017 06:19:12 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3x7Qd94smszyqC for ; Thu, 13 Jul 2017 08:19:09 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1499926748; x=1500531549; bh=Z6LmStx8Fy7xdAVbd32dyof1/ehwKs1DZDah7gFnw0k=; b=bIkQscTOuZUs X0WNgeVoQr4I1Oflzkv86l/lgNuhXWQsf+KtWQl23AO8amAj7A3OyS9mVpdZP76h CUpIO2tH6+yjURpYdnRTuexCJYAOWtjsJH64KI2c+Lr2fNItKdwTzCALxYL8FULn C4Msqnp4n1TbFG5vAMOuf3BwPP6O3AQjNAcIm3Z8xAgE34bwxgqOWnIA6zoRSPFY Z4HXbxZD6W6YaoEmHA0RstMMvT6c3K+3hZ/njILNKObsgBOXW/6tdrYG3zCZS1QC 5Ey/cEHlSR6DuPtX1K8ZBrCKHcRtkm9CkmBSEhaoTVbIAy21UzF6EkBI1vfXXDuB 92yLATkv9g== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id EBtnGlq5e3kc; Thu, 13 Jul 2017 08:19:08 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-87-60.dynamic.qsc.de [92.195.87.60]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Thu, 13 Jul 2017 08:19:08 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Thu, 13 Jul 2017 08:19:05 +0200 Message-Id: <20170713061905.15801-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.13.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH-2017.05.x] uboot-tools: disable libfdt swig wrapper for host X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Acked-by: Matt Weber --- package/uboot-tools/uboot-tools.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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