Hello community, here is the log from the commit of package librtas for openSUSE:Factory checked in at 2016-08-03 11:36:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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.changes 2016-07-09 09:20:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librtas.new/librtas.changes 2016-08-03 11:36:26.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 25 12:37:58 UTC 2016 - jloeser@suse.com + +- fix for opening RTAS error injection facility (bsc#985643) + +- added patches: + * librtas.bug-985643_open_RTAS_error_facility.patch + +------------------------------------------------------------------- New: ---- librtas.bug-985643_open_RTAS_error_facility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librtas-doc.spec ++++++ --- /var/tmp/diff_new_pack.sUdkDT/_old 2016-08-03 11:36:27.000000000 +0200 +++ /var/tmp/diff_new_pack.sUdkDT/_new 2016-08-03 11:36:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package librtas-doc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ librtas.spec ++++++ --- /var/tmp/diff_new_pack.sUdkDT/_old 2016-08-03 11:36:27.000000000 +0200 +++ /var/tmp/diff_new_pack.sUdkDT/_new 2016-08-03 11:36:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package librtas # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ Source0: %{name}-%{version}.tar.gz Source1: baselibs.conf Patch: librtas-failedmagic.patch +Patch1: librtas.bug-985643_open_RTAS_error_facility.patch %description The librtas shared library provides userspace with an interface through @@ -74,6 +75,7 @@ %prep %setup -q %patch +%patch1 -p1 %build make CFLAGS="%optflags -fPIC -g -I $PWD/librtasevent_src" LIB_DIR="%{_libdir}" %{?_smp_mflags} ++++++ librtas.bug-985643_open_RTAS_error_facility.patch ++++++ @@ -, +, @@ --- librtas_src/syscall_calls.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) Index: librtas-2.0.0/librtas_src/syscall_calls.c =================================================================== --- librtas-2.0.0.orig/librtas_src/syscall_calls.c +++ librtas-2.0.0/librtas_src/syscall_calls.c @@ -466,15 +466,20 @@ int rtas_errinjct_close(int otoken) */ int rtas_errinjct_open(int *otoken) { - __be32 be_otoken; + __be32 be_status; int rc, status; rc = sanity_check(); if (rc) return rc; - rc = rtas_call("ibm,open-errinjct", 0, 2, &be_otoken, &status); - *otoken = be32toh(be_otoken); + /* + * Unlike other RTAS calls, here first output parameter is otoken, + * not status. rtas_call converts otoken to host endianess. We + * have to convert status parameter. + */ + rc = rtas_call("ibm,open-errinjct", 0, 2, otoken, &be_status); + status = be32toh(be_status); dbg("(%p) = %d, %d\n", otoken, rc ? rc : status, *otoken); return rc ? rc : status;
participants (1)
-
root@hilbert.suse.de