From patchwork Wed Jul 12 19:43:51 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: 787412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x78XX1bQwz9s06 for ; Thu, 13 Jul 2017 05:44:12 +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="saoGLAPT"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 58DF08A114; Wed, 12 Jul 2017 19:44:08 +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 OaMkPAiZ1Eg8; Wed, 12 Jul 2017 19:44:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C484A89BBA; Wed, 12 Jul 2017 19:44:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5446C1C121F for ; Wed, 12 Jul 2017 19:44:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4565288C4B for ; Wed, 12 Jul 2017 19:44:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eHQFR9ucCqss for ; Wed, 12 Jul 2017 19:44:00 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 93BA588C5A for ; Wed, 12 Jul 2017 19:44:00 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3x78XF0PR1zyxY for ; Wed, 12 Jul 2017 21:43:57 +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=1499888634; x=1500493435; bh=0NXbmsMUJwEmzzp4Kfk1yOVrXSS9OKP+BME2fNMTqlM=; b=saoGLAPTdXd3 m2ag0y3twlAG2Y6VrFgLFPnQS9L/UvGGcQscH0uVsR5rZXau8KU3TRQWw+thzoz4 nP2d6SNMfvJAxTxyCa+lOkzfC9uxkTgj69dyEKsDwFEBSNAuHLIhgqQE04wzn7fl 3qao18vVnmooS4Fb6P3AnFONkL8dXOTd6zEE6qbe/G6M/qWV9suW9lD9IKf36z5A qaxlRtXje8xipyuRWzpDG/SDDicDIIfWbgtXgPRKH8ttjim69/GUXsYbVHUruHtC TKq814rAITogaY5usmeucdCSqLUTvQCiD+Ky2fqYTzc3ywiEZtwMG+BJTR2zLGO+ 52teH7k0WQ== 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 tU4yJINNMwpa; Wed, 12 Jul 2017 21:43:54 +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; Wed, 12 Jul 2017 21:43:54 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Wed, 12 Jul 2017 21:43:51 +0200 Message-Id: <20170712194351.20701-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.13.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] uboot-tools: bump to version 2017.07 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" Drop patch 0005 which has been fixed upstream in a different way [1] by only building the Python libfdt library when needed [2]. [1] https://patchwork.ozlabs.org/patch/757380/ [2] https://www.mail-archive.com/u-boot@lists.denx.de/msg251051.html Signed-off-by: Jörg Krause --- ...nditionally-disable-python-libfdt-wrapper.patch | 44 ---------------------- package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 7 +--- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/uboot-tools/0005-tools-conditionally-disable-python-libfdt-wrapper.patch diff --git a/package/uboot-tools/0005-tools-conditionally-disable-python-libfdt-wrapper.patch b/package/uboot-tools/0005-tools-conditionally-disable-python-libfdt-wrapper.patch deleted file mode 100644 index e48f72b7b9..0000000000 --- a/package/uboot-tools/0005-tools-conditionally-disable-python-libfdt-wrapper.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4dc3139cc9fa12882792053bdce7b69aca9b91bf Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Mon, 1 May 2017 22:19:57 -0500 -Subject: [PATCH] tools: conditionally disable python libfdt wrapper - -Not all host systems want the default swig to be -used when building the tools. Allow for the -disabling of the wrapper to enable cross-compiling -of the tools on a host system with swig. - -Upsteam submission for RFC: -https://lists.denx.de/pipermail/u-boot/2017-May/289520.html - -Workaround for: -http://autobuild.buildroot.net/results/6d5/6d52ac8bb71012aea6fc4c679691b31a3366728b - -Signed-off-by: Matthew Weber ---- - tools/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/Makefile b/tools/Makefile -index 2fc4a58..7f6c29d 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -114,6 +114,7 @@ fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o - - # Build a libfdt Python module if swig is available - # Use 'sudo apt-get install swig libpython-dev' to enable this -+ifndef CONFIG_TOOLS_PYTHON_WRAPPER_DISABLE - hostprogs-y += \ - $(if $(shell which swig 2> /dev/null),_libfdt.so) - _libfdt.so-sharedobjs += $(LIBFDT_OBJS) -@@ -126,6 +127,7 @@ tools/_libfdt.so: $(patsubst %.o,%.c,$(LIBFDT_OBJS)) tools/libfdt_wrap.c - - tools/libfdt_wrap.c: $(srctree)/lib/libfdt/libfdt.swig - swig -python -o $@ $< -+endif - - # TODO(sjg@chromium.org): Is this correct on Mac OS? - --- -1.9.1 - diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index e11d92ff15..3ba8e34ba0 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2 +sha256 5374bfdc8acb9a38c025371b1ff20f45e7533668e84e685d0df5d9e7c0e4feff u-boot-2017.07.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 1327a06525..4f39f4ad2c 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2017.05 +UBOOT_TOOLS_VERSION = 2017.07 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ @@ -21,11 +21,6 @@ UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ STRIP=$(TARGET_STRIP) -# 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. -UBOOT_TOOLS_MAKE_OPTS += CONFIG_TOOLS_PYTHON_WRAPPER_DISABLE=y - ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),y) UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y UBOOT_TOOLS_DEPENDENCIES += dtc