Hello community, here is the log from the commit of package msr-tools for openSUSE:Factory checked in at 2018-11-12 09:42:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/msr-tools (Old) and /work/SRC/openSUSE:Factory/.msr-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "msr-tools" Mon Nov 12 09:42:10 2018 rev:22 rq:647613 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/msr-tools/msr-tools.changes 2016-07-01 09:59:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.msr-tools.new/msr-tools.changes 2018-11-12 09:42:14.649118768 +0100 @@ -1,0 +2,10 @@ +Thu Sep 27 12:15:47 UTC 2018 - [email protected] + +- Updates to lates github.com Commit "eec71d9" +- The tool now uses autoconf, so it does not build for SLE12/Leap42.3 + and older. +- Use msr-cpuid like mainline does now. We used cpuid_msr_tools to + avoid the conflict with cpuid which is another open source project. +- Use license macro instead of doc. + +------------------------------------------------------------------- Old: ---- msr-tools-1.3.tar.gz New: ---- _service msr-tools-1.3.tar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msr-tools.spec ++++++ --- /var/tmp/diff_new_pack.zE8tjp/_old 2018-11-12 09:42:15.049118196 +0100 +++ /var/tmp/diff_new_pack.zE8tjp/_new 2018-11-12 09:42:15.049118196 +0100 @@ -1,7 +1,7 @@ # # spec file for package msr-tools # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,35 +20,38 @@ Version: 1.3 Release: 0 Summary: Tool for reading and writing MSRs (model specific register) -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Base Url: https://github.com/01org/msr-tools -Source: https://github.com/01org/msr-tools/archive/%{name}-%{version}.tar.gz +Source: msr-tools-1.3.tar Source1: COPYING Patch1: %{name}-xen_physical_msr_support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool %description Tool to read and write MSRs (model specific registers). You have to load the "msr" module manually ("modprobe msr"). %prep -%setup -q -n %{name}-%{name}-%{version} -%patch1 -p1 +%setup -q +%autopatch -p1 %build +./autogen.sh make %{?_smp_mflags} CFLAGS="%{optflags}" %install mkdir -p %{buildroot}/%{_sbindir} cp %{SOURCE1} . -install -m 0755 rdmsr wrmsr %{buildroot}/%{_sbindir} -install -m 0755 cpuid %{buildroot}/%{_sbindir}/cpuid_msr_tools +install -m 0755 rdmsr wrmsr msr-cpuid %{buildroot}/%{_sbindir} %files %defattr(-,root,root) -%doc COPYING +%license COPYING %{_sbindir}/* %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/01org/msr-tools.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">msr-tools</param> <param name="versionformat">1.3</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ msr-tools-xen_physical_msr_support.patch ++++++ --- /var/tmp/diff_new_pack.zE8tjp/_old 2018-11-12 09:42:15.093118133 +0100 +++ /var/tmp/diff_new_pack.zE8tjp/_new 2018-11-12 09:42:15.093118133 +0100 @@ -14,11 +14,11 @@ wrmsr.c | 12 ++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) -Index: msr-tools-msr-tools-1.3/rdmsr.c +Index: msr-tools-1.3/rdmsr.c =================================================================== ---- msr-tools-msr-tools-1.3.orig/rdmsr.c 2013-09-10 04:49:29.000000000 +0200 -+++ msr-tools-msr-tools-1.3/rdmsr.c 2016-06-21 16:59:00.706090221 +0200 -@@ -44,12 +44,15 @@ static const struct option long_options[ +--- msr-tools-1.3.orig/rdmsr.c ++++ msr-tools-1.3/rdmsr.c +@@ -44,12 +44,14 @@ static const struct option long_options[ {"zero-pad", 0, 0, '0'}, {"raw", 0, 0, 'r'}, {"all", 0, 0, 'a'}, @@ -30,12 +30,11 @@ }; -static const char short_options[] = "hVxXdoruc0ap:f:"; +static const char short_options[] = "hVxXdoruc0aP:p:f:"; -+ +static const char *msr_file_pattern = "/dev/cpu/%d/msr"; + static int doing_for_all = 0; /* Number of decimal digits for a certain number of bits */ - /* (int) ceil(log(2^n)/log(10)) */ -@@ -89,6 +92,7 @@ void usage(void) +@@ -90,6 +92,7 @@ void usage(void) " --raw -r Raw binary output\n" " --all -a all processors\n" " --processor # -p Select processor number (default 0)\n" @@ -43,7 +42,7 @@ " --bitfield h:l -f Output bits [h:l] only\n", program); } -@@ -166,6 +170,9 @@ int main(int argc, char *argv[]) +@@ -167,6 +170,9 @@ int main(int argc, char *argv[]) case 'a': cpu = -1; break; @@ -52,8 +51,8 @@ + /* fall through */ case 'p': arg = strtoul(optarg, &endarg, 0); - if (*endarg || arg > 255) { -@@ -212,7 +219,7 @@ void rdmsr_on_cpu(uint32_t reg, int cpu) + if (*endarg || arg > 5119) { +@@ -214,7 +220,7 @@ void rdmsr_on_cpu(uint32_t reg, int cpu) char msr_file_name[64]; unsigned int bits; @@ -62,11 +61,11 @@ fd = open(msr_file_name, O_RDONLY); if (fd < 0) { if (errno == ENXIO) { -Index: msr-tools-msr-tools-1.3/wrmsr.c +Index: msr-tools-1.3/wrmsr.c =================================================================== ---- msr-tools-msr-tools-1.3.orig/wrmsr.c 2013-09-10 04:49:29.000000000 +0200 -+++ msr-tools-msr-tools-1.3/wrmsr.c 2016-06-21 16:59:00.706090221 +0200 -@@ -35,10 +35,13 @@ static const struct option long_options[ +--- msr-tools-1.3.orig/wrmsr.c ++++ msr-tools-1.3/wrmsr.c +@@ -35,10 +35,12 @@ static const struct option long_options[ {"version", 0, 0, 'V'}, {"all", 0, 0, 'a'}, {"processor", 1, 0, 'p'}, @@ -76,12 +75,11 @@ }; -static const char short_options[] = "hVap:"; +static const char short_options[] = "hVaP:p:"; -+ +static const char *msr_file_pattern = "/dev/cpu/%d/msr"; + static int doing_for_all = 0; const char *program; - -@@ -48,6 +51,7 @@ void usage(void) +@@ -49,6 +51,7 @@ void usage(void) " --help -h Print this help\n" " --version -V Print current version\n" " --all -a all processors\n" @@ -89,7 +87,7 @@ " --processor # -p Select processor number (default 0)\n", program); } -@@ -100,6 +104,9 @@ int main(int argc, char *argv[]) +@@ -101,6 +104,9 @@ int main(int argc, char *argv[]) case 'a': cpu = -1; break; @@ -98,8 +96,8 @@ + /* fall through */ case 'p': arg = strtoul(optarg, &endarg, 0); - if (*endarg || arg > 255) { -@@ -137,7 +144,7 @@ void wrmsr_on_cpu(uint32_t reg, int cpu, + if (*endarg || arg > 5119) { +@@ -139,7 +145,7 @@ void wrmsr_on_cpu(uint32_t reg, int cpu, int fd; char msr_file_name[64];
