From 8b85d76bdfdceb94c8dd2be4273e978f721441c18e962e82d50ffbece4f573ee Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 19 Dec 2018 13:11:21 +0000
Subject: [PATCH] Accepting request 657812 from
 home:jmoellers:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/657812
OBS-URL: https://build.opensuse.org/package/show/Base:System/dtc?expand=0&rev=32
---
 dtc-1.4.4.tar.gz                              |  3 --
 dtc-1.4.7.tar.gz                              |  3 ++
 dtc.changes                                   | 14 +++++++++
 dtc.spec                                      |  8 +++--
 ...-as-the-type-specifier-instead-of-zx.patch | 29 +++++--------------
 5 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 dtc-1.4.4.tar.gz
 create mode 100644 dtc-1.4.7.tar.gz

diff --git a/dtc-1.4.4.tar.gz b/dtc-1.4.4.tar.gz
deleted file mode 100644
index 6f0cb84..0000000
--- a/dtc-1.4.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f2c0bf4d84763595953885bdcd2159b0b85410018c8ba48cc31b3d6e443e4d8
-size 156980
diff --git a/dtc-1.4.7.tar.gz b/dtc-1.4.7.tar.gz
new file mode 100644
index 0000000..7354b8f
--- /dev/null
+++ b/dtc-1.4.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:603d6f4f5f34921b368e6febe6690c89022d098edda77187a758b8eeeeff53ea
+size 191568
diff --git a/dtc.changes b/dtc.changes
index 0d05211..de62ab6 100644
--- a/dtc.changes
+++ b/dtc.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Dec 13 10:55:22 UTC 2018 - josef.moellers@suse.com
+
+- Upgrade to version 1.4.7:
+  * checks.c: Overlay fragments are a special case
+  * checks.c: added handling of various busses (eg PCI, simple,
+    i2c, SPI)
+  * checks.c: added some plausibility and syntax checks mainly
+    for device proerties.
+  * dtc.c: annotate .dts with input source location
+  * some code restructuring, cosmetic changes.
+  * decumentation cleanup and update
+  * some more tests added.
+
 -------------------------------------------------------------------
 Sun Mar 12 09:39:47 UTC 2017 - mpluskal@suse.com
 
diff --git a/dtc.spec b/dtc.spec
index 32640b4..16e921f 100644
--- a/dtc.spec
+++ b/dtc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dtc
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define         sover 1
 Name:           dtc
-Version:        1.4.4
+Version:        1.4.7
 Release:        0
 Summary:        Device-tree compiler
 License:        GPL-2.0+
@@ -30,6 +30,7 @@ Patch3:         dtc-license.patch
 Patch4:         use-tx-as-the-type-specifier-instead-of-zx.patch
 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  valgrind-devel
 
 %description
 PowerPC kernels are moving towards requiring a small Open
@@ -62,7 +63,7 @@ This package provides development files for libfdt
 %prep
 %setup -q
 %patch3
-%patch4
+%patch4 -p1
 
 %build
 make %{?_smp_mflags} V=1
@@ -84,6 +85,7 @@ make %{?_smp_mflags} check
 %{_bindir}/fdtdump
 %{_bindir}/fdtget
 %{_bindir}/fdtput
+%{_bindir}/fdtoverlay
 
 %post -n libfdt%{sover} -p /sbin/ldconfig
 %postun -n libfdt%{sover} -p /sbin/ldconfig
diff --git a/use-tx-as-the-type-specifier-instead-of-zx.patch b/use-tx-as-the-type-specifier-instead-of-zx.patch
index 61f07c7..33fa638 100644
--- a/use-tx-as-the-type-specifier-instead-of-zx.patch
+++ b/use-tx-as-the-type-specifier-instead-of-zx.patch
@@ -1,30 +1,17 @@
-From 46ed9702a0005da87edd0cc3d34dbe24d1526784 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Thu, 6 Jun 2013 17:01:39 +0200
-Subject: [PATCH] use tx as the type specifier instead of zx
-
-A couple of printf() commands use "zx" as a type specifier for printing
-a difference of 2 pointers. "z" means a size_t, but using "t" which is
-ptrdiff_t is correct. The issue was found on s390 (32-bit) where size_t
-is defined as "unsigned long" as opposed to the usual "unsigned int".
----
- fdtdump.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: fdtdump.c
+Index: dtc-1.4.7/fdtdump.c
 ===================================================================
---- fdtdump.c.orig
-+++ fdtdump.c
-@@ -98,7 +98,7 @@ static void dump_blob(void *blob, bool d
+--- dtc-1.4.7.orig/fdtdump.c
++++ dtc-1.4.7/fdtdump.c
+@@ -100,7 +100,7 @@ static void dump_blob(void *blob, bool d
  	p = p_struct;
  	while ((tag = fdt32_to_cpu(GET_CELL(p))) != FDT_END) {
  
--		dumpf("%04zx: tag: 0x%08x (%s)\n",
-+		dumpf("%04tx: tag: 0x%08x (%s)\n",
+-		dumpf("%04zx: tag: 0x%08"PRIx32" (%s)\n",
++		dumpf("%04tx: tag: 0x%08"PRIx32" (%s)\n",
  		        (uintptr_t)p - blob_off - 4, tag, tagname(tag));
  
  		if (tag == FDT_BEGIN_NODE) {
-@@ -138,8 +138,8 @@ static void dump_blob(void *blob, bool d
+@@ -140,8 +140,8 @@ static void dump_blob(void *blob, bool d
  
  		p = PALIGN(p + sz, 4);
  
@@ -35,7 +22,7 @@ Index: fdtdump.c
  		printf("%*s%s", depth * shift, "", s);
  		utilfdt_print_data(t, sz);
  		printf(";\n");
-@@ -222,14 +222,14 @@ int main(int argc, char *argv[])
+@@ -229,14 +229,14 @@ int main(int argc, char *argv[])
  				if (valid_header(p, this_len))
  					break;
  				if (debug)