oprofile: Add armv6 patch, drop merged patches, fix xscale events

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1767 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 3 insertions, 5 deletions

diff --git a/meta/packages/oprofile/oprofile_cvs.bb b/meta/packages/oprofile/oprofile_cvs.bb
index dab1f093a5..55bfa97fda 100644
--- a/meta/packages/oprofile/oprofile_cvs.bb
+++ b/meta/packages/oprofile/oprofile_cvs.bb
@@ -1,5 +1,5 @@
 PV = "0.9.2+cvs${SRCDATE}"
-PR = "r4"
+PR = "r5"
 SECTION = "devel"
 DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
 of profiling all running code at low overhead."
@@ -7,11 +7,9 @@ LICENSE = "GPL"
 DEPENDS = "popt binutils"
 
 SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
-           file://oprofile_eabi.patch;patch=1 \
            file://oparchive-debug-dir.patch;patch=1 \
-           file://oparchive-list-files.patch;patch=1 \
-           file://cg_collection.patch;patch=1 \
-           file://xml_callgraph.patch;patch=1 \
+           file://armv6_events.patch;patch=1 \
+           file://xscale_events.patch;patch=1 \
            file://acinclude.m4"
 S = "${WORKDIR}/oprofile"