0.54 bump
This commit is contained in:
parent
0a919ed7c2
commit
66dda20c07
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
Sys-CPU-0.51.tar.gz
|
||||
/Sys-CPU-0.52.tar.gz
|
||||
/Sys-CPU-0.54.tar.gz
|
||||
|
@ -1,52 +0,0 @@
|
||||
From 2c6e746e5e96f7c6c131db7d8f9366ae002a17cb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 5 Nov 2012 11:26:55 +0100
|
||||
Subject: [PATCH] Add support for Linux on s390
|
||||
|
||||
---
|
||||
CPU.xs | 19 +++++++++++++++++--
|
||||
1 file changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CPU.xs b/CPU.xs
|
||||
index b77d0c0..564e855 100644
|
||||
--- a/CPU.xs
|
||||
+++ b/CPU.xs
|
||||
@@ -269,6 +269,17 @@ int proc_cpuinfo_clock (void) {
|
||||
return (0);
|
||||
}
|
||||
|
||||
+#ifdef __s390__ || __s390x__
|
||||
+/* Return machine value from s390 processor line, NULL if not found */
|
||||
+char *processor_machine_field (char *processor) {
|
||||
+ char *machine = NULL;
|
||||
+ if (NULL == processor) return NULL;
|
||||
+ if (NULL != (machine = strstr(processor, "machine = "))) {
|
||||
+ machine += 10;
|
||||
+ }
|
||||
+ return machine;
|
||||
+}
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
int get_cpu_count() {
|
||||
@@ -354,11 +365,15 @@ SV *
|
||||
cpu_type()
|
||||
CODE:
|
||||
{
|
||||
- char *value = malloc(MAX_IDENT_SIZE);
|
||||
+ char *value = NULL;
|
||||
int retcode = 0;
|
||||
#ifdef __linux__
|
||||
- value = proc_cpuinfo_field ("model name");
|
||||
+#ifdef __s390__ || __s390x__
|
||||
+ value = processor_machine_field (proc_cpuinfo_field ("processor") );
|
||||
+#endif
|
||||
+ if (!value) value = proc_cpuinfo_field ("model name");
|
||||
if (!value) value = proc_cpuinfo_field ("machine");
|
||||
+ if (!value) value = proc_cpuinfo_field ("vendor_id");
|
||||
#endif
|
||||
#ifdef WINDOWS
|
||||
retcode = GetSysInfoKey("Identifier",value);
|
||||
--
|
||||
1.7.11.7
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: perl-Sys-CPU
|
||||
Version: 0.52
|
||||
Release: 2%{?dist}
|
||||
Version: 0.54
|
||||
Release: 1%{?dist}
|
||||
Summary: Getting CPU information
|
||||
Group: Development/Libraries
|
||||
# Some code was copied from Unix::Processors, which is LGPLv3 or Artistic 2.0
|
||||
@ -8,9 +8,7 @@ Group: Development/Libraries
|
||||
# See <https://bugzilla.redhat.com/show_bug.cgi?id=585336>.
|
||||
License: (GPL+ or Artistic) and (LGPLv3 or Artistic 2.0)
|
||||
URL: http://search.cpan.org/~mkoderer/Sys-CPU/
|
||||
Source0: http://search.cpan.org/CPAN/authors/id/M/MK/MKODERER/Sys-CPU-%{version}.tar.gz
|
||||
# Support for s390, CPAN RT #80633
|
||||
Patch0: Sys-CPU-0.52-Add-support-for-Linux-on-s390.patch
|
||||
Source0: http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/Sys-CPU-%{version}.tar.gz
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
# Run-time:
|
||||
BuildRequires: perl(DynaLoader)
|
||||
@ -25,7 +23,6 @@ Currently only number of CPU's supported.
|
||||
|
||||
%prep
|
||||
%setup -q -n Sys-CPU-%{version}
|
||||
%patch0 -p1
|
||||
sed -i 's/\r//' Changes README
|
||||
|
||||
%build
|
||||
@ -49,6 +46,9 @@ find %{buildroot} -type f -name CPU.bs -exec rm -f {} ';'
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Nov 13 2012 Petr Pisar <ppisar@redhat.com> - 0.54-1
|
||||
- 0.54 bump
|
||||
|
||||
* Mon Nov 05 2012 Petr Pisar <ppisar@redhat.com> - 0.52-2
|
||||
- Add support for s390 (CPAN RT #80633)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user