The patch is now upstream and can be removed. Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com> --- ...-not-attempt-to-use-the-systemwide-libfdt.patch | 52 ---------------------- patches/u-boot-2017.09/series | 5 --- rules/u-boot-tools.make | 4 +- 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch delete mode 100644 patches/u-boot-2017.09/series
diff --git a/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch b/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch deleted file mode 100644 index 94aee2413..000000000 --- a/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kund...@cesnet.cz> -Date: Fri, 3 Nov 2017 03:06:35 +0100 -Subject: [PATCH] Do not attempt to use the systemwide libfdt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -U-Boot bundles a patched copy of libfdt, so it's wrong to attempt to -include it <like/this>. This breaks the build for me when I have dtc -fully installed in my host -- as happened earlier tonight with -Buildroot, for example. - -There are several other occurrences throughout the code where '<libfdt' -matches. I'm not modifying these because I have no clue why the -<systemwide> include style is being used -- IMHO wrongly. - -Signed-off-by: Jan Kundrát <jan.kund...@cesnet.cz> ---- - include/fdt.h | 2 +- - include/libfdt.h | 2 +- - tools/fdtgrep.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/fdt.h b/include/fdt.h -index 7ead62e77715..f40b56c75545 100644 ---- a/include/fdt.h -+++ b/include/fdt.h -@@ -1 +1 @@ --#include <../lib/libfdt/fdt.h> -+#include "../lib/libfdt/fdt.h" -diff --git a/include/libfdt.h b/include/libfdt.h -index 10296a21addf..7ba13e634b65 100644 ---- a/include/libfdt.h -+++ b/include/libfdt.h -@@ -1 +1 @@ --#include <../lib/libfdt/libfdt.h> -+#include "../lib/libfdt/libfdt.h" -diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c -index f51f5f15f549..5897b6d5f780 100644 ---- a/tools/fdtgrep.c -+++ b/tools/fdtgrep.c -@@ -16,8 +16,8 @@ - #include <string.h> - #include <unistd.h> - --#include <../include/libfdt.h> --#include <libfdt_internal.h> -+#include "../include/libfdt.h" -+#include "libfdt_internal.h" - - /* Define DEBUG to get some debugging output on stderr */ - #ifdef DEBUG diff --git a/patches/u-boot-2017.09/series b/patches/u-boot-2017.09/series deleted file mode 100644 index 49260d81a..000000000 --- a/patches/u-boot-2017.09/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 0 -#tag:upstream --start-number 1 -0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch -# a8e035bf38bdaf0a13114ea507417c0d - git-ptx-patches magic diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make index b5d6fdb5c..7bc557246 100644 --- a/rules/u-boot-tools.make +++ b/rules/u-boot-tools.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools # # Paths and names # -U_BOOT_TOOLS_VERSION := 2017.09 -U_BOOT_TOOLS_MD5 := 9f7eb7db4530996a28e86f38f3b3e66f +U_BOOT_TOOLS_VERSION := 2018.01 +U_BOOT_TOOLS_MD5 := b42e45813369f4ae84490a481e531768 U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION) U_BOOT_TOOLS_SUFFIX := tar.bz2 U_BOOT_TOOLS_URL := ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) -- 2.15.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
