| Message ID | 2e17e96615b10c843fa81e291fedc48749bd98c0.1573797870.git.sbobroff@linux.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/dtc: bump version to 1.5.1 | expand |
Hello Sam, On Fri, 15 Nov 2019 17:04:34 +1100 Sam Bobroff <sbobroff@linux.ibm.com> wrote: > Updated patch 1 to handle changed context. > Removed patch 2 which is now upstream. > > The update allows QEMU's configure script to successfully detect libfdt. > > Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> We did update to 1.5.1 some time ago, but had to revert, as it was causing too many problems. See the revert comit b78eecb2c2a97742cf5cb7e526dffe01d881e753 for more details. Best regards, Thomas
On Fri, Nov 15, 2019 at 5:45 AM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > > Hello Sam, > > On Fri, 15 Nov 2019 17:04:34 +1100 > Sam Bobroff <sbobroff@linux.ibm.com> wrote: > > > Updated patch 1 to handle changed context. > > Removed patch 2 which is now upstream. > > > > The update allows QEMU's configure script to successfully detect libfdt. > > > > Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> > > We did update to 1.5.1 some time ago, but had to revert, as it was > causing too many problems. > > See the revert comit b78eecb2c2a97742cf5cb7e526dffe01d881e753 for more > details. > > Best regards, > > Thomas > There is a proposed solution but it can wait for the release of 2019.11: https://patchwork.ozlabs.org/patch/1188569/ https://patchwork.ozlabs.org/patch/1188570/
On Fri, 15 Nov 2019 17:04:34 +1100 Sam Bobroff <sbobroff@linux.ibm.com> wrote: > Updated patch 1 to handle changed context. > Removed patch 2 which is now upstream. > > The update allows QEMU's configure script to successfully detect libfdt. > > Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> > --- > Hi everyone, Applied to next after applying the patches from Carlos that avoid the header conflict issue. Thanks! Thomas
Sam, All, On 2019-11-15 17:04 +1100, Sam Bobroff spake thusly: [--SNIP--] > diff --git a/package/dtc/dtc.hash b/package/dtc/dtc.hash > index 4d0aaea601..3adfcc45a9 100644 > --- a/package/dtc/dtc.hash > +++ b/package/dtc/dtc.hash > @@ -1,5 +1,5 @@ > # from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc > -sha256 c672e443c9f7e39f5a7c8e602da6777f9ad55ad70de87de300a43828c8050172 dtc-1.5.0.tar.xz > +sha256 660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f dtc-1.5.1.tar.xz > > # Hash for license files > sha256 171ce1c292cf148a5be9ff95ce7e5c3d79a002721ab8e119eae3c0f5336d2b3d README.license You forgot to update the license hash: http://autobuild.buildroot.org/results/799bddc1467413b1f202a8803e902c797f4f9c92 I've nowre-applied the correcticve patch from Fabrice, that was already also reverted when we reverted the previous bump to 1.5.1, and pushed it to next. Next time, don't forget to run 'make legal-info'. ;-) Regards, Yann E. MORIN.
On Fri, Nov 15, 2019 at 10:04:25PM +0100, Thomas Petazzoni wrote: > On Fri, 15 Nov 2019 17:04:34 +1100 > Sam Bobroff <sbobroff@linux.ibm.com> wrote: > > > Updated patch 1 to handle changed context. > > Removed patch 2 which is now upstream. > > > > The update allows QEMU's configure script to successfully detect libfdt. > > > > Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> > > --- > > Hi everyone, > > Applied to next after applying the patches from Carlos that avoid the > header conflict issue. > > Thanks! > > Thomas Thanks everyone :-) Cheers, Sam. > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
diff --git a/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch index bff5f4c07a..127114e866 100644 --- a/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch +++ b/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch @@ -15,6 +15,8 @@ Signed-off-by: Lothar Felten <lothar.felten@gmail.com> [ThomasDS: also update fdt.h which has the same issue, seen on U-Boot 2011.03] Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> +[SB: Updated to match context change in v1.5.1] +Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> --- libfdt/fdt.h | 4 ++++ libfdt/libfdt.h | 4 ++++ @@ -22,10 +24,11 @@ Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> 3 files changed, 12 insertions(+) diff --git a/libfdt/fdt.h b/libfdt/fdt.h -index 74961f9..2904f48 100644 +index f2e6880..0f1dc4d 100644 --- a/libfdt/fdt.h +++ b/libfdt/fdt.h -@@ -1,3 +1,7 @@ +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ +#ifdef _FDT_H +#warning "Please consider updating your kernel and/or u-boot version" +#define FDT_H @@ -34,10 +37,11 @@ index 74961f9..2904f48 100644 #define FDT_H /* diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h -index 830b77e..bef4566 100644 +index 8037f39..7668432 100644 --- a/libfdt/libfdt.h +++ b/libfdt/libfdt.h -@@ -1,3 +1,7 @@ +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ +#ifdef _LIBFDT_H +#warning "Please consider updating your kernel and/or u-boot version" +#define LIBFDT_H @@ -46,10 +50,11 @@ index 830b77e..bef4566 100644 #define LIBFDT_H /* diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h -index eb20538..6a61e6a 100644 +index 73b6d40..b95a287 100644 --- a/libfdt/libfdt_env.h +++ b/libfdt/libfdt_env.h -@@ -1,3 +1,7 @@ +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ +#ifdef _LIBFDT_ENV_H +#warning "Please consider updating your kernel and/or u-boot version" +#define LIBFDT_ENV_H @@ -58,5 +63,5 @@ index eb20538..6a61e6a 100644 #define LIBFDT_ENV_H /* -- -2.19.2 +2.22.0.216.g00a2a96fc9 diff --git a/package/dtc/0002-Makefile-Add-EXTRA_CFLAGS-variable.patch b/package/dtc/0002-Makefile-Add-EXTRA_CFLAGS-variable.patch deleted file mode 100644 index b3f14a6991..0000000000 --- a/package/dtc/0002-Makefile-Add-EXTRA_CFLAGS-variable.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f7c659d7daff5dbf4a0be959a544f15eab7fc49c Mon Sep 17 00:00:00 2001 -From: Joel Stanley <joel@jms.id.au> -Date: Mon, 22 Jul 2019 12:21:49 +0930 -Subject: [PATCH] Makefile: Add EXTRA_CFLAGS variable - -Distributions packaging dtc may need to set extra flags. Currently when -they do that it overrides the ones set by the makefile. This is -particularly problematic when compiling without yaml, as the yaml -detection is ignored. - - ld: dtc.o: in function `main': - dtc.c:(.text.startup+0x718): undefined reference to `dt_to_yaml' - -This patch provides a EXTRA_CFLAGS variable that is added to the list of -CFLAGS, and can be set on the command line when packaging. - -Signed-off-by: Joel Stanley <joel@jms.id.au> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e6b32cf1cbf5..6807669569b3 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,7 +18,7 @@ CONFIG_LOCALVERSION = - CPPFLAGS = -I libfdt -I . - WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ - -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow --CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) -+CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) - - BISON = bison - LEX = flex --- -2.20.1 - diff --git a/package/dtc/dtc.hash b/package/dtc/dtc.hash index 4d0aaea601..3adfcc45a9 100644 --- a/package/dtc/dtc.hash +++ b/package/dtc/dtc.hash @@ -1,5 +1,5 @@ # from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc -sha256 c672e443c9f7e39f5a7c8e602da6777f9ad55ad70de87de300a43828c8050172 dtc-1.5.0.tar.xz +sha256 660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f dtc-1.5.1.tar.xz # Hash for license files sha256 171ce1c292cf148a5be9ff95ce7e5c3d79a002721ab8e119eae3c0f5336d2b3d README.license diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index 96a64b70e4..c23aa4bffb 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -4,7 +4,7 @@ # ################################################################################ -DTC_VERSION = 1.5.0 +DTC_VERSION = 1.5.1 DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz DTC_SITE = https://www.kernel.org/pub/software/utils/dtc DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library)
Updated patch 1 to handle changed context. Removed patch 2 which is now upstream. The update allows QEMU's configure script to successfully detect libfdt. Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> --- Hi everyone, Recent versions of QEMU can obtain libfdt either from a system location or a local git submodule. However, versions of libfdt before 1.5.1 can't be successfully detected by QEMU's configure script and so the submodule version is always used. For tarball distributions, this isn't a significant problem because libfdt is included in the tarball and it still builds, but when using a local QEMU source directory via QEMU_OVERRIDE_SRCDIR the build always fails: GIT submodule checkout is out of date. Please run scripts/git-submodule.sh update (Running git-submodule-update.sh in the source directory does not fix the problem. It would need to be run in buildroot's build directory during the build phase, where git might not be available.) So here's a bump for dtc (which provides libfdt) which allows QEMU to detect the system (buildroot) version of libfdt and build successfully. Hopefully noone else will have to debug this :-) Cheers, Sam. ...ards-for-older-kernel-u-boot-sources.patch | 19 ++++++---- ...2-Makefile-Add-EXTRA_CFLAGS-variable.patch | 37 ------------------- package/dtc/dtc.hash | 2 +- package/dtc/dtc.mk | 2 +- 4 files changed, 14 insertions(+), 46 deletions(-) delete mode 100644 package/dtc/0002-Makefile-Add-EXTRA_CFLAGS-variable.patch