diff options
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
| -rw-r--r-- | meta/packages/oprofile/oprofile-0.9.2/opcontrol_bashisms.patch | 16 | ||||
| -rw-r--r-- | meta/packages/oprofile/oprofile/opcontrol_bashisms.patch | 20 | ||||
| -rw-r--r-- | meta/packages/oprofile/oprofile_cvs.bb | 4 |
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" SRCDATE_xauth ?= "20060120" SRCDATE_xserver-kdrive = "20050207" SRCDATE_qemu-native ?= "20060723" -SRCDATE_oprofile ?= "20060214" +SRCDATE_oprofile ?= "20061011" SRCDATE_zaurusd ?= "20060729" # 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 @@ - utils/opcontrol | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: oprofile-0.9.2/utils/opcontrol -=================================================================== ---- oprofile-0.9.2.orig/utils/opcontrol 2006-03-29 22:54:07.000000000 +0100 -+++ oprofile-0.9.2/utils/opcontrol 2006-10-12 11:14:39.000000000 +0100 -@@ -485,7 +485,7 @@ validate_separate_args() - SEPARATE_KERNEL=0 - SEPARATE_THREAD=0 - SEPARATE_CPU=0 -- while (($i < $#)); do -+ while [ "$i" -lt "$#" ]; do - shift - case "$1" in - 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 @@ - utils/opcontrol | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + utils/opcontrol | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: oprofile/utils/opcontrol +Index: oprofile-0.9.2/utils/opcontrol =================================================================== ---- oprofile.orig/utils/opcontrol 2006-02-10 14:18:13.000000000 +0000 -+++ oprofile/utils/opcontrol 2006-10-11 15:52:16.000000000 +0100 -@@ -476,7 +476,7 @@ validate_separate_args() +--- oprofile-0.9.2.orig/utils/opcontrol 2006-03-29 22:54:07.000000000 +0100 ++++ oprofile-0.9.2/utils/opcontrol 2006-10-12 11:14:39.000000000 +0100 +@@ -485,7 +485,7 @@ validate_separate_args() SEPARATE_KERNEL=0 SEPARATE_THREAD=0 SEPARATE_CPU=0 @@ -14,11 +14,3 @@ Index: oprofile/utils/opcontrol shift case "$1" in lib|library) -@@ -1513,7 +1513,6 @@ check_version() - BINDIR="/usr/bin" - OPCONTROL=`$BINDIR/which $0` - OPDIR=`$BINDIR/dirname $OPCONTROL` --n - PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin - - 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 @@ -PV = "0.9.1+cvs${SRCDATE}" +PV = "0.9.2+cvs${SRCDATE}" PR = "r1" SECTION = "devel" DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ @@ -6,6 +6,8 @@ of profiling all running code at low overhead." LICENSE = "GPL" DEPENDS = "popt binutils" +DEFAULT_PREFERENCE = "-1" + SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \ file://no_arm_mapping_syms.patch;patch=1 \ file://opcontrol_bashisms.patch;patch=1 \ |