Hello community,
here is the log from the commit of package librtas for openSUSE:Factory checked
in at 2016-07-09 09:20:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/librtas (Old)
and /work/SRC/openSUSE:Factory/.librtas.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librtas"
Changes:
--------
--- /work/SRC/openSUSE:Factory/librtas/librtas-doc.changes 2016-06-15
09:26:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.librtas.new/librtas-doc.changes 2016-07-09
09:20:13.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 27 11:32:47 UTC 2016 - norm...@linux.vnet.ibm.com
+
+- version update to 2.0.0 (bsc#981294)
+ * SO version change from 1 -> 2
+ * generate static libraries
+ * minor fixes (see Changelog)
+
+-------------------------------------------------------------------
librtas.changes: same change
Old:
----
librtas-1.4.0.tar.gz
New:
----
librtas-2.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ librtas-doc.spec ++++++
--- /var/tmp/diff_new_pack.2GRAeP/_old 2016-07-09 09:20:16.000000000 +0200
+++ /var/tmp/diff_new_pack.2GRAeP/_new 2016-07-09 09:20:16.000000000 +0200
@@ -17,7 +17,7 @@
Name: librtas-doc
-Version: 1.4.0
+Version: 2.0.0
Release: 0
BuildRequires: doxygen
BuildRequires: fdupes
++++++ librtas.spec ++++++
--- /var/tmp/diff_new_pack.2GRAeP/_old 2016-07-09 09:20:16.000000000 +0200
+++ /var/tmp/diff_new_pack.2GRAeP/_new 2016-07-09 09:20:16.000000000 +0200
@@ -16,8 +16,10 @@
#
+%define sover 2
+
Name: librtas
-Version: 1.4.0
+Version: 2.0.0
Release: 0
Summary: Libraries to provide access to RTAS calls and RTAS events
License: LGPL-2.1+
@@ -42,16 +44,24 @@
%package devel
Summary: Devel librtas files
Group: Development/Libraries/C and C++
-Requires: librtas1 = %{version}
+Requires: %{name}%{sover} = %{version}
%description devel
This package provides devel files of librtas
-%package -n librtas1
+%package devel-static
+Summary: Static librtas files
+Group: Development/Libraries/C and C++
+Requires: %{name}%{sover} = %{version}
+
+%description devel-static
+This package provides devel files of librtas
+
+%package -n %{name}%{sover}
Summary: Libraries to provide access to RTAS calls and RTAS events
Group: System/Libraries
-%description -n librtas1
+%description -n %{name}%{sover}
The librtas shared library provides userspace with an interface through
which certain RTAS calls can be made. The library uses either of the
RTAS User Module or the RTAS system call to direct the kernel in making
@@ -74,12 +84,13 @@
# documents are in -doc subpackage
rm -rf %buildroot/%_docdir
/sbin/ldconfig -n %buildroot%{_libdir}
+chmod -x %{buildroot}%{_libdir}/*.a
-%post -n librtas1 -p /sbin/ldconfig
+%post -n %{name}%{sover} -p /sbin/ldconfig
-%postun -n librtas1 -p /sbin/ldconfig
+%postun -n %{name}%{sover} -p /sbin/ldconfig
-%files -n librtas1
+%files -n %{name}%{sover}
%defattr(-, root, root)
%doc COPYING.LESSER Changelog README
%{_libdir}/lib*.so.*
@@ -87,8 +98,16 @@
%files devel
%defattr(-, root, root)
%doc COPYING.LESSER
-/usr/include/*
%{_libdir}/librtasevent.so
%{_libdir}/librtas.so
+%{_includedir}/librtas.h
+%{_includedir}/librtasevent.h
+%{_includedir}/librtasevent_v4.h
+%{_includedir}/librtasevent_v6.h
+
+%files devel-static
+%defattr(-,root,root)
+%{_libdir}/librtas.a
+%{_libdir}/librtasevent.a
%changelog
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.2GRAeP/_old 2016-07-09 09:20:16.000000000 +0200
+++ /var/tmp/diff_new_pack.2GRAeP/_new 2016-07-09 09:20:16.000000000 +0200
@@ -1 +1 @@
-librtas1
+librtas2
++++++ librtas-1.4.0.tar.gz -> librtas-2.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/librtas-1.4.0/Changelog new/librtas-2.0.0/Changelog
--- old/librtas-1.4.0/Changelog 2016-01-07 19:20:43.000000000 +0100
+++ new/librtas-2.0.0/Changelog 2016-04-06 05:03:56.000000000 +0200
@@ -1,3 +1,89 @@
+Changelog for librtas-2.0.0
+=======================================
+
+commit da9f484ab2429525101432d57176f376576c3dac
+Author: Adam Conrad <adcon...@0c3.net>
+Date: Tue Apr 5 04:11:23 2016 -0600
+
+ Modernize and parameterize the RPM specfile slightly.
+
+ Signed-off-by: Adam Conrad <adcon...@0c3.net>
+
+commit 9c1591cd262116290b5a651bc09192b6c34da9ce
+Author: Adam Conrad <adcon...@0c3.net>
+Date: Tue Apr 5 01:38:33 2016 -0600
+
+ librtasevent: Fix build failure with -Wformat -Werror=format-security
+
+ Signed-off-by: Adam Conrad <adcon...@0c3.net>
+
+commit 2644f9d269be8b852aa024f1364a5199aac268db
+Author: Adam Conrad <adcon...@0c3.net>
+Date: Tue Apr 5 01:35:51 2016 -0600
+
+ librtas*/Makefile: install/uninstall static libs
+
+ Signed-off-by: Adam Conrad <adcon...@0c3.net>
+
+commit f9bb81502e5fa3894caa1761292ec69580dc087e
+Author: Adam Conrad <adcon...@0c3.net>
+Date: Tue Apr 5 01:30:41 2016 -0600
+
+ librtasevent: Generate static library.
+
+ Signed-off-by: Adam Conrad <adcon...@0c3.net>
+
+commit 2b43240db6fe721288bf09a6f2c75743ae4f8855
+Author: Adam Conrad <adcon...@0c3.net>
+Date: Fri Apr 1 08:34:16 2016 -0600
+
+ Use MAJOR_NO to define the SONAME symlinks, instead of hardcoding "1"
+
+ Signed-off-by: Adam Conrad <adcon...@0c3.net>
+
+Changelog for librtas-1.4.1
+=======================================
+
+commit af07fde662985cb574fe56497847c4c6cdf1d1a8
+Author: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
+Date: Thu Mar 17 18:53:48 2016 -0400
+
+ librtas: Do not enable debug message by default
+
+ Commit eae18de3 removed dbg1 macro. But accidently enabled logging debug
+ message by default. This is confusing end users. Hence remove logging
+ debug message by default.
+
+ Fixes: eae18de3 (librtas: Update the dbg() macro)
+ Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
+ CC: Nathan Fontenot <nf...@linux.vnet.ibm.com>
+
+commit c5e9dcf993e9e20bbe14bc06fb0ec6dd5031f935
+Author: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
+Date: Mon Feb 15 07:33:14 2016 -0500
+
+ librtas: Release lock in error path
+
+ Release RMO buffer lock in error path. Otherwise we will continue to hold
+ the lock and subsequent RMO buffer allocation request fails.
+
+ Reported-by: Bharata B Rao <bhar...@linux.vnet.ibm.com>
+ Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
+
+commit 9683c7b393d48922a14b09a898fbe3cf698cd71a
+Author: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
+Date: Wed Feb 10 16:15:19 2016 -0500
+
+ librtas: Fix Makefile
+
+ Commit 90f24679 switched package license from CPL to LGPL. But we forgot
+ to update Makefile. So creating tarball from source fails. This patch
+ replaces COPYRIGHT with COPYING.LESSER in Makefile.
+
+ Also updated Makefile header with proper license text.
+
+ Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
+
Changelog for librtas-1.4.0
=======================================
@@ -345,210 +431,3 @@
endianness of seq_next also needs to be handled.
Signed-off-by: Thomas Falcon <tlfal...@linux.vnet.ibm.com>
-
-Changelog for librtas-1.3.11
-=======================================
-commit 129fdb4875c8c679418b70c55df9b8b7fe8d6180
-Author: Thomas Falcon <tlfal...@linux.vnet.ibm.com>
-Date: Wed Jun 25 09:55:52 2014 -0500
-
- README: documentation on handling endianness
-
- Signed-off-by: Thomas Falcon <tlfal...@linux.vnet.ibm.com>
-
-commit b13d14ff2dcbe54af61cab19d09be22edc9d74c0
-Author: Maran Pakkirisamy <mar...@linux.vnet.ibm.com>
-Date: Fri Jun 6 14:04:27 2014 -0500
-
- librtas: avoid bashism in rules.mk
-
- Ubuntu has made dash as its default shell (/bin/sh). This leads to build
- being broken on ubuntu.
- More information at: https://wiki.ubuntu.com/DashAsBinSh
- This patch removes bashism and hence fixes the build breakage.
-
- Signed-off-by: Maran Pakkirisamy <mar...@linux.vnet.ibm.com>
-
-commit f9b806b19bbc4df56df6b5dbab1bf9060508b5d9
-Author: Thomas Falcon <tlfal...@linux.vnet.ibm.com>
-Date: Fri Jun 6 14:02:40 2014 -0500
-
- librtas: Little endian support in syscalls
-
- This patch attempts to make rtas syscalls compatible for Little
- Endian systems by ensuring rtas call parameters are Big Endian and
- return values are host endian.
-
- Signed-off-by: Thomas Falcon <tlfal...@linux.vnet.ibm.com>
-
-Changelog for librtas-1.3.10
-=======================================
-commit e0c097d3e0ab65433d4fdc6e18a820c82d909464
-Author: Nathan Fontenot <nf...@linux.vnet.ibm.com>
-Date: Fri Mar 21 15:28:56 2014 -0500
-
- librtasevent: Enable RTAS event parsing on LE systems
-
- The librtasevent library does not work in LE environments. The
- struct's for each rtas event section are defined as a bit field
- to match layout of the rtas event. This librtasevent library
- currently functions by mapping these structs directly the raw
- rtas event that is passed. This works for BE systems because
- rtas events are in BE by definition.
-
- To fix this this patch re-defines the structs that have been
- used to just contain an int for each value in the rtas event
- sections, then adds a raw version of the struct that we can map
- directly onto the passed in rtas event. The raw structs can then
- be traversed an we can do any neccessary conversions to LE values
- in the structs that are passed back to the user.
-
- This patch updates most of the v6 rtas event sections, most notably
- src/fru sections have not been updated yet. At this time there
- are no plans to update pre-v6 rtas events for LE environments.
-
- Signed-off-by: Nathan Fontenot <nf...@linux.vnet.ibm.com>
-
-commit 7eb810757d8573ef47fdc5bd26aa3d9e9afbfd8a
-Author: Greg Kurz <gk...@linux.vnet.ibm.com>
-Date: Fri Mar 21 11:49:13 2014 -0500
-
- librtas: PCI hotplug support vs little endian
-
- The goal of this patch is to enable a little endian process to interact
- with RTAS which is big endian. The rationale is that librtas assumes
- to be passed cpu endian arguments and do the necessary conversions. The
- reasons for this choice are:
- - many arguments are owned by librtas (status, RMO buffer addresses...)
- - nearly all arguments are being used in cpu endian order by librtas:
- if they were assumed to be big endian, we would have to byte swap
- anyway, resulting in an even bigger patch...
-
- Of course, all rules have an exception: the RMO buffer content is not
- seen by librtas, it is up to the caller (drmgr) to do the conversions.
-
- It seems that recent kernels don't have the needed procfs files anymore,
- so this patch only cares about the rtas() syscall based implementation.
-
- As requested by Benjamin Herrenschmidt, the byte swapping should be
- performed in userland AND be careful about corner cases where non
- 32-bit values are being passed:
-
- http://patchwork.ozlabs.org/patch/327089/
-
- We cannot boldly convert all arguments in the sc_rtas_call() function.
-
- For an example, let's look at sc_suspend_me() where we pass a 64 bit value
- split across two arguments. If streamid is ABCDEFGHIJKLMNOP, then it will
- be reassembled by the kernel as IJKLMNOPABCDEFGH before being passed to the
- host...
-
- As a consequence, we can only convert well known parameters in the
- sc_rtas_call() function:
- - token
- - number of input arguments
- - number of return arguments
- - return status (always the first return argument)
-
- All other values must be converted in the caller. Please note that we
- introduce intermediary variables for return values as we do not want
- big endian values to be written in memory where the code assumes they
- are cpu endian.
-
- As a starter, we focus on the RTAS calls involved in PCI hotplug.
- According to section 13.5.3 of the PAPR+, we have:
- - set-power-level
- - get-sensor-state
- - set-indicator
- - ibm,configure-connector (the RMO part is already covered in drmgr)
- <disclaimer>
- We should cover all the calls, but it requires a huge work and we
- only want to enable PCI hotplug here. So yes, all other calls are
- still broken in little endian... some more patching will be needed.
- </disclaimer>
-
- Signed-off-by: Greg Kurz <gk...@linux.vnet.ibm.com>
- Reviewed-by: Laurent Dufour <lduf...@linux.vnet.ibm.com>
-
-Changelog for librtas-1.3.9
-=======================================
-commit 9c5bccb93aa734796df111c2e7c051860b8b30de
-Author: Signed-off-by: Greg Kurz <gk...@linux.vnet.ibm.com>
-Date: Fri Feb 28 07:49:59 2014 -0600
-
- librtas, libofdt: fix endianness issues when accessing the device tree
-
- Signed-off-by: Greg Kurz <gk...@linux.vnet.ibm.com>
-
-commit 399a1962534342c1a153445b587d3fd0c95cfc78
-Merge: e2de13f a057c98
-Author: Nathan Fontenot <nf...@linux.vnet.ibm.com>
-Date: Wed Feb 26 08:22:33 2014 -0600
-
- Merge branch 'master' of ssh://nf...@git.code.sf.net/p/librtas/code
-
-commit e2de13f77b36aff9d55d97ec862261a329262d4a
-Author: Tyrel Datwyler <tyr...@linux.vnet.ibm.com>
-Date: Tue Feb 25 10:09:54 2014 -0600
-
- librtasevent: Add hotplug event implementation
-
- Add event definition and helper functions for hotplug events. This is
- intended for qemu to notify a pseries guest of a hotplug event.
-
- Signed-off-by: Tyrel Datwyler <tyr...@linux.vnet.ibm.com>
-
-commit a057c984394ac5c0a043ecc250073b8606cd38a1
-Author: Tyrel Datwyler <tyr...@linux.vnet.ibm.com>
-Date: Tue Feb 25 10:09:54 2014 -0600
-
- librtasevent: Add hotplug event implementation
-
- Add event definition and helper functions for hotplug events. This is
- intended for qemu to notify a pseries guest of a hotplug event.
-
- Signed-off-by: Tyrel Datwyler <tyr...@linux.vnet.ibm.com>
-
-Changelog for librtas-1.3.8
-=======================================
-commit cd1868315f728ea5e8399df5fb7689a88870d7da
-Author: Nathan Fontenot <nf...@linux.vnet.ibm.com>
-Date: Thu Jan 31 12:27:48 2013 -0600
-
- Identify Platform Resource Reassignment Notifications (PRRN).
-
- Signed-off-by: Nathan Fontenot <nf...@linux.vnet.ibm.com>
-
-
-Changelog for librtas-1.3.7
-=======================================
-commit 0d02142ec36e176694c90ab722aedc75c48801a0
-Author: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
-Date: Tue Dec 18 13:08:09 2012 -0600
-
- librtas allocates buffer space (required for RTAS call) in the RTAS private
- memory area through sc_get_rmo_buffer() which internally allocates memory
- and protects it by acquiring lock on the allocated memory area.
-
- Locking function :
- At present acquire_file_lock() tries to lock the particular memory
- area. If the memory area is already locked then it returns error without
- retrying.
-
- So when two process executes rtas call simultaneously one fails with
- "Unknown librtas I/O" error.
-
- This patch introduces "Wait for lock to be available" instead of
- returning with IO error.
-
- Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
-
-commit aea297b24ed0167970732193bbfd206a6c844dec
-Author: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
-Date: Tue Dec 18 13:06:21 2012 -0600
-
- This patch fixes minor memory leak in librtas.so
-
- Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com>
- Signed-off-by: Nathan Fontenot <nf...@linux.vnet.ibm.com>
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/librtas-1.4.0/Makefile new/librtas-2.0.0/Makefile
--- old/librtas-1.4.0/Makefile 2016-01-07 19:20:43.000000000 +0100
+++ new/librtas-2.0.0/Makefile 2016-04-06 05:03:56.000000000 +0200
@@ -6,7 +6,7 @@
.SILENT:
-FILES = README COPYRIGHT
+FILES = README COPYING.LESSER
SUBDIRS = librtas_src librtasevent_src
TARBALL_FILES += $(FILES) doc/doxygen.rtas doc/doxygen.rtasevent Changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/librtas-1.4.0/librtas.spec.in
new/librtas-2.0.0/librtas.spec.in
--- old/librtas-1.4.0/librtas.spec.in 2016-01-07 19:20:43.000000000 +0100
+++ new/librtas-2.0.0/librtas.spec.in 2016-04-06 05:03:56.000000000 +0200
@@ -1,5 +1,6 @@
%define name librtas
-%define version 1.4.0
+%define version 2.0.0
+%define sover 2
%define release 1
Summary: Libraries to provide access to RTAS calls and RTAS events.
Name: %{name}
@@ -9,6 +10,7 @@
Source: %{name}-%{version}.tar.gz
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: ppc ppc64 ppc64le
%description
@@ -21,6 +23,23 @@
definitions and common routines useful in parsing and dumping
the contents of RTAS events.
+%package devel
+Summary: C header files for development with librtas
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The librtas-devel package contains the header files necessary for
+developing programs using librtas.
+
+%package static
+Summary: Static verions of the librtas libraries
+Group: Development/Libraries
+
+%description static
+The librtas-static package contains the static libraries which
+correspond to the librtas and librtas-devel packages.
+
%prep
%setup -q
@@ -31,32 +50,29 @@
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%post
+ldconfig
+
+%postun
+ldconfig
%files
%defattr(-, root, root)
%{_docdir}/%{name}/COPYING.LESSER
%{_docdir}/%{name}/README
-%{_includedir}/librtas.h
+%{_libdir}/librtas.so.%{sover}
%{_libdir}/librtas.so.%{version}
+%{_libdir}/librtasevent.so.%{version}
+%{_libdir}/librtasevent.so.%{sover}
+
+%files devel
%{_libdir}/librtas.so
%{_libdir}/librtasevent.so
-%{_libdir}/librtasevent.so.1
-%{_libdir}/librtasevent.so.%{version}
+%{_includedir}/librtas.h
%{_includedir}/librtasevent.h
%{_includedir}/librtasevent_v4.h
%{_includedir}/librtasevent_v6.h
-%post
-# Post-install script -------------------------------------------------
-ln -sf %{_libdir}/librtas.so.%{version} %{_libdir}/librtas.so
-ln -sf %{_libdir}/librtas.so.%{version} %{_libdir}/librtas.so.1
-ln -sf %{_libdir}/librtasevent.so.%{version} %{_libdir}/librtasevent.so
-ldconfig
-
-%postun
-# Post-uninstall script -----------------------------------------------
-if [ "$1" = "0" ] ; then # last uninstall
- rm -f %{_libdir}/librtas.so
- rm -f %{_libdir}/librtasevent.so
-fi
-ldconfig
+%files static
+%{_libdir}/librtas.a
+%{_libdir}/librtasevent.a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/librtas-1.4.0/librtas_src/Makefile
new/librtas-2.0.0/librtas_src/Makefile
--- old/librtas-1.4.0/librtas_src/Makefile 2016-01-07 19:20:43.000000000
+0100
+++ new/librtas-2.0.0/librtas_src/Makefile 2016-04-06 05:03:56.000000000
+0200
@@ -2,8 +2,20 @@
# Makefile for librtas
#
# Copyright (C) 2005 IBM Corporation
-# Common Public License Version 1.0 (see COPYRIGHT)
#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
include ../rules.mk
@@ -31,15 +43,17 @@
install:
@$(call install_lib,$(LIBRTAS),$(DESTDIR))
+ @$(call install_lib,$(LIBRTAS_STATIC),$(DESTDIR))
@$(call install_inc,$(HEADERS),$(DESTDIR))
@ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME)
- @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).1
+ @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).$(MAJOR_NO)
uninstall:
@$(call uninstall_lib,$(LIBRTAS),$(DESTDIR))
+ @$(call uninstall_lib,$(LIBRTAS_STATIC),$(DESTDIR))
@$(call uninstall_inc,$(HEADERS),$(DESTDIR))
@rm -f $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME)
- @rm -f $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).1
+ @rm -f $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).$(MAJOR_NO)
clean:
@echo "Cleaning up $(WORK_DIR) files..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/librtas-1.4.0/librtas_src/syscall.h
new/librtas-2.0.0/librtas_src/syscall.h
--- old/librtas-1.4.0/librtas_src/syscall.h 2016-01-07 19:20:43.000000000
+0100
+++ new/librtas-2.0.0/librtas_src/syscall.h 2016-04-06 05:03:56.000000000
+0200
@@ -64,7 +64,7 @@
#define dbg(_fmt, _args...) \
do { \
- if (dbg_lvl >= 0) \
+ if (dbg_lvl > 0) \
printf("librtas %s(): " _fmt, __func__, ##_args); \
} while (0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/librtas-1.4.0/librtas_src/syscall_rmo.c
new/librtas-2.0.0/librtas_src/syscall_rmo.c
--- old/librtas-1.4.0/librtas_src/syscall_rmo.c 2016-01-07 19:20:43.000000000
+0100
+++ new/librtas-2.0.0/librtas_src/syscall_rmo.c 2016-04-06 05:03:56.000000000
+0200
@@ -433,8 +433,10 @@
}
rc = munmap_dev_mem(buf, size);
- if (rc)
+ if (rc) {
+ (void) release_phys_region(phys_addr, size);
return rc;
+ }
rc = release_phys_region(phys_addr, size);
@@ -489,8 +491,10 @@
return rc;
rc = mmap_dev_mem(addr, size, buf);
- if (rc)
+ if (rc) {
+ (void) release_phys_region(addr, size);
return rc;
+ }
*phys_addr = addr;
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/librtas-1.4.0/librtasevent_src/Makefile
new/librtas-2.0.0/librtasevent_src/Makefile
--- old/librtas-1.4.0/librtasevent_src/Makefile 2016-01-07 19:20:43.000000000
+0100
+++ new/librtas-2.0.0/librtasevent_src/Makefile 2016-04-06 05:03:56.000000000
+0200
@@ -2,12 +2,25 @@
# Makefile for librtasevent_src
#
# Copyright (C) 2005 IBM Corporation
-# Common Public License Version 1.0 (see COPYRIGHT)
#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
include ../rules.mk
LIBRE_SONAME = librtasevent.so
+LIBRE_STATIC = librtasevent.a
LIBRE = $(LIBRE_SONAME).$(VERSION)
LIBRE_OBJS = get_rtas_event.o print_rtas_event.o rtas_cpu.o rtas_dump.o
\
@@ -20,23 +33,31 @@
CFLAGS += -fPIC -DPIC -I.
LDFLAGS += -shared -Wl,-soname -Wl,$(LIBRE_SONAME).$(MAJOR_NO)
-all: $(LIBRE_OBJS) $(HEADERS)
+all: libre_shared libre_static
+
+libre_shared: $(LIBRE_OBJS) $(HEADERS)
@echo "LD librtasevent_src/$(LIBRE)..."
@$(CC) $(LIBRE_OBJS) $(LDFLAGS) -o $(LIBRE)
+libre_static: $(LIBRE_OBJS) $(HEADERS)
+ @echo "AR $(LIBRE_STATIC)..."
+ @ar rcs $(LIBRE_STATIC) $(LIBRE_OBJS)
+
install:
@$(call install_lib,$(LIBRE),$(DESTDIR))
+ @$(call install_lib,$(LIBRE_STATIC),$(DESTDIR))
@$(call install_inc,$(LIBRE_HDRS),$(DESTDIR))
@ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRE))/$(LIBRE_SONAME)
- @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRE))/$(LIBRE_SONAME).1
+ @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRE))/$(LIBRE_SONAME).$(MAJOR_NO)
uninstall:
@$(call uninstall_lib,$(LIBRE),$(DESTDIR))
+ @$(call uninstall_lib,$(LIBRE_STATIC),$(DESTDIR))
@$(call uninstall_inc,$(LIBRE_HDRS),$(DESTDIR))
@rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME)
- @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME).1
+ @rm -f $(DESTDIR)/$(LIB_DIR)$(call
is_lib64,$(LIBRE))/$(LIBRE_SONAME).$(MAJOR_NO)
clean:
@echo "Cleaning up $(WORK_DIR) files..."
- @rm -f $(LIBRE_OBJS) $(LIBRE_SONAME) $(LIBRE)
+ @rm -f $(LIBRE_OBJS) $(LIBRE_SONAME) $(LIBRE) $(LIBRE_STATIC)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/librtas-1.4.0/librtasevent_src/print_rtas_event.c
new/librtas-2.0.0/librtasevent_src/print_rtas_event.c
--- old/librtas-1.4.0/librtasevent_src/print_rtas_event.c 2016-01-07
19:20:43.000000000 +0100
+++ new/librtas-2.0.0/librtasevent_src/print_rtas_event.c 2016-04-06
05:03:56.000000000 +0200
@@ -343,7 +343,7 @@
if (newline != NULL) {
prnt_len = newline - &tmpbuf[offset] + 1;
- snprintf(buf + buf_offset, prnt_len, &tmpbuf[offset]);
+ snprintf(buf + buf_offset, prnt_len, "%s",&tmpbuf[offset]);
buf_offset = strlen(buf);
buf_offset += snprintf(buf + buf_offset,
sizeof(buf) - buf_offset, "\n");
@@ -363,7 +363,7 @@
}
/* print up to the last brkpt */
- snprintf(buf + buf_offset, prnt_len, &tmpbuf[offset]);
+ snprintf(buf + buf_offset, prnt_len, "%s", &tmpbuf[offset]);
buf_offset = strlen(buf);
buf_offset += snprintf(buf + buf_offset, sizeof(buf) - buf_offset,
"\n");
@@ -374,10 +374,10 @@
}
prnt_len = snprintf(buf + buf_offset, sizeof(buf) - buf_offset,
- &tmpbuf[offset]);
+ "%s", &tmpbuf[offset]);
line_offset += prnt_len;
- return fprintf(ostream, buf);
+ return fprintf(ostream, "%s", buf);
}
/**
