Accepting request 75258 from Base:System

subpackage split more visible, minor spec file clean (forwarded request 75248 from k0da)

OBS-URL: https://build.opensuse.org/request/show/75258
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dtc?expand=0&rev=13
This commit is contained in:
Sascha Peilicke 2011-07-04 11:54:28 +00:00 committed by Git OBS Bridge
parent 375aedb957
commit 6749f8c30d
7 changed files with 223 additions and 19 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a5ccd1dbb012fee852b6fe2281511f76a1132a93ffa2ff3ad0119645ba28402
size 74224

3
dtc-1.3.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5bf37bd79a1bd279207de9875521c4b3481219309647d8fe07d9b07b2b466109
size 87672

30
dtc-check.patch Normal file
View File

@ -0,0 +1,30 @@
--- dtc.c.orig 2011-07-01 23:25:03.000000000 +0200
+++ dtc.c 2011-07-01 23:25:41.000000000 +0200
@@ -99,7 +99,7 @@
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 @@
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 @@
case 'f':
force = 1;
break;
- case 'c':
- check = 1;
- break;
case 'q':
quiet++;
break;

18
dtc-flattree.patch Normal file
View File

@ -0,0 +1,18 @@
--- flattree.c.orig 2011-07-01 23:25:11.000000000 +0200
+++ flattree.c 2011-07-01 23:27:34.000000000 +0200
@@ -697,7 +697,6 @@
{
struct reserve_info *reservelist = NULL;
struct reserve_info *new;
- const char *p;
struct fdt_reserve_entry re;
/*
@@ -706,7 +705,6 @@
*
* First pass, count entries.
*/
- p = inb->ptr;
while (1) {
flat_read_chunk(inb, &re, sizeof(re));
re.address = fdt64_to_cpu(re.address);

118
dtc-license.patch Normal file
View File

@ -0,0 +1,118 @@
--- GPL.orig 2011-07-01 18:56:55.000000000 +0200
+++ GPL 2010-03-24 00:34:05.000000000 +0100
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
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 @@
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
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
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.)
-
+
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 @@
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.
-
+
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 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
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 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
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 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
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 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
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 @@
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
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Jul 1 17:02:06 UTC 2011 - k0da@opensuse.org
- libfdt1 subpackage
libfdt1-devel
- dtc 1.3.0 update
dtc: Add code to make diffing trees easier
dtc: Extend and better test dtbs_equal utility programs
dtc: Audit and fix valgrind errors
Assorted cleanups and extensions for ftdump
Fix dtc bugs for 64-bit compile
- fix URL as mntioned site is no longer available
-------------------------------------------------------------------
Sat Feb 6 18:28:44 UTC 2010 - jengelh@medozas.de

View File

@ -18,15 +18,18 @@
Name: dtc
Url: http://dtc.ozlabs.org/
Version: 1.1.0
Release: 50
Url: http://git.jdl.com/gitweb/?p=dtc.git;a=summary
Version: 1.3.0
Release: 1
BuildRequires: bison flex
Summary: device-tree compiler
Summary: Device-tree compiler
License: GPLv2+
Group: Development/Tools/Building
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: dtc-%{version}.tar.bz2
Patch1: dtc-check.patch
Patch2: dtc-flattree.patch
Patch3: dtc-license.patch
%description
PowerPC kernels are moving towards requiring a small Open
@ -37,32 +40,52 @@ create a static device tree, which is adequate for most embedded
systems (since their topology will not vary across reboots). DTC is
available via a git tree: git://ozlabs.org/srv/projects/dtc/dtc.git
%package -n libfdt1
Summary: Device tree library
Group: Development/Libraries/C and C++
%description -n libfdt1
libfdt is a library to process Open Firmware style device trees on various
architectures.
Authors:
--------
David Gibson <dwg@au1.ibm.com>
%package -n libfdt1-devel
Summary: Development headers for device tree library
Group: Development/Libraries/C and C++
Requires: libfdt1 = %{version}
%description -n libfdt1-devel
This package provides development files for libfdt
%prep
%setup -q -n dtc
%patch1
%patch2
%patch3
%build
make CFLAGS="$RPM_OPT_FLAGS"
%ifnarch %sparc
# dtc's assembly code is incompatible with SPARC relocs
make CFLAGS="$RPM_OPT_FLAGS" check
%endif
make
%install
mkdir -p $RPM_BUILD_ROOT/usr/bin
cp -aL dtc ftdump $RPM_BUILD_ROOT/usr/bin
%make_install PREFIX=/usr LIBDIR=%{_libdir}
rm -f %{buildroot}/%{_libdir}/*.a
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc README.license Documentation/manual.txt
/usr/bin/*
%{_bindir}/*
%files -n libfdt1
%defattr(-,root,root,-)
%doc GPL
%{_libdir}/libfdt-%{version}.so
%{_libdir}/libfdt.so.*
%files -n libfdt1-devel
%defattr(-,root,root,-)
%{_libdir}/libfdt.so
%{_includedir}/*
%changelog