$ git show --format=fuller --patch-with-stat --summary 2528207f9772790b26a524e45c5a06be0ce31567
commit 2528207f9772790b26a524e45c5a06be0ce31567
Author: Alex <alexander@mezon.ru>
AuthorDate: Fri Apr 17 14:38:28 2020 +0000
Commit: Alex <alexander@mezon.ru>
CommitDate: Fri Apr 17 14:38:28 2020 +0000
1.6.0
---
.abf.yml | 2 +-
dtc.spec | 41 +++++++++++++++---------
use-tx-as-the-type-specifier-instead-of-zx.patch | 40 -----------------------
3 files changed, 26 insertions(+), 57 deletions(-)
delete mode 100644 use-tx-as-the-type-specifier-instead-of-zx.patch
diff --git a/.abf.yml b/.abf.yml
index 0176ce6..886acc0 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- dtc-1.4.7.tar.xz: f9724c51caae4fef4da0c8a5d52e9d4d9fc7e8af
+ dtc-1.6.0.tar.xz: 3e6ab5121dcfe5ff9f8b0503becfcf687d5d4434
diff --git a/dtc.spec b/dtc.spec
index 9a8ddcc..f3ce97d 100644
--- a/dtc.spec
+++ b/dtc.spec
@@ -2,20 +2,20 @@
%define major 4
%define libname %mklibname fdt %{api} %{major}
%define devname %mklibname -d fdt %{api}
+%define devnamestatic %mklibname -d fdt_static %{api}
Name: dtc
-Version: 1.4.7
-Release: 2
+Version: 1.6.0
+Release: 1
Summary: Device Tree Compiler
Group: Development/Other
License: GPLv2+
URL: http://devicetree.org/Device_Tree_Compiler
Source0: https://www.kernel.org/pub/software/utils/dtc/%{name}-%{version}.tar.xz
-Patch0: use-tx-as-the-type-specifier-instead-of-zx.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: swig
-BuildRequires: pkgconfig(python2)
+BuildRequires: pkgconfig(python3)
%description
The Device Tree Compiler generates flattened Open Firmware style device trees
@@ -40,17 +40,27 @@ Provides: fdt-devel = %{version}-%{release}
%description -n %{devname}
This package provides development files for libfdt
-%package -n python2-%{name}
+%package -n %{devnamestatic}
+Summary: Development headers for device tree library
+Group: System/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Provides: fdt-static-devel = %{version}-%{release}
+
+%description -n %{devnamestatic}
+This package provides development files for libfdt
+
+%package -n python-%{name}
Summary: Python 2 bindings for %{name}
-Provides: python2-libfdt = %{EVRD}
+Provides: python3-libfdt = %{EVRD}
Requires: %{name} = %{EVRD}
-%description -n python2-%{name}
-This package provides python2 bindings for %{name}.
+%description -n python-%{name}
+This package provides python3 bindings for %{name}.
%prep
%setup -q
%autopatch -p1
+sed -i 's/python2/python3/' pylibfdt/setup.py
%build
%setup_compile_flags
@@ -68,12 +78,8 @@ sed -i \
%make CC=%{__cc} LDFLAGS="%{optflags}" WARNINGS+=-Wno-macro-redefined
%install
-%makeinstall_std SETUP_PREFIX=%{buildroot}%{_prefix} PREFIX=%{_prefix} LIBDIR=%{_libdir}
-find %{buildroot} -type f -name "*.a" -delete
-
-# we don't want or need ftdump and it conflicts with freetype-demos, so drop
-# it (rhbz 797805)
-rm -f %{buildroot}/%{_bindir}/ftdump
+%make_install DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/usr \
+ LIBDIR=%{_libdir} BINDIR=%{_bindir} INCLUDEDIR=%{_includedir} V=1
%files
%{_bindir}/*
@@ -87,5 +93,8 @@ rm -f %{buildroot}/%{_bindir}/ftdump
%{_libdir}/libfdt.so
%{_includedir}/*
-%files -n python2-%{name}
-%{python2_sitearch}/*
+%files -n %{devnamestatic}
+%{_libdir}/libfdt.a
+
+%files -n python-%{name}
+%{python3_sitearch}/*
diff --git a/use-tx-as-the-type-specifier-instead-of-zx.patch b/use-tx-as-the-type-specifier-instead-of-zx.patch
deleted file mode 100644
index ff32348..0000000
--- a/use-tx-as-the-type-specifier-instead-of-zx.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up dtc-1.4.7/fdtdump.c.0000~ dtc-1.4.7/fdtdump.c
---- dtc-1.4.7/fdtdump.c.0000~ 2018-07-23 05:00:50.000000000 +0200
-+++ dtc-1.4.7/fdtdump.c 2018-08-27 23:29:47.883763930 +0200
-@@ -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%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) {
-@@ -140,8 +140,8 @@ static void dump_blob(void *blob, bool d
-
- p = PALIGN(p + sz, 4);
-
-- dumpf("%04zx: string: %s\n", (uintptr_t)s - blob_off, s);
-- dumpf("%04zx: value\n", (uintptr_t)t - blob_off);
-+ dumpf("%04tx: string: %s\n", (uintptr_t)s - blob_off, s);
-+ dumpf("%04tx: value\n", (uintptr_t)t - blob_off);
- printf("%*s%s", depth * shift, "", s);
- utilfdt_print_data(t, sz);
- printf(";\n");
-@@ -229,14 +229,14 @@ int main(int argc, char *argv[])
- if (valid_header(p, this_len))
- break;
- if (debug)
-- printf("%s: skipping fdt magic at offset %#zx\n",
-+ printf("%s: skipping fdt magic at offset %#tx\n",
- file, p - buf);
- }
- ++p;
- }
- 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);