Yes, it should be backport and the header is to be included in the patch file, not on the commit log
On Thu, Dec 14, 2017 at 10:22 PM, Denys Dmytriyenko <de...@denix.org> wrote: > Isn't it "Upstream-Status: Backport [URL]"? > > Also, what were the changes in v2 and v3 of this patch? > > > On Wed, Dec 13, 2017 at 03:52:29PM +0100, Kristian Amlie wrote: >> 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.am...@northern.tech> >> --- >> .../u-boot/files/v2017.11-fw-utils-build-fix.patch | 41 >> ++++++++++++++++++++++ >> meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc | 1 + >> 2 files changed, 42 insertions(+) >> create mode 100644 >> meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch >> >> 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..6aadae4 >> --- /dev/null >> +++ b/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch >> @@ -0,0 +1,41 @@ >> +From 2d3078f3c0bd0656dadf6341888d608c0fe921ea Mon Sep 17 00:00:00 2001 >> +From: Stefan Agner <stefan.ag...@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.ag...@toradex.com> >> +Tested-by: Peter Robinson <pbrobin...@gmail.com> >> +Reviewed-by: Simon Glass <s...@chromium.org> >> + >> +Upstream-Status: Accepted >> [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811] >> + >> +Signed-off-by: Kristian Amlie <kristian.am...@northern.tech> >> +--- >> + 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" >> -- >> 2.7.4 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
