diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-08 20:05:53 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-08 20:05:53 +0000 |
| commit | 0b43a2878d23e73c54b53b5e1c0a026c6abed8b3 (patch) | |
| tree | 5e0c7675258ad0c3be2f20d5be72a148e020ac47 /patches/powertop-1.11 | |
| parent | 590d630b4c4ec515d1d805cee1aea2ebf299134d (diff) | |
| download | ptxdist-0b43a2878d23e73c54b53b5e1c0a026c6abed8b3.tar.gz ptxdist-0b43a2878d23e73c54b53b5e1c0a026c6abed8b3.tar.xz | |
[powertop] new program
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10272 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/powertop-1.11')
| -rw-r--r-- | patches/powertop-1.11/generic/add-ldflags.diff | 22 | ||||
| -rw-r--r-- | patches/powertop-1.11/generic/remove-bashism.patch | 37 | ||||
| -rw-r--r-- | patches/powertop-1.11/generic/series | 2 |
3 files changed, 61 insertions, 0 deletions
diff --git a/patches/powertop-1.11/generic/add-ldflags.diff b/patches/powertop-1.11/generic/add-ldflags.diff new file mode 100644 index 000000000..548138254 --- /dev/null +++ b/patches/powertop-1.11/generic/add-ldflags.diff @@ -0,0 +1,22 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Subject: use LDFLAGS during linking + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: powertop-1.11/Makefile +=================================================================== +--- powertop-1.11.orig/Makefile ++++ powertop-1.11/Makefile +@@ -20,7 +20,7 @@ OBJS = powertop.o config.o process.o mis + + + powertop: $(OBJS) Makefile powertop.h +- $(CC) ${CFLAGS} $(OBJS) -lncursesw -o powertop ++ $(CC) ${CFLAGS} $(LDFLAGS) $(OBJS) -lncursesw -o powertop + @(cd po/ && $(MAKE)) + + powertop.1.gz: powertop.1 diff --git a/patches/powertop-1.11/generic/remove-bashism.patch b/patches/powertop-1.11/generic/remove-bashism.patch new file mode 100644 index 000000000..ba2bce8dd --- /dev/null +++ b/patches/powertop-1.11/generic/remove-bashism.patch @@ -0,0 +1,37 @@ +From: http://ftp.de.debian.org/debian/pool/main/p/powertop/powertop_1.11-1.diff.gz + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +#! /bin/sh /usr/share/dpatch/dpatch-run +## remove-bashism.dpatch by Patrick Winnertz <winnie@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: remove some bashisms in the output + +@DPATCH@ +diff --git a/cpufreq.c b/cpufreq.c +index ab84dc4..a291fdf 100644 +--- a/cpufreq.c ++++ b/cpufreq.c +@@ -39,7 +39,7 @@ static void activate_ondemand(void) + FILE *file; + char filename[PATH_MAX]; + +- system("/sbin/modprobe cpufreq_ondemand &> /dev/null"); ++ system("/sbin/modprobe cpufreq_ondemand > /dev/null 2>&1"); + + + dir = opendir("/sys/devices/system/cpu"); +diff --git a/powertop.c b/powertop.c +index fc605ec..4d18de8 100644 +--- a/powertop.c ++++ b/powertop.c +@@ -798,7 +798,7 @@ int main(int argc, char **argv) + if (!dump) + ticktime = 5.0; + +- system("/sbin/modprobe cpufreq_stats &> /dev/null"); ++ system("/sbin/modprobe cpufreq_stats > /dev/null 2>&1"); + read_data(&start_usage[0], &start_duration[0]); + + diff --git a/patches/powertop-1.11/generic/series b/patches/powertop-1.11/generic/series new file mode 100644 index 000000000..1bb71769d --- /dev/null +++ b/patches/powertop-1.11/generic/series @@ -0,0 +1,2 @@ +add-ldflags.diff +remove-bashism.patch |