rpms/util-linux
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.26-0.4: fix PPC build

Browse Source
This commit is contained in:
Karel Zak 2015-02-10 11:30:36 +01:00
parent f6a3ca6784
commit aa5805ac25
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
2.26-setarch-ppc.patch Normal file
View File

@ -0,0 +1,33 @@
From d9ca5dd4426c8bcc779750362bf905395b1b08ef Mon Sep 17 00:00:00 2001
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Mon, 9 Feb 2015 16:11:02 +0100
Subject: [PATCH] setarch: fix typo (missing braces) for ppcle
Introduced in 77eb13b9, noticed on ppc64le.
CC: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
sys-utils/setarch.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index c8ca5f8..76892ab 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -160,9 +160,9 @@ static int set_arch(const char *pers, unsigned long options, int list)
{PER_LINUX, "ppc64pseries", "ppc64"},
{PER_LINUX, "ppc64iseries", "ppc64"},
# else
- PER_LINUX32, "ppc32le", "ppcle"},
- PER_LINUX32, "ppcle", "ppcle"},
- PER_LINUX, "ppc64le", "ppc64le"},
+ {PER_LINUX32, "ppc32le", "ppcle"},
+ {PER_LINUX32, "ppcle", "ppcle"},
+ {PER_LINUX, "ppc64le", "ppc64le"},
# endif
#endif
#if defined(__x86_64__) || defined(__i386__) || defined(__ia64__)
--
2.1.0

8
util-linux.spec
View File

@ -2,7 +2,7 @@
Summary: A collection of basic system utilities
Name: util-linux
Version: 2.26
Release: 0.3%{?dist}
Release: 0.4%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
URL: http://en.wikipedia.org/wiki/Util-linux
@ -78,6 +78,9 @@ Requires: libfdisk = %{version}-%{release}
# 151635 - makeing /var/log/lastlog
Patch0: 2.23-login-lastlog-create.patch
# fix PPC build
Patch1: 2.26-setarch-ppc.patch
%description
The util-linux package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among
@ -878,6 +881,9 @@ exit 0
%{_libdir}/python*/site-packages/libmount/*
%changelog
* Tue Feb 10 2015 Karel Zak <kzak@redhat.com> 2.26-0.4
- fix setarch build on PPC
* Thu Feb 5 2015 Karel Zak <kzak@redhat.com> 2.26-0.3
- upgrade to 2.26-rc2