diff --git a/checks-Use-proper-format-modifier-for-size_t.patch b/checks-Use-proper-format-modifier-for-size_t.patch deleted file mode 100644 index 71bf31c..0000000 --- a/checks-Use-proper-format-modifier-for-size_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 497432fd2131967f349e69dc5d259072151cc4b4 Mon Sep 17 00:00:00 2001 -From: Thierry Reding -Date: Wed, 27 Sep 2017 15:04:09 +0200 -Subject: [PATCH 1/3] checks: Use proper format modifier for size_t - -The size of size_t can vary between architectures, so using %ld isn't -going to work on 32-bit builds. Use the %zu modifier to make sure it is -always correct. - -Signed-off-by: Thierry Reding -Acked-by: Rob Herring -Signed-off-by: David Gibson ---- - checks.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/checks.c b/checks.c -index 902f2e3..08a3a29 100644 ---- a/checks.c -+++ b/checks.c -@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check *c, - int cell, cellsize = 0; - - if (prop->val.len % sizeof(cell_t)) { -- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s", -+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s", - prop->name, prop->val.len, sizeof(cell_t), node->fullpath); - return; - } -@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c, - return; - - if (irq_prop->val.len % sizeof(cell_t)) -- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s", -+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s", - irq_prop->name, irq_prop->val.len, sizeof(cell_t), - node->fullpath); - --- -2.13.5 - diff --git a/dtc.spec b/dtc.spec index 1b722c8..146c73e 100644 --- a/dtc.spec +++ b/dtc.spec @@ -1,5 +1,5 @@ Name: dtc -Version: 1.4.5 +Version: 1.4.6 Release: 1%{?dist} Summary: Device Tree Compiler License: GPLv2+ @@ -7,7 +7,6 @@ URL: https://devicetree.org/ Source: https://ftp.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz Patch1: use-tx-as-the-type-specifier-instead-of-zx.patch -Patch2: checks-Use-proper-format-modifier-for-size_t.patch BuildRequires: flex bison swig BuildRequires: python2-devel python2-setuptools @@ -45,7 +44,6 @@ This package provides python2 bindings for libfdt %prep %setup -q %patch1 -p1 -%patch2 -p1 %build make %{?_smp_mflags} V=1 @@ -63,13 +61,11 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/ftdump %postun -n libfdt -p /sbin/ldconfig %files -%{!?_licensedir:%global license %%doc} %license GPL %doc Documentation/manual.txt %{_bindir}/* %files -n libfdt -%{!?_licensedir:%global license %%doc} %license GPL %{_libdir}/libfdt-%{version}.so %{_libdir}/libfdt.so.* @@ -82,6 +78,9 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/ftdump %{python_sitearch}/* %changelog +* Mon Jan 22 2018 Peter Robinson 1.4.6-1 +- New dtc 1.4.6 release + * Thu Sep 28 2017 Peter Robinson 1.4.5-1 - New dtc 1.4.5 release diff --git a/sources b/sources index 6806445..093f6ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dtc-1.4.5.tar.xz) = fb51f1bfe624cbfc95ad1ab22f4f8c9f6c5ec02be6798e81161d89f444c86c9538a96b3122b53eef6c0288a5790a817e7913d59c78fa5af3876b85137acf9a93 +SHA512 (dtc-1.4.6.tar.xz) = b52862159cbf9e6e8e1ecb5844e16c81a0b9c4df255366f8a48b15cb7e080754c142da7432de2542485fce70bb2a4fa76df6d1f93cbf0118e8dbe677153b9da8