From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH 21/22] u-boot-tools: version bump 2017.07 -> 2018.01
Date: Tue, 16 Jan 2018 16:50:39 +0100 [thread overview]
Message-ID: <20180116155040.10061-21-clemens.gruber@pqgruber.com> (raw)
In-Reply-To: <20180116155040.10061-1-clemens.gruber@pqgruber.com>
The patch is now upstream and can be removed.
Signed-off-by: Clemens Gruber <clemens.gruber@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.kundrat@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.kundrat@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
next prev parent reply other threads:[~2018-01-16 15:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 15:50 [ptxdist] [PATCH 01/22] coreutils: version bump 8.27 -> 8.29 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 02/22] cryptsetup: version bump 1.7.5 -> 2.0.0 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 03/22] dbus: version bump 1.10.24 -> 1.12.2 Clemens Gruber
2018-01-24 14:40 ` Michael Olbrich
2018-01-16 15:50 ` [ptxdist] [PATCH 04/22] dbus: add upstream patches for OOM conditions Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 05/22] e2fsprogs: version bump 1.43.6 -> 1.43.8 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 06/22] expat: version bump 2.2.4 -> 2.2.5 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 07/22] file: version bump 5.30 -> 5.32 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 08/22] host-meson: version bump 0.43.0 -> 0.44.0 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 09/22] iproute2: version bump 4.13 -> 4.14.1 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 10/22] json-c: version bump 0.12.1 -> 0.13 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 11/22] kexec-tools: version bump 2.0.14 -> 2.0.16 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 12/22] libsodium: version bump 1.0.11 -> 1.0.16 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 13/22] lvm2: version bump 2.02.66 -> 2.02.177 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 14/22] mpg123: version bump 1.25.6 -> 1.25.8 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 15/22] nano: version bump 2.8.4 -> 2.9.2 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 16/22] ninja: version bump 1.7.2 -> 1.8.2 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 17/22] nginx: update pkg-config patches from buildroot Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 18/22] protobuf: version bump 3.3.2 -> 3.5.1 Clemens Gruber
2018-01-25 14:38 ` Michael Olbrich
2018-01-25 15:04 ` Clemens Gruber
2018-01-25 15:24 ` Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 19/22] strace: version bump 4.18 -> 4.20 Clemens Gruber
2018-01-16 15:50 ` [ptxdist] [PATCH 20/22] trace-cmd: version bump 2.6.1 -> 2.6.2 Clemens Gruber
2018-01-16 15:50 ` Clemens Gruber [this message]
2018-01-16 15:50 ` [ptxdist] [PATCH 22/22] util-linux-ng: version bump 2.30.2 -> 2.31.1 Clemens Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180116155040.10061-21-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox