oprofile: Bump cvs date and update .bb accordingly, add patch to remove bashism,...

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index a113220..4b1aff0 100644 (file)
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -68,7 +68,7 @@ SRCDATE_minimo ?= "20050401"
 SRCDATE_mystun-server ?= "20060814"
 SRCDATE_olsrd ?= "20060814"
 SRCDATE_opencvs ?= "20060814"
-SRCDATE_oprofile ?= "20060214"
+SRCDATE_oprofile ?= "20061011"
 SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"

diff --git a/packages/oprofile/oprofile/opcontrol_bashisms.patch b/packages/oprofile/oprofile/opcontrol_bashisms.patch
new file mode 100644 (file)
index 0000000..01ef11d
--- /dev/null
+++ b/packages/oprofile/oprofile/opcontrol_bashisms.patch
@@ -0,0 +1,16 @@
+ 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/packages/oprofile/oprofile_0.9.1.bb b/packages/oprofile/oprofile_0.9.2.bb
similarity index 96%
rename from packages/oprofile/oprofile_0.9.1.bb
rename to packages/oprofile/oprofile_0.9.2.bb
index 991c7bf..e64aa10 100644 (file)
--- a/packages/oprofile/oprofile_0.9.1.bb
+++ b/packages/oprofile/oprofile_0.9.2.bb
@@ -6,6 +6,7 @@ DEPENDS = "popt binutils"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
           file://no_arm_mapping_syms.patch;patch=1 \
+           file://opcontrol_bashisms.patch;patch=1 \
           file://acinclude.m4"
 S = "${WORKDIR}/oprofile-${PV}"
 

diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb
index 5818d2a..902c569 100644 (file)
--- a/packages/oprofile/oprofile_cvs.bb
+++ b/packages/oprofile/oprofile_cvs.bb
@@ -1,12 +1,16 @@
-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 \
 of profiling all running code at low overhead."
 LICENSE = "GPL"
 DEPENDS = "popt binutils"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
+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 \
           file://acinclude.m4"
 S = "${WORKDIR}/oprofile"