[linux_logo] Added ppc64le arch support; changed configure to use macro
Brent Baude
baude at fedoraproject.org
Sun May 25 23:59:27 UTC 2014
commit 7bb7715d9e2f71995684b47c1129acd840061349
Author: Brent Baude <baude at us.ibm.com>
Date: Sun May 25 18:59:16 2014 -0500
Added ppc64le arch support; changed configure to use macro
linux_logo-5.11-add-ppc64le.patch | 30 ++++++++++++++++++++++++++++++
linux_logo.spec | 9 +++++++--
2 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/linux_logo-5.11-add-ppc64le.patch b/linux_logo-5.11-add-ppc64le.patch
new file mode 100644
index 0000000..b10710f
--- /dev/null
+++ b/linux_logo-5.11-add-ppc64le.patch
@@ -0,0 +1,30 @@
+diff -Naur linux_logo-5.11.orig/libsysinfo-0.2.2/Linux/cpuinfo_ppc.c linux_logo-5.11.prep/libsysinfo-0.2.2/Linux/cpuinfo_ppc.c
+--- linux_logo-5.11.orig/libsysinfo-0.2.2/Linux/cpuinfo_ppc.c 2014-05-25 14:36:34.480001493 -0500
++++ linux_logo-5.11.prep/libsysinfo-0.2.2/Linux/cpuinfo_ppc.c 2014-05-25 14:42:00.200001495 -0500
+@@ -70,7 +70,12 @@
+ if (strstr(model_string,"POWER6")!=NULL) {
+ strncpy(cpu_info->chip_type,"POWER6",7);
+ }
+-
++ if (strstr(model_string,"POWER7")!=NULL) {
++ strncpy(cpu_info->chip_type,"POWER7",7);
++ }
++ if (strstr(model_string,"POWER8")!=NULL) {
++ strncpy(cpu_info->chip_type,"POWER8",7);
++ }
+ /* I Have an iBook now ;) */
+ if (strstr(model_string,"745/755")!=NULL) {
+ strncpy(cpu_info->chip_type,"G3",3);
+diff -Naur linux_logo-5.11.orig/libsysinfo-0.2.2/Linux/Makefile linux_logo-5.11.prep/libsysinfo-0.2.2/Linux/Makefile
+--- linux_logo-5.11.orig/libsysinfo-0.2.2/Linux/Makefile 2014-05-25 14:36:34.480001493 -0500
++++ linux_logo-5.11.prep/libsysinfo-0.2.2/Linux/Makefile 2014-05-25 14:42:58.010001494 -0500
+@@ -61,6 +61,9 @@
+ ppc64: cpuinfo_ppc.c
+ $(CROSS)$(CC) $(CFLAGS) -o cpuinfo.o -c cpuinfo_ppc.c
+
++ppc64le: cpuinfo_ppc.c
++ $(CROSS)$(CC) $(CFLAGS) -o cpuinfo.o -c cpuinfo_ppc.c
++
+ s390: cpuinfo_s390.c
+ $(CROSS)$(CC) $(CFLAGS) -o cpuinfo.o -c cpuinfo_s390.c
+
diff --git a/linux_logo.spec b/linux_logo.spec
index b765613..a67d491 100644
--- a/linux_logo.spec
+++ b/linux_logo.spec
@@ -1,11 +1,12 @@
Summary: Show a logo with some system info on the console
Name: linux_logo
Version: 5.11
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Group: Applications/System
URL: http://www.deater.net/weave/vmwprod/linux_logo/
Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz
+Patch0: linux_logo-5.11-add-ppc64le.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gettext
BuildRequires: which
@@ -18,11 +19,12 @@ files or executed upon login.
%prep
%setup -q
+%patch0 -p1
%build
# We still need to override CFLAGS later on, configure can't set them
-./configure --prefix=%{_prefix}
+%configure --prefix=%{_prefix}
make logos-all %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -44,6 +46,9 @@ rm -rf %{buildroot}
%changelog
+* Sun May 25 2014 Brent Baude <baude at us.ibm.com> - 5.11-8
+- Added ppc64le arch support; changed configure to use macro
+
* Tue Apr 29 2014 Matthias Saou <matthias at saou.eu> 5.11-7
- Very minor spec file cleanup. Keep it legacy for RHEL6 rebuilding as-is.
More information about the scm-commits
mailing list