From 33a32233986ea0521dccc3542e809fe446f8fbbf42f2b75a0ce083f27aa87770 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 16 Mar 2017 08:38:03 +0000 Subject: [PATCH] Accepting request 478805 from home:pluskalm:branches:Base:System - Update to version 1.4.4: * fdtput: Remove star from value_len documentation * fdtget: Use @return to document the return value * tests: Make realloc_fdt() really allocate *fdt * libfdt: overlay: Check the value of the right variable * dtc: Simplify asm_emit_string() implementation * libfdt: Change names of sparse helper macros * Fix assorted sparse warnings * Clean up gcc attributes * dtc: Don't abuse struct fdt_reserve_entry - Refresh patches - Make building more verbose - Run tests OBS-URL: https://build.opensuse.org/request/show/478805 OBS-URL: https://build.opensuse.org/package/show/Base:System/dtc?expand=0&rev=30 --- dtc-1.4.3.tar.gz | 3 --- dtc-1.4.4.tar.gz | 3 +++ dtc-license.patch | 24 ++++++++++--------- dtc.changes | 17 +++++++++++++ dtc.spec | 15 ++++++------ ...-as-the-type-specifier-instead-of-zx.patch | 6 ++--- 6 files changed, 44 insertions(+), 24 deletions(-) delete mode 100644 dtc-1.4.3.tar.gz create mode 100644 dtc-1.4.4.tar.gz diff --git a/dtc-1.4.3.tar.gz b/dtc-1.4.3.tar.gz deleted file mode 100644 index fcc2548..0000000 --- a/dtc-1.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59c76612661032d7d558deb2d728e637e3bd7256cfcd8bc2f6a8594eebcfaabb -size 157018 diff --git a/dtc-1.4.4.tar.gz b/dtc-1.4.4.tar.gz new file mode 100644 index 0000000..6f0cb84 --- /dev/null +++ b/dtc-1.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f2c0bf4d84763595953885bdcd2159b0b85410018c8ba48cc31b3d6e443e4d8 +size 156980 diff --git a/dtc-license.patch b/dtc-license.patch index 71dba0a..7fda47d 100644 --- a/dtc-license.patch +++ b/dtc-license.patch @@ -1,5 +1,7 @@ ---- GPL.orig 2011-07-01 18:56:55.000000000 +0200 -+++ GPL 2010-03-24 00:34:05.000000000 +0100 +Index: GPL +=================================================================== +--- GPL.orig ++++ GPL @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 @@ -18,7 +20,7 @@ The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public -@@ -15,7 +15,7 @@ +@@ -15,7 +15,7 @@ software--to make sure the software is f General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by @@ -27,7 +29,7 @@ your programs, too. When we speak of free software, we are referring to freedom, not -@@ -55,8 +55,8 @@ +@@ -55,8 +55,8 @@ patent must be licensed for everyone's f The precise terms and conditions for copying, distribution and modification follow. @@ -38,7 +40,7 @@ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains -@@ -110,7 +110,7 @@ +@@ -110,7 +110,7 @@ above, provided that you also meet all o License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) @@ -47,7 +49,7 @@ These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in -@@ -168,7 +168,7 @@ +@@ -168,7 +168,7 @@ access to copy from a designated place, access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. @@ -56,7 +58,7 @@ 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is -@@ -225,7 +225,7 @@ +@@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. @@ -65,7 +67,7 @@ 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License -@@ -255,7 +255,7 @@ +@@ -255,7 +255,7 @@ make exceptions for this. Our decision of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. @@ -74,7 +76,7 @@ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -@@ -277,9 +277,9 @@ +@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @@ -87,7 +89,7 @@ If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it -@@ -303,17 +303,16 @@ +@@ -303,17 +303,16 @@ the "copyright" line and a pointer to wh MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -109,7 +111,7 @@ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. -@@ -336,5 +335,5 @@ +@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the diff --git a/dtc.changes b/dtc.changes index 4a04d0e..0d05211 100644 --- a/dtc.changes +++ b/dtc.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Mar 12 09:39:47 UTC 2017 - mpluskal@suse.com + +- Update to version 1.4.4: + * fdtput: Remove star from value_len documentation + * fdtget: Use @return to document the return value + * tests: Make realloc_fdt() really allocate *fdt + * libfdt: overlay: Check the value of the right variable + * dtc: Simplify asm_emit_string() implementation + * libfdt: Change names of sparse helper macros + * Fix assorted sparse warnings + * Clean up gcc attributes + * dtc: Don't abuse struct fdt_reserve_entry +- Refresh patches +- Make building more verbose +- Run tests + ------------------------------------------------------------------- Fri Mar 3 12:01:08 UTC 2017 - jloeser@suse.com diff --git a/dtc.spec b/dtc.spec index 61fc8a4..32640b4 100644 --- a/dtc.spec +++ b/dtc.spec @@ -18,7 +18,7 @@ %define sover 1 Name: dtc -Version: 1.4.3 +Version: 1.4.4 Release: 0 Summary: Device-tree compiler License: GPL-2.0+ @@ -30,7 +30,6 @@ Patch3: dtc-license.patch Patch4: use-tx-as-the-type-specifier-instead-of-zx.patch BuildRequires: bison BuildRequires: flex -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description PowerPC kernels are moving towards requiring a small Open @@ -63,16 +62,19 @@ This package provides development files for libfdt %prep %setup -q %patch3 -%patch4 -p1 +%patch4 %build -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir} -install -m 644 libfdt/libfdt_env.h %{buildroot}/%{_includedir} +%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir} +install -p -m 644 libfdt/libfdt_env.h %{buildroot}/%{_includedir} rm -f %{buildroot}/%{_libdir}/*.a +%check +make %{?_smp_mflags} check + %files %defattr(-,root,root) %doc README.license Documentation/manual.txt @@ -84,7 +86,6 @@ rm -f %{buildroot}/%{_libdir}/*.a %{_bindir}/fdtput %post -n libfdt%{sover} -p /sbin/ldconfig - %postun -n libfdt%{sover} -p /sbin/ldconfig %files -n libfdt%{sover} diff --git a/use-tx-as-the-type-specifier-instead-of-zx.patch b/use-tx-as-the-type-specifier-instead-of-zx.patch index ce044b4..61f07c7 100644 --- a/use-tx-as-the-type-specifier-instead-of-zx.patch +++ b/use-tx-as-the-type-specifier-instead-of-zx.patch @@ -11,10 +11,10 @@ is defined as "unsigned long" as opposed to the usual "unsigned int". fdtdump.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -Index: dtc-1.4.2/fdtdump.c +Index: fdtdump.c =================================================================== ---- dtc-1.4.2.orig/fdtdump.c -+++ dtc-1.4.2/fdtdump.c +--- fdtdump.c.orig ++++ fdtdump.c @@ -98,7 +98,7 @@ static void dump_blob(void *blob, bool d p = p_struct; while ((tag = fdt32_to_cpu(GET_CELL(p))) != FDT_END) {