Re: [oe-commits] [openembedded-core] 13/44: u-boot-fw-utils: Fix broken makefile in v2017.11.

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3808 bytes --]

On Tue, Jan 02, 2018 at 05:28:13PM +0000, git@git.openembedded.org wrote:
> This is an automated email from the git hooks/post-receive script.
> 
> rpurdie pushed a commit to branch master
> in repository openembedded-core.

Looks like older version of this patch was merged.

This version https://patchwork.openembedded.org/patch/146668/

adds the Upstream-Status from the commit message to the .patch file
where it belongs.

> commit bb6a45bc7e122c61386d0657e7c97895d1697bd7
> Author: Kristian Amlie <kristian.amlie@northern.tech>
> AuthorDate: Wed Dec 13 15:03:27 2017 +0100
> 
>     u-boot-fw-utils: Fix broken makefile in v2017.11.
>     
>     See the patch for details. This patch has already been applied
>     upstream, but we need it for v2017.11.
>     
>     Upstream-Status: Accepted [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811]
>     
>     Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
>     Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  .../u-boot/files/v2017.11-fw-utils-build-fix.patch | 37 ++++++++++++++++++++++
>  meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc  |  1 +
>  2 files changed, 38 insertions(+)
> 
> diff --git a/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch b/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch
> new file mode 100644
> index 0000000..fe89735
> --- /dev/null
> +++ b/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch
> @@ -0,0 +1,37 @@
> +From ded84f90a1066eef5f34daa4539273de64f7b811 Mon Sep 17 00:00:00 2001
> +From: Stefan Agner <stefan.agner@toradex.com>
> +Date: Tue, 14 Nov 2017 15:47:18 +0100
> +Subject: [PATCH 1/1] envtools: make sure version/timestamp header file are
> + available
> +
> +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 <stefan.agner@toradex.com>
> +Tested-by: Peter Robinson <pbrobinson@gmail.com>
> +Reviewed-by: Simon Glass <sjg@chromium.org>
> +---
> + Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 61fd973..f8c66a2 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -1447,7 +1447,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)
> +-- 
> +2.7.4
> +
> diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc b/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc
> index bfdf1a0..65f1228 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc
> @@ -12,6 +12,7 @@ SRCREV = "c253573f3e269fd9a24ee6684d87dd91106018a5"
>  SRC_URI = "git://git.denx.de/u-boot.git \
>      file://MPC8315ERDB-enable-DHCP.patch \
>      file://10m50-update-device-tree.patch \
> +    file://v2017.11-fw-utils-build-fix.patch \
>  "
>  
>  S = "${WORKDIR}/git"
> 
> -- 
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]