Hello community,
here is the log from the commit of package cpufrequtils for openSUSE:Factory
checked in at Mon Aug 2 11:50:45 CEST 2010.
--------
--- cpufrequtils/cpufrequtils.changes 2010-01-31 22:59:47.000000000 +0100
+++ cpufrequtils/cpufrequtils.changes 2010-07-06 09:41:26.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Jul 6 07:39:36 UTC 2010 - trenn@novell.com
+
+- Updating to version 008
+ - Aperf fix and cpu hotplug robust patches can now be removed as
+ they got included in this release
+ - This release makes it easier to cross-compile cpufrequtils
+
+
+-------------------------------------------------------------------
+Thu Apr 29 11:39:32 UTC 2010 - trenn@novell.com
+
+- Make cpufreq-aperf robust against cpu onlining/offlining.
+
+-------------------------------------------------------------------
+Wed Apr 28 14:14:17 UTC 2010 - trenn@novell.com
+
+- Update to version 007. No features, only cosmetics and fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
cpufrequtils-006.tar.bz2
cpufrequtils_aperf_fix_proc_stat.patch
New:
----
cpufrequtils-008.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cpufrequtils.spec ++++++
--- /var/tmp/diff_new_pack.YD1G3U/_old 2010-08-02 11:49:19.000000000 +0200
+++ /var/tmp/diff_new_pack.YD1G3U/_new 2010-08-02 11:49:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cpufrequtils (Version 006)
+# spec file for package cpufrequtils (Version 008)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,14 +21,13 @@
Name: cpufrequtils
BuildRequires: doxygen lynx
Url: http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
-Version: 006
-Release: 2
+Version: 008
+Release: 1
Summary: Tools to Determine and Set CPUfreq Settings
License: GPLv2+
Group: System/Base
Source: %{name}-%{version}.tar.bz2
Source2: baselibs.conf
-Patch0: cpufrequtils_aperf_fix_proc_stat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bug437293
%ifarch ppc64
@@ -65,7 +64,6 @@
%prep
%setup -q
-%patch0 -p1
%build
# This package failed when testing with -Wl,-as-needed being default.
@@ -83,7 +81,6 @@
mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}/examples
mv $RPM_BUILD_ROOT/%{_docdir}/%{name}/cpufreq-bench_script.sh $RPM_BUILD_ROOT/%{_docdir}/%{name}/examples
%find_lang %{name}
-rm %{buildroot}%{_libdir}/*.*a
%clean
rm -rf $RPM_BUILD_ROOT
++++++ cpufrequtils-006.tar.bz2 -> cpufrequtils-008.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpufrequtils-006/.gitignore new/cpufrequtils-008/.gitignore
--- old/cpufrequtils-006/.gitignore 2009-11-07 11:24:28.000000000 +0100
+++ new/cpufrequtils-008/.gitignore 2010-07-05 17:43:17.000000000 +0200
@@ -1,4 +1,7 @@
.libs
+libcpufreq.so
+libcpufreq.so.0
+libcpufreq.so.0.0.0
build/ccdv
cpufreq-info
cpufreq-set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpufrequtils-006/Makefile new/cpufrequtils-008/Makefile
--- old/cpufrequtils-006/Makefile 2009-11-07 11:24:28.000000000 +0100
+++ new/cpufrequtils-008/Makefile 2010-07-05 17:43:17.000000000 +0200
@@ -54,8 +54,10 @@
# Package-related definitions. Distributions can modify the version
# and _should_ modify the PACKAGE_BUGREPORT definition
-VERSION = 006
-LIB_VERSION = 0:0:0
+VERSION = 008
+LIB_MAJ= 0.0.0
+LIB_MIN= 0
+
PACKAGE = cpufrequtils
PACKAGE_BUGREPORT = cpufreq@vger.kernel.org
LANGUAGES = de fr it cs pt
@@ -76,11 +78,11 @@
# Toolchain: what tools do we use, and what options do they need:
+CP = cp -fpR
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-LIBTOOL = /usr/bin/libtool
# If you are running a cross compiler, you may want to set this
# to something more interesting, like "arm-linux-". If you want
@@ -100,48 +102,39 @@
# set up PWD so that older versions of make will work with our build.
PWD = $(shell pwd)
-export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0
-
-# code taken from uClibc to determine the current arch
-ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
- -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
-
-# code taken from uClibc to determine the gcc include dir
-GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
-
-# code taken from uClibc to determine the libgcc.a filename
-GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
-
-# use '-Os' optimization if available, else use -O2
-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
- then echo "-Os"; else echo "-O2" ; fi}
+export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS
# check if compiler option is supported
cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
+# use '-Os' optimization if available, else use -O2
+OPTIMIZATION := $(call cc-supports,-Os,-O2)
+
WARNINGS := -Wall -Wchar-subscripts -Wpointer-arith -Wsign-compare
WARNINGS += $(call cc-supports,-Wno-pointer-sign)
WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
WARNINGS += -Wshadow
-CFLAGDEF := -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \
+CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \
-DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE
-UTIL_OBJS = utils/info.c utils/set.c
+UTIL_SRC = utils/info.c utils/set.c utils/aperf.c utils/cpuid.h
LIB_HEADERS = lib/cpufreq.h lib/interfaces.h
-LIB_OBJS = lib/cpufreq.c lib/proc.c lib/sysfs.c
-LIB_PARTS = lib/cpufreq.lo
+LIB_SRC = lib/cpufreq.c
+LIB_OBJS = lib/cpufreq.o
-CFLAGDEF += -pipe
+CFLAGS += -pipe
ifeq ($(strip $(PROC)),true)
- LIB_PARTS += lib/proc.lo
- CFLAGDEF += -DINTERFACE_PROC
+ LIB_OBJS += lib/proc.o
+ LIB_SRC += lib/proc.c
+ CPPFLAGS += -DINTERFACE_PROC
endif
ifeq ($(strip $(SYSFS)),true)
- LIB_PARTS += lib/sysfs.lo
- CFLAGDEF += -DINTERFACE_SYSFS
+ LIB_OBJS += lib/sysfs.o
+ LIB_SRC += lib/sysfs.c
+ CPPFLAGS += -DINTERFACE_SYSFS
endif
ifeq ($(strip $(NLS)),true)
@@ -154,24 +147,23 @@
COMPILE_BENCH += compile-bench
endif
-CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
+CFLAGS += $(WARNINGS)
ifeq ($(strip $(V)),false)
QUIET=@$(PWD)/build/ccdv
- LIBTOOL_OPT=--silent
HOST_PROGS=build/ccdv
else
QUIET=
- LIBTOOL_OPT=
HOST_PROGS=
endif
# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
- CFLAGDEF += -O1 -g -DDEBUG
+ CFLAGS += -O1 -g
+ CPPFLAGS += -DDEBUG
STRIPCMD = /bin/true -Since_we_are_debugging
else
- CFLAGDEF += $(OPTIMIZATION) -fomit-frame-pointer
+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
@@ -185,31 +177,33 @@
ccdv: build/ccdv
build/ccdv: build/ccdv.c
@echo "Building ccdv"
- @$(HOSTCC) -O1 -O1 $< -o $@
+ @$(HOSTCC) -O1 $< -o $@
-%.lo: $(LIB_OBJS) $(LIB_HEADERS) ccdv
- $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=compile $(CC) $(CFLAGDEF) $(CFLAGS) -o $@ -c $*.c
+lib/%.o: $(LIB_SRC) $(LIB_HEADERS) build/ccdv
+ $(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c lib/$*.c
-libcpufreq.la: $(LIB_OBJS) $(LIB_HEADERS) $(LIB_PARTS) Makefile
+libcpufreq.so.$(LIB_MAJ): $(LIB_OBJS)
@if [ $(strip $(SYSFS)) != true -a $(strip $(PROC)) != true ]; then \
echo '*** At least one of /sys support or /proc support MUST be enabled ***'; \
exit -1; \
fi;
- $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=link $(CC) $(CFLAGDEF) $(CFLAGS) $(LDFLAGS) -o libcpufreq.la -rpath \
- ${libdir} -version-info $(LIB_VERSION) $(LIB_PARTS)
-
-libcpufreq: libcpufreq.la
-
-cpufreq-%: libcpufreq.la $(UTIL_OBJS)
- $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I. -I./lib/ -c -o utils/$@.o utils/$*.c
- $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I./lib/ -L. -L./.libs/ -lcpufreq -o $@ utils/$@.o
+ $(QUIET) $(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
+ -Wl,-soname,libcpufreq.so.$(LIB_MIN) $(LIB_OBJS)
+ @ln -sf $@ libcpufreq.so
+ @ln -sf $@ libcpufreq.so.$(LIB_MIN)
+
+libcpufreq: libcpufreq.so.$(LIB_MAJ)
+
+cpufreq-%: libcpufreq.so.$(LIB_MAJ) $(UTIL_SRC)
+ $(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I./lib/ -c -o utils/$@.o utils/$*.c
+ $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/$@.o -lcpufreq
$(QUIET) $(STRIPCMD) $@
utils: cpufreq-info cpufreq-set cpufreq-aperf
-po/$(PACKAGE).pot: $(UTIL_OBJS)
+po/$(PACKAGE).pot: $(UTIL_SRC)
@xgettext --default-domain=$(PACKAGE) --add-comments \
- --keyword=_ --keyword=N_ $(UTIL_OBJS) && \
+ --keyword=_ --keyword=N_ $(UTIL_SRC) && \
test -f $(PACKAGE).po && \
mv -f $(PACKAGE).po po/$(PACKAGE).pot
@@ -227,22 +221,21 @@
done;
compile-bench: libcpufreq
- @V=$(V) confdir=$(confdir) make -C bench
+ @V=$(V) confdir=$(confdir) $(MAKE) -C bench
clean:
- -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' -o -name '*.l[oas]' \) -type f -print \
+ -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
- -rm -rf lib/.libs
- -rm -rf .libs
-rm -f cpufreq-info cpufreq-set cpufreq-aperf
+ -rm -f libcpufreq.so*
-rm -f build/ccdv
-rm -rf po/*.gmo po/*.pot
- make -C bench clean
+ $(MAKE) -C bench clean
install-lib:
$(INSTALL) -d $(DESTDIR)${libdir}
- $(LIBTOOL) --mode=install $(INSTALL) libcpufreq.la $(DESTDIR)${libdir}/libcpufreq.la
+ $(CP) libcpufreq.so* $(DESTDIR)${libdir}/
$(INSTALL) -d $(DESTDIR)${includedir}
$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h
@@ -265,9 +258,9 @@
install-bench:
@#DESTDIR must be set from outside to survive
- @sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) make -C bench install
+ @sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) $(MAKE) -C bench install
-install: install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH)
+install: all install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH)
uninstall:
- rm -f $(DESTDIR)${libdir}/libcpufreq.*
@@ -281,5 +274,5 @@
rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpufrequtils.mo; \
done;
-.PHONY: all utils libcpufreq update-po update-gmo install-lib install-tools install-man install-gmo install uninstall \
+.PHONY: all utils libcpufreq ccdv update-po update-gmo install-lib install-tools install-man install-gmo install uninstall \
clean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpufrequtils-006/bench/Makefile new/cpufrequtils-008/bench/Makefile
--- old/cpufrequtils-006/bench/Makefile 2009-11-07 11:24:28.000000000 +0100
+++ new/cpufrequtils-008/bench/Makefile 2010-07-05 17:43:17.000000000 +0200
@@ -1,4 +1,4 @@
-LIBS = -L../.libs/ -lm -lcpufreq
+LIBS = -L../ -lm -lcpufreq
OBJS = main.o parse.o system.o benchmark.o
CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpufrequtils-006/utils/aperf.c new/cpufrequtils-008/utils/aperf.c
--- old/cpufrequtils-006/utils/aperf.c 2009-11-07 11:24:28.000000000 +0100
+++ new/cpufrequtils-008/utils/aperf.c 2010-07-05 17:43:17.000000000 +0200
@@ -31,8 +31,6 @@
*
* Possible ToDos/Enhancments:
*
- * - Use cpuid assmbler command to retrieve cpuid
- * -No dependency to the cpuid driver
* - Refresh the screen when mulitple cpus are poked and display results
* on one screen
* -This would introduce a lot more complexity, not sure whether it's
@@ -48,18 +46,18 @@
#include