From patchwork Sat Jan 31 14:32:18 2015 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: 435148 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 6771F140277 for ; Sun, 1 Feb 2015 01:32:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BBE9331EF4; Sat, 31 Jan 2015 14:32:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id swDRQZ3Qlntk; Sat, 31 Jan 2015 14:32:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F1CB22F5E0; Sat, 31 Jan 2015 14:32:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 38A481C234F for ; Sat, 31 Jan 2015 14:32:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3285F8B298 for ; Sat, 31 Jan 2015 14:32:31 +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 adcbWZTGQhMu for ; Sat, 31 Jan 2015 14:32:29 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx02.posteo.de (mx02.posteo.de [89.146.194.165]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8EF198B290 for ; Sat, 31 Jan 2015 14:32:29 +0000 (UTC) Received: from dovecot03.posteo.de (unknown [185.67.36.28]) by mx02.posteo.de (Postfix) with ESMTPS id C548925A211E for ; Sat, 31 Jan 2015 15:32:26 +0100 (CET) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3kZHty0HnMz5vMs for ; Sat, 31 Jan 2015 15:32:25 +0100 (CET) Received: from nzxt.fritz.box (nzxt.fritz.box [192.168.178.46]) (Authenticated sender: joerg.krause@embedded.rocks) by embedded.rocks (Postfix) with ESMTPSA id CB4449819A3; Sat, 31 Jan 2015 15:32:24 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Sat, 31 Jan 2015 15:32:18 +0100 Message-Id: <1422714738-19397-1-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.2.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/uboot-tools: bump to version 2015.01 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" Bump to version 2015.01: * Add dependency for openssl, which is needed for supporting verified boot * Building the target 'tools-only' requires a '.config' file, so first make a default configuration (which defaults to sandbox_defconfig) as supposed on the U-Boot mailing list http://lists.denx.de/pipermail/u-boot/2014-September/187866.html * Remove patch uboot-tools-02-nostrip, it's upstream * Rename remaining patch to new convention Signed-off-by: Jörg Krause --- ...ls.patch => 0001-drop-configh-from-tools.patch} | 4 +- package/uboot-tools/Config.in | 1 + package/uboot-tools/Config.in.host | 1 + package/uboot-tools/uboot-tools-02-nostrip.patch | 61 ---------------------- package/uboot-tools/uboot-tools.mk | 7 +-- 5 files changed, 8 insertions(+), 66 deletions(-) rename package/uboot-tools/{uboot-tools-01-drop-configh-from-tools.patch => 0001-drop-configh-from-tools.patch} (99%) delete mode 100644 package/uboot-tools/uboot-tools-02-nostrip.patch diff --git a/package/uboot-tools/uboot-tools-01-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch similarity index 99% rename from package/uboot-tools/uboot-tools-01-drop-configh-from-tools.patch rename to package/uboot-tools/0001-drop-configh-from-tools.patch index a36332f..cb45ce9 100644 --- a/package/uboot-tools/uboot-tools-01-drop-configh-from-tools.patch +++ b/package/uboot-tools/0001-drop-configh-from-tools.patch @@ -11,7 +11,7 @@ index aff471b..dfe7439 100644 @@ -5,14 +5,6 @@ * SPDX-License-Identifier: GPL-2.0+ */ - + -/* Pull in the current config to define the default environment */ -#ifndef __ASSEMBLY__ -#define __ASSEMBLY__ /* get only #defines from config.h */ @@ -20,6 +20,6 @@ index aff471b..dfe7439 100644 -#else -#include -#endif - + /* * To build the utility with the static configuration diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in index 7c8f17c..09090b5 100644 --- a/package/uboot-tools/Config.in +++ b/package/uboot-tools/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_UBOOT_TOOLS bool "u-boot tools" + select BR2_PACKAGE_OPENSSL help Companion tools for Das U-Boot bootloader. diff --git a/package/uboot-tools/Config.in.host b/package/uboot-tools/Config.in.host index 7a844e9..12e2fdc 100644 --- a/package/uboot-tools/Config.in.host +++ b/package/uboot-tools/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_UBOOT_TOOLS bool "host u-boot tools" + select BR2_PACKAGE_OPENSSL help Companion tools for Das U-Boot bootloader. diff --git a/package/uboot-tools/uboot-tools-02-nostrip.patch b/package/uboot-tools/uboot-tools-02-nostrip.patch deleted file mode 100644 index 7333f41..0000000 --- a/package/uboot-tools/uboot-tools-02-nostrip.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 17e0d6ddd1dc5d04b8032bde2f2076134b0c6dd7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 27 Aug 2014 14:21:32 +0200 -Subject: [PATCH] tools/env: change stripping strategy to allow no-stripping - -When building the U-Boot tools for non-ELF platforms (such as Blackfin -FLAT), since commit 79fc0c5f498c3982aa4740c273ab1a9255063d9c -("tools/env: cross-compile fw_printenv without setting HOSTCC"), the -build fails because it tries to strip a FLAT binary, which does not -make sense. - -This commit solves this by changing the stripping logic in -tools/env/Makefile to be similar to the one in tools/Makefile. This -logic continues to apply strip to the final binary, but does not abort -the build if it fails, and does the stripping in place on the final -binary. This allows the logic to work fine if stripping doesn't work, -as it leaves the final binary untouched. - -Signed-off-by: Thomas Petazzoni -Cc: Masahiro Yamada -Cc: Sonic Zhang ---- -An improved solution would be to be able to override STRIP completely -by setting it to /bin/true, but the main Makefile enforces STRIP = -$(CROSS_COMPILE)strip. - -Signed-off-by: Thomas Petazzoni ---- - tools/env/Makefile | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/tools/env/Makefile b/tools/env/Makefile -index f5368bc..d047aa5 100644 ---- a/tools/env/Makefile -+++ b/tools/env/Makefile -@@ -21,14 +21,16 @@ HOST_EXTRACFLAGS += -DMTD_OLD - endif - - always := fw_printenv --hostprogs-y := fw_printenv_unstripped -+hostprogs-y := fw_printenv - --fw_printenv_unstripped-objs := fw_env.o fw_env_main.o \ -+fw_printenv-objs := fw_env.o fw_env_main.o \ - crc32.o ctype.o linux_string.o \ - env_attr.o env_flags.o aes.o - --quiet_cmd_strip = STRIP $@ -- cmd_strip = $(STRIP) -o $@ $< -+quiet_cmd_crosstools_strip = STRIP $^ -+ cmd_crosstools_strip = $(STRIP) $^; touch $@ - --$(obj)/fw_printenv: $(obj)/fw_printenv_unstripped FORCE -- $(call if_changed,strip) -+$(obj)/.strip: $(obj)/fw_printenv -+ $(call cmd,crosstools_strip) -+ -+always += .strip --- -2.0.0 - diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index f02bb55..87f83e1 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2014.07 +UBOOT_TOOLS_VERSION = 2015.01 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPLv2+ UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt +UBOOT_TOOLS_DEPENDENCIES = openssl define UBOOT_TOOLS_BUILD_CMDS $(MAKE) -C $(@D) \ @@ -16,7 +17,7 @@ define UBOOT_TOOLS_BUILD_CMDS CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ CROSS_BUILD_TOOLS=y \ - tools-only + defconfig tools-only $(MAKE) -C $(@D) \ CROSS_COMPILE="$(TARGET_CROSS)" \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -54,7 +55,7 @@ define HOST_UBOOT_TOOLS_BUILD_CMDS HOSTCC="$(HOSTCC)" \ HOSTCFLAGS="$(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \ - tools-only + defconfig tools-only endef define HOST_UBOOT_TOOLS_INSTALL_CMDS