summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-26 21:45:23 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-26 21:45:23 +0200
commit60b165e59e044e595b59ec8b6f0ad1dc741ac26d (patch)
tree91d3f2271e0f1317d0bd09d426894024bc7459c7
parent06b3c25fea4145aae350fc569fb368b0c353ac04 (diff)
update to latest upstream version, remove already upstream committed patches
-rw-r--r--package/cpufrequtils/Makefile6
-rw-r--r--package/cpufrequtils/patches/patch-Makefile188
-rw-r--r--package/cpufrequtils/patches/patch-bench_Makefile8
3 files changed, 25 insertions, 177 deletions
diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile
index 27044290b..3eb5b937d 100644
--- a/package/cpufrequtils/Makefile
+++ b/package/cpufrequtils/Makefile
@@ -4,18 +4,20 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= cpufrequtils
-PKG_VERSION:= 007
+PKG_VERSION:= 008
PKG_RELEASE:= 1
-PKG_MD5SUM:= 40271a1e1eadce31457e9891cdb071f1
+PKG_MD5SUM:= 52d3e09e47ffef634833f7fab168eccf
PKG_DESCR:= utilities for the Linux kernel cpufreq subsystem
PKG_SECTION:= utils
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/
+PKG_NO_PARALLEL:= 1
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,CPUFREQUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+XAKE_FLAGS+= NLS=no
CONFIG_STYLE:= manual
post-install:
diff --git a/package/cpufrequtils/patches/patch-Makefile b/package/cpufrequtils/patches/patch-Makefile
index 8e1093656..8a6b6d0c3 100644
--- a/package/cpufrequtils/patches/patch-Makefile
+++ b/package/cpufrequtils/patches/patch-Makefile
@@ -1,41 +1,6 @@
---- cpufrequtils-007.orig/Makefile 2010-01-16 14:47:44.000000000 +0100
-+++ cpufrequtils-007/Makefile 2010-02-11 20:37:45.000000000 +0100
-@@ -27,11 +27,11 @@
- DEBUG ?= false
-
- # make the build silent. Set this to something else to make it noisy again.
--V ?= false
-+V ?= true
-
- # Internationalization support (output in different languages).
- # Requires gettext.
--NLS ?= true
-+NLS ?= false
-
- # Set the following to 'true' to build/install the
- # cpufreq-bench benchmarking tool
-@@ -55,7 +55,9 @@ DESTDIR ?=
- # and _should_ modify the PACKAGE_BUGREPORT definition
-
- VERSION = 007
--LIB_VERSION = 0:0:0
-+LIB_MAJ= 0.0.0
-+LIB_MIN= 0
-+
- PACKAGE = cpufrequtils
- PACKAGE_BUGREPORT = cpufreq@vger.kernel.org
- LANGUAGES = de fr it cs pt
-@@ -76,16 +78,16 @@ confdir ?= /etc/
-
- # 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
-
+--- cpufrequtils-008.orig/Makefile 2010-07-05 17:43:17.000000000 +0200
++++ cpufrequtils-008/Makefile 2010-07-26 20:46:53.000000000 +0200
+@@ -87,7 +87,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
# If you are running a cross compiler, you may want to set this
# to something more interesting, like "arm-linux-". If you want
# to compile vs uClibc, that can be done here as well.
@@ -44,135 +9,24 @@
CC = $(CROSS)gcc
LD = $(CROSS)gcc
AR = $(CROSS)ar
-@@ -116,20 +118,22 @@ WARNINGS += -Wshadow
- 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
- 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
-
- CFLAGS += -pipe
-
- ifeq ($(strip $(PROC)),true)
-- LIB_PARTS += lib/proc.lo
-+ LIB_OBJS += lib/proc.o
-+ LIB_SRC += lib/proc.c
- CPPFLAGS += -DINTERFACE_PROC
- endif
-
- ifeq ($(strip $(SYSFS)),true)
-- LIB_PARTS += lib/sysfs.lo
-+ LIB_OBJS += lib/sysfs.o
-+ LIB_SRC += lib/sysfs.c
- CPPFLAGS += -DINTERFACE_SYSFS
- endif
-
-@@ -147,11 +151,9 @@ CFLAGS += $(WARNINGS)
-
- ifeq ($(strip $(V)),false)
- QUIET=@$(PWD)/build/ccdv
-- LIBTOOL_OPT=--silent
- HOST_PROGS=build/ccdv
- else
- QUIET=
-- LIBTOOL_OPT=
- HOST_PROGS=
- endif
-
-@@ -175,31 +177,32 @@ all: ccdv libcpufreq utils $(COMPILE_NLS
- 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) $(CPPFLAGS) $(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) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o libcpufreq.la -rpath \
-- ${libdir} -version-info $(LIB_VERSION) $(LIB_PARTS)
-+ $(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.la
-+libcpufreq: libcpufreq.so.$(LIB_MAJ)
-
--cpufreq-%: libcpufreq.la $(UTIL_OBJS)
-+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. -L./.libs/ -o $@ utils/$@.o -lcpufreq
-- $(QUIET) $(STRIPCMD) $@
-+ $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/$@.o -lcpufreq
-
- 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
-
-@@ -217,22 +220,21 @@ update-gmo: po/$(PACKAGE).pot
+@@ -246,14 +246,16 @@ install-tools:
+ $(INSTALL_PROGRAM) cpufreq-aperf $(DESTDIR)${bindir}/cpufreq-aperf
+
+ install-man:
+- $(INSTALL_DATA) -D man/cpufreq-set.1 $(DESTDIR)${mandir}/man1/cpufreq-set.1
+- $(INSTALL_DATA) -D man/cpufreq-info.1 $(DESTDIR)${mandir}/man1/cpufreq-info.1
++ $(INSTALL) -d $(DESTDIR)${mandir}/man1
++ $(INSTALL_DATA) man/cpufreq-set.1 $(DESTDIR)${mandir}/man1/cpufreq-set.1
++ $(INSTALL_DATA) man/cpufreq-info.1 $(DESTDIR)${mandir}/man1/cpufreq-info.1
+
+ install-gmo:
+ $(INSTALL) -d $(DESTDIR)${localedir}
+ for HLANG in $(LANGUAGES); do \
+- echo '$(INSTALL_DATA) -D po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpufrequtils.mo'; \
+- $(INSTALL_DATA) -D po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpufrequtils.mo; \
++ echo '$(INSTALL_DATA) po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpufrequtils.mo'; \
++ $(INSTALL) -d $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/; \
++ $(INSTALL_DATA) po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpufrequtils.mo; \
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
-
-@@ -255,9 +257,9 @@ install-gmo:
-
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_NLS) $(INSTALL_BENCH)
-
- uninstall:
- -rm -f $(DESTDIR)${libdir}/libcpufreq.*
-@@ -271,5 +273,5 @@ uninstall:
- 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 --git a/package/cpufrequtils/patches/patch-bench_Makefile b/package/cpufrequtils/patches/patch-bench_Makefile
deleted file mode 100644
index d0b5769a7..000000000
--- a/package/cpufrequtils/patches/patch-bench_Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- cpufrequtils-007.orig/bench/Makefile 2010-01-16 14:47:44.000000000 +0100
-+++ cpufrequtils-007/bench/Makefile 2010-02-11 20:32:30.000000000 +0100
-@@ -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\"