From e6b91d581b927968459efc81ba6e7e75f2a08ac4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 16 Nov 2017 15:02:32 +0000 Subject: [PATCH] add patch to fix ftbfs --- ...-timestamp-header-file-are-available.patch | 48 +++++++++++++++++++ uboot-tools.spec | 1 + 2 files changed, 49 insertions(+) create mode 100644 envtools-make-sure-version-timestamp-header-file-are-available.patch diff --git a/envtools-make-sure-version-timestamp-header-file-are-available.patch b/envtools-make-sure-version-timestamp-header-file-are-available.patch new file mode 100644 index 0000000..c448f47 --- /dev/null +++ b/envtools-make-sure-version-timestamp-header-file-are-available.patch @@ -0,0 +1,48 @@ +From patchwork Tue Nov 14 14:47:18 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [U-Boot] envtools: make sure version/timestamp header file are + available +X-Patchwork-Submitter: Stefan Agner +X-Patchwork-Id: 837888 +X-Patchwork-Delegate: trini@ti.com +Message-Id: <20171114144718.10213-1-stefan@agner.ch> +To: u-boot@lists.denx.de, + trini@konsulko.com +Cc: Stefan Agner , + Marcel Ziswiler , + Max Krummenacher +Date: Tue, 14 Nov 2017 15:47:18 +0100 +From: Stefan Agner +List-Id: U-Boot discussion + +From: Stefan Agner + +With commit 84d46e7e8948 ("tools: env: allow to print U-Boot version") +the fw_env utilities need the version.h header file. Building only +the envtools in a pristine build directory will fail due to missing +header files. + +Make sure the header files are a dependency of the envtools target. + +Fixes: 84d46e7e8948 ("tools: env: allow to print U-Boot version") +Signed-off-by: Stefan Agner +--- + + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 67f01ad7e4..b93c2fb05b 100644 +--- a/Makefile ++++ b/Makefile +@@ -1460,7 +1460,7 @@ checkarmreloc: u-boot + false; \ + fi + +-envtools: scripts_basic ++envtools: scripts_basic $(version_h) $(timestamp_h) + $(Q)$(MAKE) $(build)=tools/env + + tools-only: scripts_basic $(version_h) $(timestamp_h) diff --git a/uboot-tools.spec b/uboot-tools.spec index 692589e..087923a 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -22,6 +22,7 @@ Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch Patch3: usb-kbd-fixes.patch Patch4: fdt-fixes.patch Patch5: arm64-support-running-at-addr-other-than-linked-to.patch +Patch6: envtools-make-sure-version-timestamp-header-file-are-available.patch # Board fixes and enablement Patch10: dragonboard-fixes.patch