Rebase to same git snapshot that kernel is using for DT Overlays
This commit is contained in:
parent
e4899536af
commit
f6254d6eda
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/dtc-*.tgz
|
||||
/dtc-*.tar.xz
|
||||
/dtc-*.tar.gz
|
||||
/dtc-*.tar.bz2
|
||||
|
10
dtc.spec
10
dtc.spec
@ -1,11 +1,14 @@
|
||||
%define gitshort 0931cea
|
||||
|
||||
Name: dtc
|
||||
Version: 1.4.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3.%{gitshort}%{?dist}
|
||||
Summary: Device Tree Compiler
|
||||
Group: Development/Tools
|
||||
License: GPLv2+
|
||||
URL: http://devicetree.org/Device_Tree_Compiler
|
||||
Source: https://ftp.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
|
||||
# Source: https://ftp.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
|
||||
Source: dtc-%{gitshort}.tar.bz2
|
||||
Patch1: use-tx-as-the-type-specifier-instead-of-zx.patch
|
||||
|
||||
BuildRequires: flex, bison
|
||||
@ -67,6 +70,9 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/ftdump
|
||||
%postun -n libfdt -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Tue Feb 28 2017 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.2-3.0931cea
|
||||
- Rebase to same git snapshot that kernel is using for DT Overlays
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
3d5814e31b2046ef51fca8fece998db0 dtc-1.4.2.tar.xz
|
||||
SHA512 (dtc-0931cea.tar.bz2) = 5294e7edff1844dcb2a90ec7abdcb40541059c9f9d39978f5fdec27cc38a9551d517e57b60eed7e28608ed629f0ddf0214abfb8f5a89df1cd04d6f9e820f4573
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- dtc-1.4.2/fdtdump.c.orig 2016-09-03 12:02:30.000000000 +0100
|
||||
+++ dtc-1.4.2/fdtdump.c 2016-09-11 11:58:07.656497902 +0100
|
||||
@@ -97,7 +97,7 @@
|
||||
--- dtc-1.4.2/fdtdump.c.orig 2016-12-26 22:44:17.000000000 +0000
|
||||
+++ dtc-1.4.2/fdtdump.c 2017-02-28 01:29:28.250537073 +0000
|
||||
@@ -98,7 +98,7 @@
|
||||
p = p_struct;
|
||||
while ((tag = fdt32_to_cpu(GET_CELL(p))) != FDT_END) {
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
(uintptr_t)p - blob_off - 4, tag, tagname(tag));
|
||||
|
||||
if (tag == FDT_BEGIN_NODE) {
|
||||
@@ -137,8 +137,8 @@
|
||||
@@ -138,8 +138,8 @@
|
||||
|
||||
p = PALIGN(p + sz, 4);
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
printf("%*s%s", depth * shift, "", s);
|
||||
utilfdt_print_data(t, sz);
|
||||
printf(";\n");
|
||||
@@ -212,14 +212,14 @@
|
||||
fdt_off_dt_strings(p) < this_len)
|
||||
@@ -222,14 +222,14 @@
|
||||
if (valid_header(p, this_len))
|
||||
break;
|
||||
if (debug)
|
||||
- printf("%s: skipping fdt magic at offset %#zx\n",
|
||||
@ -30,10 +30,10 @@
|
||||
}
|
||||
++p;
|
||||
}
|
||||
if (!p || ((endp - p) < FDT_MAGIC_SIZE))
|
||||
if (!p || endp - p < sizeof(struct fdt_header))
|
||||
die("%s: could not locate fdt magic\n", file);
|
||||
- printf("%s: found fdt at offset %#zx\n", file, p - buf);
|
||||
+ printf("%s: found fdt at offset %#tx\n", file, p - buf);
|
||||
buf = p;
|
||||
}
|
||||
|
||||
} else if (!valid_header(buf, len))
|
||||
die("%s: header is not valid\n", file);
|
||||
|
Loading…
Reference in New Issue
Block a user