Update to latest upstream 1.2.24

- ppc64le fix
   - removed snap, sosreport from sos should be used instead
This commit is contained in:
Jakub Čajka 2015-01-06 14:28:08 +01:00
parent d89a4f9f33
commit 7577807090
4 changed files with 63 additions and 4 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ powerpc-utils-1.2.2.tar.gz
/powerpc-utils-1.2.20.tar.gz /powerpc-utils-1.2.20.tar.gz
/powerpc-utils-1.2.22.tar.gz /powerpc-utils-1.2.22.tar.gz
/powerpc-utils-1.2.23.tar.gz /powerpc-utils-1.2.23.tar.gz
/powerpc-utils-1.2.24.tar.gz

View File

@ -0,0 +1,47 @@
From c0855a165e7442be9079556ea5c1c4fec23447c1 Mon Sep 17 00:00:00 2001
From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Date: Tue, 2 Dec 2014 18:11:37 -0600
Subject: [PATCH] drmgr/lsslot: Fix broken memory support for little endian
Commit 493bfdda30b61be46d7d71e5e7bb05df9334ba81 should have removed
some endian conversions included in previous commit. Unfortunately,
they were not removed, causing problems when hotplugging memory.
This patch removes those endian conversions.
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
---
src/drmgr/drslot_chrp_mem.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/drmgr/drslot_chrp_mem.c b/src/drmgr/drslot_chrp_mem.c
index a867894..6c2ac07 100644
--- a/src/drmgr/drslot_chrp_mem.c
+++ b/src/drmgr/drslot_chrp_mem.c
@@ -298,11 +298,6 @@ get_dynamic_reconfig_lmbs(struct lmb_list_head *lmb_list)
for (i = 0; i < num_entries; i++) {
struct dr_node *lmb;
- /* convert for LE systems */
- drmem->address = be64toh(drmem->address);
- drmem->drc_index = be32toh(drmem->drc_index);
- drmem->flags = be32toh(drmem->flags);
-
for (lmb = lmb_list->lmbs; lmb; lmb = lmb->next) {
if (lmb->drc_index == be32toh(drmem->drc_index))
break;
@@ -576,11 +571,7 @@ update_drconf_node(struct dr_node *lmb, struct lmb_list_head *lmb_list,
for (i = 0; i < entries; i++) {
- /* convert for LE systems */
- drmem->drc_index = be32toh(drmem->drc_index);
- drmem->flags = be32toh(drmem->flags);
-
- if (drmem->drc_index != lmb->drc_index) {
+ if (be32toh(drmem->drc_index) != lmb->drc_index) {
drmem++;
continue;
}
--
1.9.3

View File

@ -1,5 +1,5 @@
Name: powerpc-utils Name: powerpc-utils
Version: 1.2.23 Version: 1.2.24
Release: 1%{?dist} Release: 1%{?dist}
Summary: Utilities for PowerPC platforms Summary: Utilities for PowerPC platforms
@ -13,12 +13,15 @@ BuildRequires: librtas-devel >= 1.3.9
# should be fixed - libservicelog is not right name # should be fixed - libservicelog is not right name
Requires: libservicelog bc which Requires: libservicelog bc which
# rtas_dump dependency
Requires: perl(Data::Dumper)
ExclusiveArch: ppc ppc64 ppc64le ExclusiveArch: ppc ppc64 ppc64le
# This hack is needed only for platforms with autoconf < 2.63 # This hack is needed only for platforms with autoconf < 2.63
Patch0: powerpc-utils-autoconf.patch Patch0: powerpc-utils-autoconf.patch
Patch1: powerpc-utils-1.2.15-man.patch Patch1: powerpc-utils-1.2.15-man.patch
Patch2: powerpc-utils-1.2.22-makefile.patch Patch2: powerpc-utils-1.2.22-makefile.patch
Patch3: fix-broken-memory-support-for-little-en.patch
# This is done before release of F12 # This is done before release of F12
Obsoletes: powerpc-utils-papr < 1.1.6-3 Obsoletes: powerpc-utils-papr < 1.1.6-3
@ -39,6 +42,8 @@ Utilities for PowerPC platforms.
%patch1 -p1 -b .man %patch1 -p1 -b .man
%patch2 -p1 -b .makefile %patch2 -p1 -b .makefile
%patch3 -p1 -b .lefix
%build %build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure %configure
@ -66,7 +71,8 @@ ln -s nvram.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/nvsetenv.8.gz
%files %files
%{_sbindir}/nvsetenv %{_sbindir}/nvsetenv
%{_sbindir}/nvram %{_sbindir}/nvram
%{_sbindir}/snap # use sosreport from sos instead
%exclude %{_sbindir}/snap
%{_sbindir}/bootlist %{_sbindir}/bootlist
%{_sbindir}/ofpathname %{_sbindir}/ofpathname
%{_sbindir}/ppc64_cpu %{_sbindir}/ppc64_cpu
@ -74,7 +80,7 @@ ln -s nvram.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/nvsetenv.8.gz
%{_sbindir}/lsprop %{_sbindir}/lsprop
%{_mandir}/man8/nvram.8* %{_mandir}/man8/nvram.8*
%{_mandir}/man8/nvsetenv.8* %{_mandir}/man8/nvsetenv.8*
%{_mandir}/man8/snap.8* %exclude %{_mandir}/man8/snap.8*
%{_mandir}/man8/bootlist.8* %{_mandir}/man8/bootlist.8*
%{_mandir}/man8/ofpathname.8* %{_mandir}/man8/ofpathname.8*
@ -122,6 +128,11 @@ ln -s nvram.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/nvsetenv.8.gz
%doc README COPYRIGHT Changelog %doc README COPYRIGHT Changelog
%changelog %changelog
* Tue Jan 06 2015 Jakub Čajka <jcajka@redhat.com> - 1.2.24-1
- Update to latest upstream 1.2.24
- ppc64le fix
- removed snap, sosreport from sos should be used instead
* Mon Nov 03 2014 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.2.23 * Mon Nov 03 2014 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.2.23
- Update to latest upstream 1.2.23 - Update to latest upstream 1.2.23

View File

@ -1 +1 @@
0f7b122feecafaeaec81b422acda60b6 powerpc-utils-1.2.23.tar.gz f492a72f2d4522eba5d9b329c84b3ed3 powerpc-utils-1.2.24.tar.gz