Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0ff3adf7a4 |
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,4 +1,2 @@
|
|||||||
/dtc-*.tgz
|
dtc-v1.2.0.tgz
|
||||||
/dtc-*.tar.xz
|
/dtc-v1.3.0.tgz
|
||||||
/dtc-*.tar.gz
|
|
||||||
/dtc-*.tar.bz2
|
|
||||||
|
65
dtc-check.patch
Normal file
65
dtc-check.patch
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
From jwboyer@linux.vnet.ibm.com Tue Jun 28 08:47:09 2011
|
||||||
|
Date: Tue, 28 Jun 2011 08:47:09 -0400
|
||||||
|
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
|
||||||
|
To: Jon Loeliger <jdl@jdl.com>
|
||||||
|
Cc: linuxppc-dev@lists.ozlabs.org
|
||||||
|
Subject: [PATCH] dtc: Remove unused check variable
|
||||||
|
Message-ID: <20110628124709.GC10237@zod.rchland.ibm.com>
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=us-ascii
|
||||||
|
Content-Disposition: inline
|
||||||
|
User-Agent: Mutt/1.5.21 (2010-09-15)
|
||||||
|
Status: RO
|
||||||
|
Content-Length: 1315
|
||||||
|
Lines: 49
|
||||||
|
|
||||||
|
Commit 376ab6f2 removed the old style check functionality from DTC,
|
||||||
|
however the check option and variable were not removed. This leads to
|
||||||
|
build failures when -Werror=unused-but-set-variable is specified:
|
||||||
|
|
||||||
|
dtc.c: In function 'main':
|
||||||
|
dtc.c:102:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable]
|
||||||
|
cc1: all warnings being treated as errors
|
||||||
|
make: *** [dtc.o] Error 1
|
||||||
|
make: *** Waiting for unfinished jobs....
|
||||||
|
|
||||||
|
Remove the check variable.
|
||||||
|
|
||||||
|
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
t a/dtc.c b/dtc.c
|
||||||
|
index cbc0193..15d2fc2 100644
|
||||||
|
--- a/dtc.c
|
||||||
|
+++ b/dtc.c
|
||||||
|
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
|
||||||
|
const char *inform = "dts";
|
||||||
|
const char *outform = "dts";
|
||||||
|
const char *outname = "-";
|
||||||
|
- int force = 0, check = 0, sort = 0;
|
||||||
|
+ int force = 0, sort = 0;
|
||||||
|
const char *arg;
|
||||||
|
int opt;
|
||||||
|
FILE *outf = NULL;
|
||||||
|
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
|
||||||
|
minsize = 0;
|
||||||
|
padsize = 0;
|
||||||
|
|
||||||
|
- while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:vH:s")) != EOF) {
|
||||||
|
+ while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fqb:vH:s")) != EOF) {
|
||||||
|
switch (opt) {
|
||||||
|
case 'I':
|
||||||
|
inform = optarg;
|
||||||
|
@@ -137,9 +137,6 @@ int main(int argc, char *argv[])
|
||||||
|
case 'f':
|
||||||
|
force = 1;
|
||||||
|
break;
|
||||||
|
- case 'c':
|
||||||
|
- check = 1;
|
||||||
|
- break;
|
||||||
|
case 'q':
|
||||||
|
quiet++;
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
52
dtc-flattree.patch
Normal file
52
dtc-flattree.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From jwboyer@linux.vnet.ibm.com Tue Jun 28 09:42:53 2011
|
||||||
|
Date: Tue, 28 Jun 2011 09:42:53 -0400
|
||||||
|
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
|
||||||
|
To: jdl@jdl.com, david@gibson.dropbear.id.au
|
||||||
|
Cc: linuxppc-dev@lists.ozlabs.org
|
||||||
|
Subject: [PATCH] dtc: Remove unused variable in flat_read_mem_reserve
|
||||||
|
Message-ID: <20110628134253.GD10237@zod.rchland.ibm.com>
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=us-ascii
|
||||||
|
Content-Disposition: inline
|
||||||
|
User-Agent: Mutt/1.5.21 (2010-09-15)
|
||||||
|
Status: RO
|
||||||
|
Content-Length: 1865
|
||||||
|
Lines: 68
|
||||||
|
|
||||||
|
The *p variable is declared and used to save inb->ptr, however p is
|
||||||
|
later never used. This has been the case since commit 6c0f3676 and can
|
||||||
|
lead to build failures with -Werror=unused-but-set-variable:
|
||||||
|
|
||||||
|
flattree.c: In function 'flat_read_mem_reserve':
|
||||||
|
flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable]
|
||||||
|
cc1: all warnings being treated as errors
|
||||||
|
make: *** [flattree.o] Error 1
|
||||||
|
|
||||||
|
Remove the variable.
|
||||||
|
|
||||||
|
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/flattree.c b/flattree.c
|
||||||
|
index ead0332..28d0b23 100644
|
||||||
|
--- a/flattree.c
|
||||||
|
+++ b/flattree.c
|
||||||
|
@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
|
||||||
|
{
|
||||||
|
struct reserve_info *reservelist = NULL;
|
||||||
|
struct reserve_info *new;
|
||||||
|
- const char *p;
|
||||||
|
struct fdt_reserve_entry re;
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
|
||||||
|
*
|
||||||
|
* First pass, count entries.
|
||||||
|
*/
|
||||||
|
- p = inb->ptr;
|
||||||
|
while (1) {
|
||||||
|
flat_read_chunk(inb, &re, sizeof(re));
|
||||||
|
re.address = fdt64_to_cpu(re.address);
|
||||||
|
|
||||||
|
|
196
dtc.spec
196
dtc.spec
@ -1,26 +1,24 @@
|
|||||||
Name: dtc
|
Name: dtc
|
||||||
Version: 1.5.1
|
Version: 1.3.0
|
||||||
Release: 1%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Device Tree Compiler
|
Summary: Device Tree Compiler
|
||||||
License: GPLv2+
|
Group: Development/Tools
|
||||||
URL: https://devicetree.org/
|
License: GPLv2+
|
||||||
|
URL: http://git.jdl.com/gitweb/?p=dtc.git;a=summary
|
||||||
|
Source: http://www.jdl.com/software/dtc-v%{version}.tgz
|
||||||
|
Patch0: dtc-check.patch
|
||||||
|
Patch1: dtc-flattree.patch
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
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,177 +26,55 @@ 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 -n dtc-v%{version}
|
||||||
sed -i 's/python2/python3/' pylibfdt/setup.py
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} V=1 CC="gcc $RPM_OPT_FLAGS $RPM_LD_FLAGS"
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
#make install DESTDIR=$RPM_BUILD_ROOT SETUP_PREFIX=$RPM_BUILD_ROOT/usr PREFIX=/usr LIBDIR=%{_libdir}
|
rm -rf $RPM_BUILD_ROOT
|
||||||
PYTHON=python3 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/usr \
|
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr LIBDIR=%{_libdir}
|
||||||
LIBDIR=%{_libdir} BINDIR=%{_bindir} INCLUDEDIR=%{_includedir} V=1
|
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a
|
||||||
|
|
||||||
# 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
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license GPL
|
%defattr(-,root,root,-)
|
||||||
%doc Documentation/manual.txt
|
%doc GPL
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
|
|
||||||
%files -n libfdt
|
%files -n libfdt
|
||||||
%license GPL
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/libfdt-1.5.0.so
|
%doc GPL
|
||||||
|
%{_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
|
||||||
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/libfdt.so
|
%{_libdir}/libfdt.so
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
|
|
||||||
%files -n python3-libfdt
|
%post -n libfdt
|
||||||
%{python3_sitearch}/*
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libfdt
|
||||||
|
/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
|
|
||||||
- Use tar file from kernel.org
|
|
||||||
|
|
||||||
* Mon Jan 5 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.1-1
|
|
||||||
- New dtc 1.4.1 release
|
|
||||||
- Update URL and Sources
|
|
||||||
- Cleanup spec
|
|
||||||
|
|
||||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Dec 21 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.4.0-3
|
|
||||||
- Avoid shell invocation and fix deps of libfdt %%post* scripts.
|
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jun 24 2013 Josh Boyer <jwboyer@redhat.com> - 1.4.0-1
|
|
||||||
- New dtc 1.4.0 release (rhbz 977480)
|
|
||||||
|
|
||||||
* Thu Jun 06 2013 Josh Boyer <jwboyer@redhat.com> - 1.3.0-8
|
|
||||||
- Fix type specifier error (from Dan Horák)
|
|
||||||
|
|
||||||
* Mon Jun 03 2013 Josh Boyer <jwboyer@redhat.com> - 1.3.0-7
|
|
||||||
- Update dtc to include libfdt_env.h (rhbz 969955)
|
|
||||||
|
|
||||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Feb 27 2012 Josh Boyer <jwboyer@redhat.com>
|
* Mon Feb 27 2012 Josh Boyer <jwboyer@redhat.com>
|
||||||
- Don't package ftdump (rhbz 797805)
|
- Don't package ftdump (rhbz 797805)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user