Hello community, here is the log from the commit of package cpupower for openSUSE:Factory checked in at 2017-03-24 02:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpupower (Old) and /work/SRC/openSUSE:Factory/.cpupower.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cpupower" Fri Mar 24 02:23:04 2017 rev:28 rq:482047 version:4.10 Changes: -------- --- /work/SRC/openSUSE:Factory/cpupower/cpupower.changes 2016-05-04 08:19:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cpupower.new/cpupower.changes 2017-03-24 02:23:08.247475383 +0100 @@ -1,0 +2,9 @@ +Wed Mar 22 19:00:17 UTC 2017 - [email protected] + +- Update cpupower and turbostat to latest kernel v4.10 sources +D library_cleanup.patch +- Change .c file header file modification, modify in Makefile instead: +D turbostat_set_asm_header_fixed.patch +A turbostat_makefile_fix_asm_header.patch + +------------------------------------------------------------------- Old: ---- cpupower-4.6.tar.bz2 library_cleanup.patch turbostat-4.12.tar.bz2 turbostat_set_asm_header_fixed.patch New: ---- cpupower-4.10.tar.bz2 turbostat-4.16.tar.bz2 turbostat_makefile_fix_asm_header.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpupower.spec ++++++ --- /var/tmp/diff_new_pack.YR9em5/_old 2017-03-24 02:23:08.963374087 +0100 +++ /var/tmp/diff_new_pack.YR9em5/_new 2017-03-24 02:23:08.967373522 +0100 @@ -1,7 +1,7 @@ # # spec file for package cpupower # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # Author: Thomas Renninger <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -20,9 +20,9 @@ Name: cpupower # Use this as version when things are in mainline kernel %define version %(rpm -q --qf '%{VERSION}' kernel-source) -Version: 4.6 +Version: 4.10 Release: 0 -%define tsversion 4.12 +%define tsversion 4.16 Summary: Tools to determine and set CPU Power related Settings License: GPL-2.0 Group: System/Base @@ -31,9 +31,8 @@ Source1: turbostat-%{tsversion}.tar.bz2 Source2: cpupower_export_tarball_from_git.sh -Patch1: library_cleanup.patch Patch20: turbostat_fix_man_perm.patch -Patch22: turbostat_set_asm_header_fixed.patch +Patch22: turbostat_makefile_fix_asm_header.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gettext-tools BuildRequires: pciutils @@ -78,7 +77,6 @@ %prep %setup -D -b 1 -%patch1 -p1 cd ../turbostat-%{tsversion} %patch20 -p1 %patch22 -p1 ++++++ cpupower-4.6.tar.bz2 -> cpupower-4.10.tar.bz2 ++++++ ++++ 2911 lines of diff (skipped) ++++++ cpupower_export_tarball_from_git.sh ++++++ --- /var/tmp/diff_new_pack.YR9em5/_old 2017-03-24 02:23:09.099354847 +0100 +++ /var/tmp/diff_new_pack.YR9em5/_new 2017-03-24 02:23:09.099354847 +0100 @@ -18,7 +18,7 @@ echo "export GIT_DIR= environment variable if the git repo is not the current directory" echo "For example: GIT_DIR=/path_to_git_repo/.git" } - +set -x if [ $# -gt 0 ];then if [ "$1" = "-h" ] || [ "$1" == "--help" ];then usage @@ -58,11 +58,15 @@ pushd "$TDIR" git archive --format=tar $GIT_TAG tools/power/x86/turbostat |tar -x -TURBOSTAT_VERSION=$(grep "turbostat version" tools/power/x86/turbostat/turbostat.c |grep fprintf |sed 's/.*turbostat version \([0-9].[0-9][0-9]\).*/\1/') +if [ "$TURBOSTAT_VERSION"x == ""x ];then + TURBOSTAT_VERSION=$(grep "turbostat version" tools/power/x86/turbostat/turbostat.c |grep fprintf |sed 's/.*turbostat version \([0-9][0-9].[0-9][0-9].[0-9][0-9]\).*/\1/') +fi TURBOSTAT_VERSION=$(echo "-$TURBOSTAT_VERSION") mv tools/power/x86/turbostat turbostat${TURBOSTAT_VERSION} -[ ! -e "$GIT_DIR"/../arch/x86/include/asm/msr-index.h ] && echo "msr-index.h does not exist" && exit 1 -cp "$GIT_DIR"/../arch/x86/include/asm/msr-index.h turbostat${TURBOSTAT_VERSION} +git checkout $GIT_TAG arch/x86/include/asm/msr-index.h +git checkout $GIT_TAG arch/x86/include/asm/intel-family.h +cp arch/x86/include/asm/intel-family.h turbostat${TURBOSTAT_VERSION} +cp arch/x86/include/asm/msr-index.h turbostat${TURBOSTAT_VERSION} tar -cvjf turbostat${TURBOSTAT_VERSION}.tar.bz2 turbostat${TURBOSTAT_VERSION} popd mv "$DIR/cpupower${VERSION}".tar.bz2 . ++++++ turbostat-4.12.tar.bz2 -> turbostat-4.16.tar.bz2 ++++++ ++++ 2003 lines of diff (skipped) ++++++ turbostat_fix_man_perm.patch ++++++ --- /var/tmp/diff_new_pack.YR9em5/_old 2017-03-24 02:23:09.171344661 +0100 +++ /var/tmp/diff_new_pack.YR9em5/_new 2017-03-24 02:23:09.175344095 +0100 @@ -1,8 +1,8 @@ -Index: turbostat-4.8/Makefile +Index: turbostat-4.16/Makefile =================================================================== ---- turbostat-4.8.orig/Makefile 2016-01-21 12:41:36.053333345 +0100 -+++ turbostat-4.8/Makefile 2016-01-26 18:25:57.334212372 +0100 -@@ -23,4 +23,4 @@ install : turbostat +--- turbostat-4.16.orig/Makefile 2017-02-19 23:34:00.000000000 +0100 ++++ turbostat-4.16/Makefile 2017-03-22 19:21:43.638618401 +0100 +@@ -24,4 +24,4 @@ install : turbostat install -d $(DESTDIR)$(PREFIX)/bin install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat install -d $(DESTDIR)$(PREFIX)/share/man/man8 ++++++ turbostat_makefile_fix_asm_header.patch ++++++ Index: turbostat-4.16/Makefile =================================================================== --- turbostat-4.16.orig/Makefile 2017-03-22 19:36:31.329182164 +0100 +++ turbostat-4.16/Makefile 2017-03-22 19:38:04.762500669 +0100 @@ -9,8 +9,8 @@ endif turbostat : turbostat.c CFLAGS += -Wall -CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' -CFLAGS += -DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"' +CFLAGS += -DMSRHEADER='"msr-index.h"' +CFLAGS += -DINTEL_FAMILY_HEADER='"intel-family.h"' %: %.c @mkdir -p $(BUILD_OUTPUT)
