summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-07 22:48:40 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-07 22:48:40 +0000
commit355b128de155316861708f15d42ec5c282e73c4d (patch)
tree4e3165e4fe392b7a6e7095d271c113cff68a717d /meta/packages
parent2fd340443cdb466daff7e053ebc7f5da909e12cb (diff)
downloadpoky-355b128de155316861708f15d42ec5c282e73c4d.tar.gz
oprofile: 0.9.2 -> 0.9.3 (and make the default)
oprofileui: Switch to SRCREV git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2381 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/oprofile/oprofile/no_arm_mapping_syms.patch21
-rw-r--r--meta/packages/oprofile/oprofile/opcontrol_bashisms.patch16
-rw-r--r--meta/packages/oprofile/oprofile_0.9.3.bb (renamed from meta/packages/oprofile/oprofile_0.9.2.bb)3
-rw-r--r--meta/packages/oprofile/oprofile_cvs.bb4
-rw-r--r--meta/packages/oprofile/oprofileui-svn.inc4
-rw-r--r--meta/packages/oprofile/oprofileui.inc1
6 files changed, 5 insertions, 44 deletions
diff --git a/meta/packages/oprofile/oprofile/no_arm_mapping_syms.patch b/meta/packages/oprofile/oprofile/no_arm_mapping_syms.patch
deleted file mode 100644
index 4c07e5c735..0000000000
--- a/meta/packages/oprofile/oprofile/no_arm_mapping_syms.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6Index: oprofile-0.9/libutil++/bfd_support.cpp
7===================================================================
8--- oprofile-0.9.orig/libutil++/bfd_support.cpp 2005-05-05 15:43:46.000000000 +0100
9+++ oprofile-0.9/libutil++/bfd_support.cpp 2005-06-10 10:18:24.000000000 +0100
10@@ -330,6 +330,11 @@
11 // returning true for fix up in op_bfd_symbol()
12 if (!sym->name || sym->name[0] == '\0')
13 return true;
14+ /* ARM assembler internal mapping symbols aren't interesting */
15+ if ((strcmp("$a", sym->name) == 0) ||
16+ (strcmp("$t", sym->name) == 0) ||
17+ (strcmp("$d", sym->name) == 0))
18+ return false;
19
20 // C++ exception stuff
21 if (sym->name[0] == '.' && sym->name[1] == 'L')
diff --git a/meta/packages/oprofile/oprofile/opcontrol_bashisms.patch b/meta/packages/oprofile/oprofile/opcontrol_bashisms.patch
deleted file mode 100644
index 01ef11df86..0000000000
--- a/meta/packages/oprofile/oprofile/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_0.9.2.bb b/meta/packages/oprofile/oprofile_0.9.3.bb
index e64aa10d49..5c8746f0ea 100644
--- a/meta/packages/oprofile/oprofile_0.9.2.bb
+++ b/meta/packages/oprofile/oprofile_0.9.3.bb
@@ -3,10 +3,9 @@ DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
3of profiling all running code at low overhead." 3of profiling all running code at low overhead."
4LICENSE = "GPL" 4LICENSE = "GPL"
5DEPENDS = "popt binutils" 5DEPENDS = "popt binutils"
6RDEPENDS = "binutils-symlinks"
6 7
7SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
8 file://no_arm_mapping_syms.patch;patch=1 \
9 file://opcontrol_bashisms.patch;patch=1 \
10 file://acinclude.m4" 9 file://acinclude.m4"
11S = "${WORKDIR}/oprofile-${PV}" 10S = "${WORKDIR}/oprofile-${PV}"
12 11
diff --git a/meta/packages/oprofile/oprofile_cvs.bb b/meta/packages/oprofile/oprofile_cvs.bb
index 548fd00b4b..ba9f2570f5 100644
--- a/meta/packages/oprofile/oprofile_cvs.bb
+++ b/meta/packages/oprofile/oprofile_cvs.bb
@@ -1,5 +1,5 @@
1PV = "0.9.2+cvs${SRCDATE}" 1PV = "0.9.3+cvs${SRCDATE}"
2PR = "r1" 2PR = "r0"
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 \
5of profiling all running code at low overhead." 5of profiling all running code at low overhead."
diff --git a/meta/packages/oprofile/oprofileui-svn.inc b/meta/packages/oprofile/oprofileui-svn.inc
index 42baaa0858..65ac682cbd 100644
--- a/meta/packages/oprofile/oprofileui-svn.inc
+++ b/meta/packages/oprofile/oprofileui-svn.inc
@@ -1,7 +1,7 @@
1require oprofileui.inc 1require oprofileui.inc
2 2
3PV = "0.0+svn${SRCDATE}" 3PV = "0.0+svnr${SRCREV}"
4PR = "r1" 4PR = "r0"
5 5
6S = "${WORKDIR}/trunk" 6S = "${WORKDIR}/trunk"
7 7
diff --git a/meta/packages/oprofile/oprofileui.inc b/meta/packages/oprofile/oprofileui.inc
index d1fc9c27e4..9fe000c560 100644
--- a/meta/packages/oprofile/oprofileui.inc
+++ b/meta/packages/oprofile/oprofileui.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "User interface for the OProfile tool"
2SECTION = "x11" 2SECTION = "x11"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4DEPENDS = "glib-2.0 gtk+ libglade gnome-vfs libxml2 avahi" 4DEPENDS = "glib-2.0 gtk+ libglade gnome-vfs libxml2 avahi"
5PR = "r3"
6 5
7inherit autotools pkgconfig 6inherit autotools pkgconfig
8 7