Skip to contentSkip to conversation

package/uboot-tools: bump to version 2015.01

PATCH Superseded Jörg Krause 2 participants 3 messages Jan 31, 2015 – Feb 1, 2015

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Jörg Krause

author
#0 lore raw

PATCH 1/1 package/uboot-tools: bump to version 2015.01

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 <[email protected]>
---
 ...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
package/uboot-tools/0001-drop-configh-from-tools.patch renamed from package/uboot-tools/uboot-tools-01-drop-configh-from-tools.patch +2 -2
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
@@ -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 <config.h>
 -#endif
- 
+
  /*
   * To build the utility with the static configuration
package/uboot-tools/Config.in +1 -0
index 7c8f17c..09090b5 100644
@@ -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.
package/uboot-tools/Config.in.host +1 -0
index 7a844e9..12e2fdc 100644
@@ -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.
package/uboot-tools/uboot-tools-02-nostrip.patch deleted +0 -61

61 lines not on this page · raw message

package/uboot-tools/uboot-tools.mk +4 -3
index f02bb55..87f83e1 100644
@@ -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
Signature · 1 line
2.2.2
#1 lore raw

PATCH 1/1 package/uboot-tools: bump to version 2015.01

Dear J?rg Krause,

Quoted 2 lines · J?rg Krause

Bump to version 2015.01:
* Add dependency for openssl, which is needed for supporting verified boot

I'm personally not too happy to have host-openssl as a mandatory dependency of host-uboot-tools. It means that whenever you want to build a uImage kernel image, you are now forced to build OpenSSL, even if you don't care about verified boot.

Is there a way we can make this optional?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 package/uboot-tools: bump to version 2015.01

Dear Thomas Petazzoni,

Quoted 6 lines · Thomas Petazzoni

Dear J?rg Krause,

Quoted 2 lines · J?rg Krause

Bump to version 2015.01:
* Add dependency for openssl, which is needed for supporting verified boot

Quoted 6 lines

I'm personally not too happy to have host-openssl as a mandatory dependency of host-uboot-tools. It means that whenever you want to build a uImage kernel image, you are now forced to build OpenSSL, even if you don't care about verified boot.

Is there a way we can make this optional?

I will have a look at this.

Best regards
J?rg Krause