summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/oprofile/oprofile-0.9.2/opcontrol_bashisms.patch16
-rw-r--r--meta/packages/oprofile/oprofile/opcontrol_bashisms.patch20
-rw-r--r--meta/packages/oprofile/oprofile_cvs.bb4
4 files changed, 10 insertions, 32 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index cb56a3424f..9ea0214091 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -113,7 +113,7 @@ SRCDATE_xdpyinfo ?= "20051115"
113SRCDATE_xauth ?= "20060120" 113SRCDATE_xauth ?= "20060120"
114SRCDATE_xserver-kdrive = "20050207" 114SRCDATE_xserver-kdrive = "20050207"
115SRCDATE_qemu-native ?= "20060723" 115SRCDATE_qemu-native ?= "20060723"
116SRCDATE_oprofile ?= "20060214" 116SRCDATE_oprofile ?= "20061011"
117SRCDATE_zaurusd ?= "20060729" 117SRCDATE_zaurusd ?= "20060729"
118 118
119# SRCDATE_psplash = "now" 119# SRCDATE_psplash = "now"
diff --git a/meta/packages/oprofile/oprofile-0.9.2/opcontrol_bashisms.patch b/meta/packages/oprofile/oprofile-0.9.2/opcontrol_bashisms.patch
deleted file mode 100644
index 01ef11df86..0000000000
--- a/meta/packages/oprofile/oprofile-0.9.2/opcontrol_bashisms.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1 utils/opcontrol | 2 +-
2 1 file changed, 1 insertion(+), 1 deletion(-)
3
4Index: oprofile-0.9.2/utils/opcontrol
5===================================================================
6--- oprofile-0.9.2.orig/utils/opcontrol 2006-03-29 22:54:07.000000000 +0100
7+++ oprofile-0.9.2/utils/opcontrol 2006-10-12 11:14:39.000000000 +0100
8@@ -485,7 +485,7 @@ validate_separate_args()
9 SEPARATE_KERNEL=0
10 SEPARATE_THREAD=0
11 SEPARATE_CPU=0
12- while (($i < $#)); do
13+ while [ "$i" -lt "$#" ]; do
14 shift
15 case "$1" in
16 lib|library)
diff --git a/meta/packages/oprofile/oprofile/opcontrol_bashisms.patch b/meta/packages/oprofile/oprofile/opcontrol_bashisms.patch
index 58e2cb8097..01ef11df86 100644
--- a/meta/packages/oprofile/oprofile/opcontrol_bashisms.patch
+++ b/meta/packages/oprofile/oprofile/opcontrol_bashisms.patch
@@ -1,11 +1,11 @@
1 utils/opcontrol | 3 +-- 1 utils/opcontrol | 2 +-
2 1 file changed, 1 insertion(+), 2 deletions(-) 2 1 file changed, 1 insertion(+), 1 deletion(-)
3 3
4Index: oprofile/utils/opcontrol 4Index: oprofile-0.9.2/utils/opcontrol
5=================================================================== 5===================================================================
6--- oprofile.orig/utils/opcontrol 2006-02-10 14:18:13.000000000 +0000 6--- oprofile-0.9.2.orig/utils/opcontrol 2006-03-29 22:54:07.000000000 +0100
7+++ oprofile/utils/opcontrol 2006-10-11 15:52:16.000000000 +0100 7+++ oprofile-0.9.2/utils/opcontrol 2006-10-12 11:14:39.000000000 +0100
8@@ -476,7 +476,7 @@ validate_separate_args() 8@@ -485,7 +485,7 @@ validate_separate_args()
9 SEPARATE_KERNEL=0 9 SEPARATE_KERNEL=0
10 SEPARATE_THREAD=0 10 SEPARATE_THREAD=0
11 SEPARATE_CPU=0 11 SEPARATE_CPU=0
@@ -14,11 +14,3 @@ Index: oprofile/utils/opcontrol
14 shift 14 shift
15 case "$1" in 15 case "$1" in
16 lib|library) 16 lib|library)
17@@ -1513,7 +1513,6 @@ check_version()
18 BINDIR="/usr/bin"
19 OPCONTROL=`$BINDIR/which $0`
20 OPDIR=`$BINDIR/dirname $OPCONTROL`
21-n
22 PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
23
24 check_version_help $@
diff --git a/meta/packages/oprofile/oprofile_cvs.bb b/meta/packages/oprofile/oprofile_cvs.bb
index 087cc33967..902c569e85 100644
--- a/meta/packages/oprofile/oprofile_cvs.bb
+++ b/meta/packages/oprofile/oprofile_cvs.bb
@@ -1,4 +1,4 @@
1PV = "0.9.1+cvs${SRCDATE}" 1PV = "0.9.2+cvs${SRCDATE}"
2PR = "r1" 2PR = "r1"
3SECTION = "devel" 3SECTION = "devel"
4DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ 4DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
@@ -6,6 +6,8 @@ of profiling all running code at low overhead."
6LICENSE = "GPL" 6LICENSE = "GPL"
7DEPENDS = "popt binutils" 7DEPENDS = "popt binutils"
8 8
9DEFAULT_PREFERENCE = "-1"
10
9SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \ 11SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
10 file://no_arm_mapping_syms.patch;patch=1 \ 12 file://no_arm_mapping_syms.patch;patch=1 \
11 file://opcontrol_bashisms.patch;patch=1 \ 13 file://opcontrol_bashisms.patch;patch=1 \