From patchwork Fri Jun 21 20:22:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1120484 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=koncepto.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io header.b="kV/zsRbS"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45Vqv43Jgxz9s4Y for ; Sat, 22 Jun 2019 06:25:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B488087FC3; Fri, 21 Jun 2019 20:25:32 +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 BODKD+f7Lwvb; Fri, 21 Jun 2019 20:25:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9E504880C7; Fri, 21 Jun 2019 20:25:30 +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 02B6A1BF3F7 for ; Fri, 21 Jun 2019 20:25:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F382E8683C for ; Fri, 21 Jun 2019 20:25:26 +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 YH5NcTSgXzYs for ; Fri, 21 Jun 2019 20:25:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from koncepto.io (koncepto.io [195.154.119.111]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7C8D5865C4 for ; Fri, 21 Jun 2019 20:25:25 +0000 (UTC) Received: from localhost.localdomain (lfbn-1-8923-205.w193-250.abo.wanadoo.fr [193.250.65.205]) by koncepto.io (Postfix) with ESMTPSA id 46B32601F2; Fri, 21 Jun 2019 22:25:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1561148721; bh=AWlmjmu4vKsP1z5jtbh3AmQV3Sr1ghxfYRaYVwm5e3I=; h=From:To:Cc:Subject:Date:From; b=kV/zsRbSyit9X3+SL/9KeLnGvihh/XVvICKSLf/KmZccmOBrtzu/uBCc+x7hJXj2L R9uTKbY39b3+vq3IlCGu8Y4UAUXgJAZIVpOFx9ipEbR7PXq1wbyAvrz8ca0it0acsy APwuwxHVyZL8YUnIhf9GRVQiH3MLruAfnqEbMAFur7vgZ6mZ1rU115Seyfbn6AjXkQ XYhcFxLxC2LKVMVu+8qnJpq/bvUeRuHKTOhcFbIv4FYRYbFdfum9LH4dnk8+SGUxGq dcYLRPa7RQiwNgeFZ410GuxdFDIvf0/dxCZPMBPyIZLDwBhT7UM/tb9adRBslmG2xJ 0Pom5otk0+sKw== From: Pierre-Jean Texier To: buildroot@buildroot.org Date: Fri, 21 Jun 2019 22:22:29 +0200 Message-Id: <1561148550-3766-1-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/uboot-tools: bump to version 2019.04 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pierre-Jean Texier Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Bump to version 2019.04. - remove the patch that have been upstreamed. - Refresh patches for the new version. Signed-off-by: Pierre-Jean Texier --- .../uboot-tools/0001-drop-configh-from-tools.patch | 10 +++--- ...-Makefile-build-host-tools-with-std-gnu99.patch | 42 ---------------------- ...le-fix-HOSTCFLAGS-with-CROSS_BUILD_TOOLS.patch} | 0 package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 5 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 package/uboot-tools/0004-tools-Makefile-build-host-tools-with-std-gnu99.patch rename package/uboot-tools/{0005-tools-Makefile-fix-HOSTCFLAGS-with-CROSS_BUILD_TOOLS.patch => 0004-tools-Makefile-fix-HOSTCFLAGS-with-CROSS_BUILD_TOOLS.patch} (100%) diff --git a/package/uboot-tools/0001-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch index f19cebe..59e5686 100644 --- a/package/uboot-tools/0001-drop-configh-from-tools.patch +++ b/package/uboot-tools/0001-drop-configh-from-tools.patch @@ -1,4 +1,4 @@ -From 216832de3bc3e6ef093305c6d07f464f7606f2d6 Mon Sep 17 00:00:00 2001 +From ab8b54cfc9d3fddba297c343a2d8dea9dbe20017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 4 Aug 2015 22:13:20 +0200 Subject: [PATCH] drop configh from tools @@ -16,16 +16,18 @@ Signed-off-by: Jörg Krause [Romain: update for version 2017.05 after commit 9d80b49a671c9922931adcd823aab0ed319a42d1] Signed-off-by: Romain Naour +[Pierre-Jean: update for version 2019.04] +Signed-off-by: Pierre-Jean Texier --- tools/env/fw_env_private.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h -index 0c27da0..e550463 100644 +index 86be16d..3c62ac4 100644 --- a/tools/env/fw_env_private.h +++ b/tools/env/fw_env_private.h -@@ -5,17 +5,6 @@ - * SPDX-License-Identifier: GPL-2.0+ +@@ -4,17 +4,6 @@ + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -/* Pull in the current config to define the default environment */ diff --git a/package/uboot-tools/0004-tools-Makefile-build-host-tools-with-std-gnu99.patch b/package/uboot-tools/0004-tools-Makefile-build-host-tools-with-std-gnu99.patch deleted file mode 100644 index 60ad37d..0000000 --- a/package/uboot-tools/0004-tools-Makefile-build-host-tools-with-std-gnu99.patch +++ /dev/null @@ -1,42 +0,0 @@ -From aaabed350ec51f7bb9a07290ffb3ce6e794c8f22 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 19 Mar 2019 23:01:50 +0100 -Subject: [PATCH] tools/Makefile: build host tools with -std=gnu99 - -Parts of the code are using C99 constructs (such as variables declared -inside loops), but also GNU extensions (such as typeof), so using --std=gnu99 is necessary to build with older versions of gcc that don't -default to building with gnu99. - -It fixes the following build failure: - -./tools/../lib/crc16.c: In function "crc16_ccitt": -./tools/../lib/crc16.c:70:2: error: "for" loop initial declarations are only allowed in C99 mode - for (int i = 0; i < len; i++) - ^ -./tools/../lib/crc16.c:70:2: note: use option -std=c99 or -std=gnu99 to compile your code - -when building the host tools with gcc 4.7. - -Signed-off-by: Thomas Petazzoni ---- - tools/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index 081383d7a7..d377d85f74 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -254,7 +254,8 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ - -I$(srctree)/tools \ - -DUSE_HOSTCC \ - -D__KERNEL_STRICT_NAMES \ -- -D_GNU_SOURCE -+ -D_GNU_SOURCE \ -+ -std=gnu99 - - __build: $(LOGO-y) - --- -2.20.1 - diff --git a/package/uboot-tools/0005-tools-Makefile-fix-HOSTCFLAGS-with-CROSS_BUILD_TOOLS.patch b/package/uboot-tools/0004-tools-Makefile-fix-HOSTCFLAGS-with-CROSS_BUILD_TOOLS.patch similarity index 100% rename from package/uboot-tools/0005-tools-Makefile-fix-HOSTCFLAGS-with-CROSS_BUILD_TOOLS.patch rename to package/uboot-tools/0004-tools-Makefile-fix-HOSTCFLAGS-with-CROSS_BUILD_TOOLS.patch diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index df2b8ca..9a92018 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22 u-boot-2019.01.tar.bz2 +sha256 76b7772d156b3ddd7644c8a1736081e55b78828537ff714065d21dbade229bef u-boot-2019.04.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 61c70b7..ba6b6db 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2019.01 +UBOOT_TOOLS_VERSION = 2019.04 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+