* [PATCH] u-boot-fw-utils: Fix broken makefile in v2017.11.
@ 2017-12-13 13:25 Kristian Amlie
2017-12-13 13:32 ` ✗ patchtest: failure for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Kristian Amlie @ 2017-12-13 13:25 UTC (permalink / raw)
To: openembedded-core
See the patch for details. This patch has already been applied
upstream, but we need it for v2017.11.
Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
---
.../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(+)
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..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"
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* ✗ patchtest: failure for u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-13 13:25 [PATCH] u-boot-fw-utils: Fix broken makefile in v2017.11 Kristian Amlie
@ 2017-12-13 13:32 ` Patchwork
2017-12-13 14:03 ` [PATCH v2] " Kristian Amlie
` (2 subsequent siblings)
3 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2017-12-13 13:32 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
== Series Details ==
Series: u-boot-fw-utils: Fix broken makefile in v2017.11.
Revision: 1
URL : https://patchwork.openembedded.org/series/10173/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]
Suggested fix Add Upstream-Status: <Valid status> to the header of meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch
Standard format Upstream-Status: <Valid status>
Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-13 13:25 [PATCH] u-boot-fw-utils: Fix broken makefile in v2017.11 Kristian Amlie
2017-12-13 13:32 ` ✗ patchtest: failure for " Patchwork
@ 2017-12-13 14:03 ` Kristian Amlie
2017-12-13 14:30 ` Tom Rini
2017-12-13 14:52 ` [PATCH v3] " Kristian Amlie
2017-12-13 14:30 ` [PATCH] " Tom Rini
2017-12-13 14:33 ` ✗ patchtest: failure for u-boot-fw-utils: Fix broken makefile in v2017.11. (rev2) Patchwork
3 siblings, 2 replies; 12+ messages in thread
From: Kristian Amlie @ 2017-12-13 14:03 UTC (permalink / raw)
To: openembedded-core
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>
---
.../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(+)
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..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"
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-13 13:25 [PATCH] u-boot-fw-utils: Fix broken makefile in v2017.11 Kristian Amlie
2017-12-13 13:32 ` ✗ patchtest: failure for " Patchwork
2017-12-13 14:03 ` [PATCH v2] " Kristian Amlie
@ 2017-12-13 14:30 ` Tom Rini
2017-12-13 14:33 ` ✗ patchtest: failure for u-boot-fw-utils: Fix broken makefile in v2017.11. (rev2) Patchwork
3 siblings, 0 replies; 12+ messages in thread
From: Tom Rini @ 2017-12-13 14:30 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
On Wed, Dec 13, 2017 at 02:25:50PM +0100, Kristian Amlie wrote:
> See the patch for details. This patch has already been applied
> upstream, but we need it for v2017.11.
>
> Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-13 14:03 ` [PATCH v2] " Kristian Amlie
@ 2017-12-13 14:30 ` Tom Rini
2017-12-13 14:52 ` [PATCH v3] " Kristian Amlie
1 sibling, 0 replies; 12+ messages in thread
From: Tom Rini @ 2017-12-13 14:30 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
On Wed, Dec 13, 2017 at 03:03:27PM +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.amlie@northern.tech>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✗ patchtest: failure for u-boot-fw-utils: Fix broken makefile in v2017.11. (rev2)
2017-12-13 13:25 [PATCH] u-boot-fw-utils: Fix broken makefile in v2017.11 Kristian Amlie
` (2 preceding siblings ...)
2017-12-13 14:30 ` [PATCH] " Tom Rini
@ 2017-12-13 14:33 ` Patchwork
3 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2017-12-13 14:33 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
== Series Details ==
Series: u-boot-fw-utils: Fix broken makefile in v2017.11. (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/10173/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]
Suggested fix Add Upstream-Status: <Valid status> to the header of meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch
Standard format Upstream-Status: <Valid status>
Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-13 14:03 ` [PATCH v2] " Kristian Amlie
2017-12-13 14:30 ` Tom Rini
@ 2017-12-13 14:52 ` Kristian Amlie
2017-12-13 22:56 ` Tom Rini
2017-12-15 0:22 ` Denys Dmytriyenko
1 sibling, 2 replies; 12+ messages in thread
From: Kristian Amlie @ 2017-12-13 14:52 UTC (permalink / raw)
To: openembedded-core; +Cc: Tom Rini
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>
---
.../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.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>
+
+Upstream-Status: Accepted [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811]
+
+Signed-off-by: Kristian Amlie <kristian.amlie@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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-13 14:52 ` [PATCH v3] " Kristian Amlie
@ 2017-12-13 22:56 ` Tom Rini
2017-12-15 0:22 ` Denys Dmytriyenko
1 sibling, 0 replies; 12+ messages in thread
From: Tom Rini @ 2017-12-13 22:56 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
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.amlie@northern.tech>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-13 14:52 ` [PATCH v3] " Kristian Amlie
2017-12-13 22:56 ` Tom Rini
@ 2017-12-15 0:22 ` Denys Dmytriyenko
2017-12-15 0:58 ` Otavio Salvador
1 sibling, 1 reply; 12+ messages in thread
From: Denys Dmytriyenko @ 2017-12-15 0:22 UTC (permalink / raw)
To: Kristian Amlie; +Cc: Tom Rini, openembedded-core
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.amlie@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.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>
> +
> +Upstream-Status: Accepted [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811]
> +
> +Signed-off-by: Kristian Amlie <kristian.amlie@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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-15 0:22 ` Denys Dmytriyenko
@ 2017-12-15 0:58 ` Otavio Salvador
2017-12-15 8:50 ` Kristian Amlie
0 siblings, 1 reply; 12+ messages in thread
From: Otavio Salvador @ 2017-12-15 0:58 UTC (permalink / raw)
To: Denys Dmytriyenko
Cc: Tom Rini, Patches and discussions about the oe-core layer
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 <denis@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.amlie@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.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>
>> +
>> +Upstream-Status: Accepted [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811]
>> +
>> +Signed-off-by: Kristian Amlie <kristian.amlie@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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-15 0:58 ` Otavio Salvador
@ 2017-12-15 8:50 ` Kristian Amlie
2017-12-15 8:50 ` [PATCH v4] " Kristian Amlie
0 siblings, 1 reply; 12+ messages in thread
From: Kristian Amlie @ 2017-12-15 8:50 UTC (permalink / raw)
To: openembedded-core, Denys Dmytriyenko; +Cc: Tom Rini
>> Isn't it "Upstream-Status: Backport [URL]"?
>>
>> Also, what were the changes in v2 and v3 of this patch?
>
> Yes, it should be backport and the header is to be included in the
> patch file, not on the commit log
Sorry, I thought it was Accepted because there is not (yet) any official
upstream version with the patch. And my v2 and v3 patches were the
attempts at fixing my initially botched Upstream-Status reference. I
guess that wasn't clear from the context.
Patch v4 in next message. I switched to Backport and removed it from the
commit message.
--
Kristian
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v4] u-boot-fw-utils: Fix broken makefile in v2017.11.
2017-12-15 8:50 ` Kristian Amlie
@ 2017-12-15 8:50 ` Kristian Amlie
0 siblings, 0 replies; 12+ messages in thread
From: Kristian Amlie @ 2017-12-15 8:50 UTC (permalink / raw)
To: openembedded-core, Denys Dmytriyenko; +Cc: Tom Rini
See the patch for details. This patch has already been applied
upstream, but we need it for v2017.11.
Signed-off-by: Kristian Amlie <kristian.amlie@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..2a8dd1e
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch
@@ -0,0 +1,41 @@
+From 8ff69a3f4db024ece80b89cf23ca9f7e6f0fba58 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>
+
+Upstream-Status: Backport [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811]
+
+Signed-off-by: Kristian Amlie <kristian.amlie@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
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-12-15 8:51 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-13 13:25 [PATCH] u-boot-fw-utils: Fix broken makefile in v2017.11 Kristian Amlie
2017-12-13 13:32 ` ✗ patchtest: failure for " Patchwork
2017-12-13 14:03 ` [PATCH v2] " Kristian Amlie
2017-12-13 14:30 ` Tom Rini
2017-12-13 14:52 ` [PATCH v3] " Kristian Amlie
2017-12-13 22:56 ` Tom Rini
2017-12-15 0:22 ` Denys Dmytriyenko
2017-12-15 0:58 ` Otavio Salvador
2017-12-15 8:50 ` Kristian Amlie
2017-12-15 8:50 ` [PATCH v4] " Kristian Amlie
2017-12-13 14:30 ` [PATCH] " Tom Rini
2017-12-13 14:33 ` ✗ patchtest: failure for u-boot-fw-utils: Fix broken makefile in v2017.11. (rev2) Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.