Compare commits
No commits in common. "master" and "f27" have entirely different histories.
85
dtc.spec
85
dtc.spec
|
|
@ -1,15 +1,15 @@
|
|||
Name: dtc
|
||||
Version: 1.5.1
|
||||
Version: 1.4.6
|
||||
Release: 1%{?dist}
|
||||
Summary: Device Tree Compiler
|
||||
License: GPLv2+
|
||||
URL: https://devicetree.org/
|
||||
|
||||
Source0: https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
|
||||
Source: https://ftp.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
|
||||
Patch1: use-tx-as-the-type-specifier-instead-of-zx.patch
|
||||
|
||||
BuildRequires: gcc make
|
||||
BuildRequires: flex bison swig
|
||||
BuildRequires: python3-devel python3-setuptools
|
||||
BuildRequires: python2-devel python2-setuptools
|
||||
|
||||
%description
|
||||
Devicetree is a data structure for describing hardware. Rather than hard coding
|
||||
|
|
@ -33,38 +33,32 @@ Requires: libfdt = %{version}-%{release}
|
|||
%description -n libfdt-devel
|
||||
This package provides development files for libfdt
|
||||
|
||||
%package -n libfdt-static
|
||||
Summary: Static version of device tree library
|
||||
Requires: libfdt-devel = %{version}-%{release}
|
||||
|
||||
%description -n libfdt-static
|
||||
This package provides the static library of libfdt
|
||||
|
||||
%package -n python3-libfdt
|
||||
Summary: Python 3 bindings for device tree library
|
||||
%package -n python2-libfdt
|
||||
Summary: Python 2 bindings for device tree library
|
||||
%{?python_provide:%python_provide python2-libfdt}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n python3-libfdt
|
||||
%description -n python2-libfdt
|
||||
This package provides python2 bindings for libfdt
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
sed -i 's/python2/python3/' pylibfdt/setup.py
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} V=1 CC="gcc $RPM_OPT_FLAGS $RPM_LD_FLAGS"
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
%install
|
||||
#make install DESTDIR=$RPM_BUILD_ROOT SETUP_PREFIX=$RPM_BUILD_ROOT/usr PREFIX=/usr LIBDIR=%{_libdir}
|
||||
PYTHON=python3 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/usr \
|
||||
LIBDIR=%{_libdir} BINDIR=%{_bindir} INCLUDEDIR=%{_includedir} V=1
|
||||
make install DESTDIR=$RPM_BUILD_ROOT SETUP_PREFIX=$RPM_BUILD_ROOT/usr PREFIX=/usr 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 $RPM_BUILD_ROOT/%{_bindir}/ftdump
|
||||
|
||||
%ldconfig_scriptlets -n libfdt
|
||||
%post -n libfdt -p /sbin/ldconfig
|
||||
|
||||
%postun -n libfdt -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license GPL
|
||||
|
|
@ -73,60 +67,17 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/ftdump
|
|||
|
||||
%files -n libfdt
|
||||
%license GPL
|
||||
%{_libdir}/libfdt-1.5.0.so
|
||||
%{_libdir}/libfdt-%{version}.so
|
||||
%{_libdir}/libfdt.so.*
|
||||
|
||||
%files -n libfdt-static
|
||||
%{_libdir}/libfdt.a
|
||||
|
||||
%files -n libfdt-devel
|
||||
%{_libdir}/libfdt.so
|
||||
%{_includedir}/*
|
||||
|
||||
%files -n python3-libfdt
|
||||
%{python3_sitearch}/*
|
||||
%files -n python2-libfdt
|
||||
%{python_sitearch}/*
|
||||
|
||||
%changelog
|
||||
* Wed Sep 11 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.1-1
|
||||
- New dtc 1.5.1 release
|
||||
|
||||
* Tue Sep 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.0-3
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Mar 12 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.0-1
|
||||
- New dtc 1.5.0 release
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jan 15 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.7-2
|
||||
- Upstream fix for crash (rhbz 1663054)
|
||||
|
||||
* Sat Aug 18 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.7-1
|
||||
- New dtc 1.4.7 release
|
||||
|
||||
* Tue Jul 17 2018 Miro Hrončok <mhroncok@redhat.com> - 1.4.6-7
|
||||
- Update Python macros to new packaging standards
|
||||
(See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package)
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jun 06 2018 Bas Mevissen <abuse@basmevissen.nl> 1.4.6-5
|
||||
- Add static library package, see BZ#1440975
|
||||
|
||||
* Wed Mar 7 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.6-4
|
||||
- Add gcc BR
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Jan 26 2018 Florian Weimer <fweimer@redhat.com> - 1.4.6-2
|
||||
- Use Fedora build flags during build
|
||||
|
||||
* Mon Jan 22 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.6-1
|
||||
- New dtc 1.4.6 release
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (dtc-1.5.1.tar.xz) = 9e17103d791c71f1ad5d86ab6ac629d523d9add684c9cccb1624214d6c65e5c29776c23a2ad70597420b043bb5dfd412bf4beafd74729f02309d399d9639da83
|
||||
SHA512 (dtc-1.4.6.tar.xz) = b52862159cbf9e6e8e1ecb5844e16c81a0b9c4df255366f8a48b15cb7e080754c142da7432de2542485fce70bb2a4fa76df6d1f93cbf0118e8dbe677153b9da8
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
--- 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) {
|
||||
|
||||
- dumpf("%04zx: tag: 0x%08x (%s)\n",
|
||||
+ dumpf("%04tx: tag: 0x%08x (%s)\n",
|
||||
(uintptr_t)p - blob_off - 4, tag, tagname(tag));
|
||||
|
||||
if (tag == FDT_BEGIN_NODE) {
|
||||
@@ -138,8 +138,8 @@
|
||||
|
||||
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");
|
||||
@@ -222,14 +222,14 @@
|
||||
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);
|
||||
Loading…
Reference in New Issue