Accepting request 945883 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/945883
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librtas?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger 2022-01-13 22:20:47 +00:00 committed by Git OBS Bridge
commit 9ae22e4d37
5 changed files with 80 additions and 8 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jan 12 13:01:37 UTC 2022 - Michal Suchanek <msuchanek@suse.com>
- librtasevent: Fix memory page address print issue (bsc#1193846 ltc#193949).
+ librtasevent-Fix-memory-page-address-print-issue.patch
-------------------------------------------------------------------
Sun Sep 15 10:13:00 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
- Add -ffat-lto-objects to avoid ppc64le build error
-------------------------------------------------------------------
Mon Jul 2 12:30:18 UTC 2018 - jloeser@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package librtas-doc
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,18 +27,18 @@ BuildRequires: libtool
Summary: Documents for librtas
License: LGPL-2.1-or-later
Group: Documentation/Other
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64 ppc64le
Url: https://github.com/ibm-power-utilities/librtas
URL: https://github.com/ibm-power-utilities/librtas
Source0: https://github.com/ibm-power-utilities/librtas/archive/v%{version}.tar.gz#/librtas-%{version}.tar.gz
Patch0: librtas.fix_doc_path.patch
Patch1: librtasevent-Fix-memory-page-address-print-issue.patch
%description
This package provides librtas documentation
%prep
%setup -n librtas-%{version}
%patch0 -p1
%autopatch -p1
%build
./autogen.sh

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 12 13:01:37 UTC 2022 - Michal Suchanek <msuchanek@suse.com>
- librtasevent: Fix memory page address print issue (bsc#1193846 ltc#193949).
+ librtasevent-Fix-memory-page-address-print-issue.patch
-------------------------------------------------------------------
Sun Sep 15 10:13:00 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package librtas
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -24,15 +24,15 @@ Release: 0
Summary: Libraries to provide access to RTAS calls and RTAS events
License: LGPL-2.1-or-later
Group: System/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64 ppc64le
Url: https://github.com/ibm-power-utilities/librtas
URL: https://github.com/ibm-power-utilities/librtas
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
Source0: https://github.com/ibm-power-utilities/librtas/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf
Patch0: librtas.fix_doc_path.patch
Patch1: librtasevent-Fix-memory-page-address-print-issue.patch
%description
The librtas shared library provides userspace with an interface through
@ -77,7 +77,7 @@ contents of RTAS events.
%prep
%setup -q
%patch0 -p1
%autopatch -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects

View File

@ -0,0 +1,55 @@
From f8a1f6df25263afc75cabb9c40ddb8e54cf086e3 Mon Sep 17 00:00:00 2001
From: Tyrel Datwyler <tyreld@linux.ibm.com>
Date: Thu, 16 Dec 2021 13:37:15 -0800
Subject: [PATCH] librtasevent: Fix memory page address print issue
References: bsc#1193846 ltc#193949
Patch-mainline: accepted, expected 2.0.3
Git-commit: f8a1f6df25263afc75cabb9c40ddb8e54cf086e3
The logical resource address lo and hi fields are currently printed by rtas_dump
infering that their naming refers to significance when in fact they refer to the
bit numbering.
lri_mem_addr_lo == Memory Logical Address (bit 0-31)
lri_mem_addr_hi == Memory Logical Address (bit 32-64))
Hence rtas_dump command is printing the logical address output with those two
fields swapped.
This patch fixes rtas_lri_scn fields so that we get legitimate addresses.
Current output:
--------------
Logical Address: 2ab0a0000000014f
Correct output:
-------------
Logical Address: 0x0000014F2AB0A000
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
[tyreld: reworded commit message]
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
---
librtasevent_src/rtas_lri.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/librtasevent_src/rtas_lri.c b/librtasevent_src/rtas_lri.c
index c8d8a99..9d60b8f 100644
--- a/librtasevent_src/rtas_lri.c
+++ b/librtasevent_src/rtas_lri.c
@@ -113,8 +113,8 @@ print_re_lri_scn(struct scn_header *shdr, int verbosity)
case 0x40:
len += rtas_print("(Memory Page)\n" PRNT_FMT_ADDR,
- "Logical Address:", lri->lri_mem_addr_hi,
- lri->lri_mem_addr_lo);
+ "Logical Address:", lri->lri_mem_addr_lo,
+ lri->lri_mem_addr_hi);
break;
case 0x41:
--
2.34.1