rpms/powerpc-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest upstream 1.2.27

Browse Source 
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
This commit is contained in:
Vasant Hegde 2015-11-16 18:13:24 +05:30
parent 5a7ece890d
commit a0c73dbe8e
2 changed files with 9 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
fix-broken-memory-support-for-little-en.patch
View File

@ -1,47 +0,0 @@
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

14
powerpc-utils.spec
View File

@ -1,6 +1,6 @@
Name: powerpc-utils
Version: 1.2.24
Release: 2%{?dist}
Version: 1.2.27
Release: 1%{?dist}
Summary: Utilities for PowerPC platforms
Group: System Environment/Base
@ -21,7 +21,6 @@ ExclusiveArch: ppc ppc64 ppc64le
Patch0: powerpc-utils-autoconf.patch
Patch1: powerpc-utils-1.2.15-man.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
Obsoletes: powerpc-utils-papr < 1.1.6-3
@ -42,8 +41,6 @@ Utilities for PowerPC platforms.
%patch1 -p1 -b .man
%patch2 -p1 -b .makefile
%patch3 -p1 -b .lefix
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure
@ -96,6 +93,8 @@ ln -s nvram.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/nvsetenv.8.gz
%{_sbindir}/rtas_event_decode
%{_sbindir}/sys_ident
%{_sbindir}/drmgr
%{_sbindir}/errinjct
%{_sbindir}/rtas_dbg
%{_sbindir}/lsslot
%{_sbindir}/ls-vdev
%{_sbindir}/ls-veth
@ -125,9 +124,14 @@ ln -s nvram.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/nvsetenv.8.gz
%{_mandir}/man8/ls-veth.8*
%{_mandir}/man8/ppc64_cpu.8*
%{_mandir}/man8/ls-vscsi.8*
%{_mandir}/man8/errinjct.8*
%{_mandir}/man8/rtas_dbg.8*
%doc README COPYRIGHT Changelog
%changelog
* Mon Nov 16 2015 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.2.27
- Update to latest upstream 1.2.27
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild