Compare commits
No commits in common. "master" and "f22" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,4 +1,3 @@
|
|||||||
/dtc-*.tgz
|
/dtc-*.tgz
|
||||||
/dtc-*.tar.xz
|
/dtc-*.tar.xz
|
||||||
/dtc-*.tar.gz
|
/dtc-*.tar.gz
|
||||||
/dtc-*.tar.bz2
|
|
||||||
|
150
dtc.spec
150
dtc.spec
@ -1,26 +1,22 @@
|
|||||||
Name: dtc
|
Name: dtc
|
||||||
Version: 1.5.1
|
Version: 1.4.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Device Tree Compiler
|
Summary: Device Tree Compiler
|
||||||
License: GPLv2+
|
Group: Development/Tools
|
||||||
URL: https://devicetree.org/
|
License: GPLv2+
|
||||||
|
URL: http://devicetree.org/Device_Tree_Compiler
|
||||||
|
Source: https://ftp.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
|
||||||
|
Patch1: use-tx-as-the-type-specifier-instead-of-zx.patch
|
||||||
|
|
||||||
Source0: https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
|
BuildRequires: flex, bison
|
||||||
|
|
||||||
BuildRequires: gcc make
|
|
||||||
BuildRequires: flex bison swig
|
|
||||||
BuildRequires: python3-devel python3-setuptools
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Devicetree is a data structure for describing hardware. Rather than hard coding
|
The Device Tree Compiler generates flattened Open Firmware style device trees
|
||||||
every detail of a device into an operating system, many aspects of the hardware
|
for use with PowerPC machines that lack an Open Firmware implementation
|
||||||
can be described in a data structure that is passed to the operating system at
|
|
||||||
boot time. The devicetree is used by OpenFirmware, OpenPOWER Abstraction Layer
|
|
||||||
(OPAL), Power Architecture Platform Requirements (PAPR) and in the standalone
|
|
||||||
Flattened Device Tree (FDT) form.
|
|
||||||
|
|
||||||
%package -n libfdt
|
%package -n libfdt
|
||||||
Summary: Device tree library
|
Summary: Device tree library
|
||||||
|
Group: Development/Libraries
|
||||||
|
|
||||||
%description -n libfdt
|
%description -n libfdt
|
||||||
libfdt is a library to process Open Firmware style device trees on various
|
libfdt is a library to process Open Firmware style device trees on various
|
||||||
@ -28,142 +24,46 @@ architectures.
|
|||||||
|
|
||||||
%package -n libfdt-devel
|
%package -n libfdt-devel
|
||||||
Summary: Development headers for device tree library
|
Summary: Development headers for device tree library
|
||||||
|
Group: Development/Libraries
|
||||||
Requires: libfdt = %{version}-%{release}
|
Requires: libfdt = %{version}-%{release}
|
||||||
|
|
||||||
%description -n libfdt-devel
|
%description -n libfdt-devel
|
||||||
This package provides development files for libfdt
|
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
|
|
||||||
%{?python_provide:%python_provide python2-libfdt}
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description -n python3-libfdt
|
|
||||||
This package provides python2 bindings for libfdt
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%setup -q
|
||||||
sed -i 's/python2/python3/' pylibfdt/setup.py
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} V=1 CC="gcc $RPM_OPT_FLAGS $RPM_LD_FLAGS"
|
make %{?_smp_mflags} V=1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
#make install DESTDIR=$RPM_BUILD_ROOT SETUP_PREFIX=$RPM_BUILD_ROOT/usr PREFIX=/usr LIBDIR=%{_libdir}
|
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr LIBDIR=%{_libdir}
|
||||||
PYTHON=python3 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/usr \
|
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a
|
||||||
LIBDIR=%{_libdir} BINDIR=%{_bindir} INCLUDEDIR=%{_includedir} V=1
|
|
||||||
|
|
||||||
# we don't want or need ftdump and it conflicts with freetype-demos, so drop
|
# we don't want or need ftdump and it conflicts with freetype-demos, so drop
|
||||||
# it (rhbz 797805)
|
# it (rhbz 797805)
|
||||||
rm -f $RPM_BUILD_ROOT/%{_bindir}/ftdump
|
rm -f $RPM_BUILD_ROOT/%{_bindir}/ftdump
|
||||||
|
|
||||||
%ldconfig_scriptlets -n libfdt
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license GPL
|
%doc GPL Documentation/manual.txt
|
||||||
%doc Documentation/manual.txt
|
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
|
|
||||||
%files -n libfdt
|
%files -n libfdt
|
||||||
%license GPL
|
%doc GPL
|
||||||
%{_libdir}/libfdt-1.5.0.so
|
%{_libdir}/libfdt-%{version}.so
|
||||||
%{_libdir}/libfdt.so.*
|
%{_libdir}/libfdt.so.*
|
||||||
|
|
||||||
%files -n libfdt-static
|
|
||||||
%{_libdir}/libfdt.a
|
|
||||||
|
|
||||||
%files -n libfdt-devel
|
%files -n libfdt-devel
|
||||||
%{_libdir}/libfdt.so
|
%{_libdir}/libfdt.so
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
|
|
||||||
%files -n python3-libfdt
|
%post -n libfdt -p /sbin/ldconfig
|
||||||
%{python3_sitearch}/*
|
|
||||||
|
%postun -n libfdt -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%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
|
|
||||||
|
|
||||||
* Thu Sep 28 2017 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.5-1
|
|
||||||
- New dtc 1.4.5 release
|
|
||||||
|
|
||||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.4-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jun 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.4-2
|
|
||||||
- Add upstream patches for python bindings
|
|
||||||
|
|
||||||
* Fri Mar 17 2017 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.4-1
|
|
||||||
- New dtc 1.4.4 release
|
|
||||||
|
|
||||||
* 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
|
|
||||||
|
|
||||||
* Sun Sep 11 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.2-1
|
|
||||||
- New dtc 1.4.2 release
|
|
||||||
|
|
||||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jun 16 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.1-4
|
|
||||||
- Use %%license
|
|
||||||
|
|
||||||
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.4.1-3
|
|
||||||
- Rebuilt for Fedora 23 Change
|
|
||||||
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
|
||||||
|
|
||||||
* Mon Jan 5 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.1-2
|
* Mon Jan 5 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.1-2
|
||||||
- Use tar file from kernel.org
|
- Use tar file from kernel.org
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (dtc-1.5.1.tar.xz) = 9e17103d791c71f1ad5d86ab6ac629d523d9add684c9cccb1624214d6c65e5c29776c23a2ad70597420b043bb5dfd412bf4beafd74729f02309d399d9639da83
|
2c977ced2e900a397b2db846ae68ef89 dtc-1.4.1.tar.xz
|
||||||
|
57
use-tx-as-the-type-specifier-instead-of-zx.patch
Normal file
57
use-tx-as-the-type-specifier-instead-of-zx.patch
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
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(-)
|
||||||
|
|
||||||
|
diff --git a/fdtdump.c b/fdtdump.c
|
||||||
|
index 723770d..c5811f0 100644
|
||||||
|
--- a/fdtdump.c
|
||||||
|
+++ b/fdtdump.c
|
||||||
|
@@ -95,7 +95,7 @@ static void dump_blob(void *blob, bool debug)
|
||||||
|
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) {
|
||||||
|
@@ -135,8 +135,8 @@ static void dump_blob(void *blob, bool debug)
|
||||||
|
|
||||||
|
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");
|
||||||
|
@@ -210,14 +210,14 @@ int main(int argc, char *argv[])
|
||||||
|
fdt_off_dt_strings(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)
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
Loading…
Reference in New Issue
Block a user