diff options
| -rw-r--r-- | meta/conf/distro/poky.conf | 8 | ||||
| -rw-r--r-- | meta/packages/oprofile/oprofile/no_arm_mapping_syms.patch | 21 | ||||
| -rw-r--r-- | meta/packages/oprofile/oprofile/opcontrol_bashisms.patch | 16 | ||||
| -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.bb | 4 | ||||
| -rw-r--r-- | meta/packages/oprofile/oprofileui-svn.inc | 4 | ||||
| -rw-r--r-- | meta/packages/oprofile/oprofileui.inc | 1 |
7 files changed, 9 insertions, 48 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 505100982..d5f2cc7cc 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -94,8 +94,8 @@ SRCDATE_libfakekey ?= "20051101" SRCDATE_xcalibrate ?= "20060312" SRCDATE_qemu ?= "20070613" SRCDATE_qemu-native ?= "20070613" -SRCDATE_oprofile ?= "20070529" -SRCDATE_oprofileui ?= "20070529" +SRCDATE_oprofile ?= "20070807" +SRCREV_oprofileui = "127" SRCDATE_zaurusd ?= "20070712" SRCDATE_owl-video-widget ?= "20070529" SRCDATE_psplash ?= "20070529" @@ -118,7 +118,7 @@ SRCDATE_matchbox-applet-light = "20070529" SRCDATE_fstests = "20070529" SRCDATE_abiword ?= "20070130" SRCDATE_xvideo-tests ?= "20070702" -SRCDATE_clutter ?= "20070727" +SRCDATE_clutter ?= "20070807" SRCDATE_libgsmd ?= "20070801" # @@ -179,7 +179,7 @@ PREFERRED_VERSION_xextensions ?= "1.0.1" PREFERRED_VERSION_xmonobut ?= "0.4" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xst ?= "0.15" -PREFERRED_VERSION_oprofile ?= "0.9.2+cvs${SRCDATE}" +PREFERRED_VERSION_oprofile ?= "0.9.3" PREFERRED_VERSION_elfutils ?= "0.89" PREFERRED_VERSION_hal ?= "0.5.9.1" 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 4c07e5c73..000000000 --- a/meta/packages/oprofile/oprofile/no_arm_mapping_syms.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: oprofile-0.9/libutil++/bfd_support.cpp -=================================================================== ---- oprofile-0.9.orig/libutil++/bfd_support.cpp 2005-05-05 15:43:46.000000000 +0100 -+++ oprofile-0.9/libutil++/bfd_support.cpp 2005-06-10 10:18:24.000000000 +0100 -@@ -330,6 +330,11 @@ - // returning true for fix up in op_bfd_symbol() - if (!sym->name || sym->name[0] == '\0') - return true; -+ /* ARM assembler internal mapping symbols aren't interesting */ -+ if ((strcmp("$a", sym->name) == 0) || -+ (strcmp("$t", sym->name) == 0) || -+ (strcmp("$d", sym->name) == 0)) -+ return false; - - // C++ exception stuff - 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 01ef11df8..000000000 --- a/meta/packages/oprofile/oprofile/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_0.9.2.bb b/meta/packages/oprofile/oprofile_0.9.3.bb index e64aa10d4..5c8746f0e 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 \ of profiling all running code at low overhead." LICENSE = "GPL" DEPENDS = "popt binutils" +RDEPENDS = "binutils-symlinks" 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/meta/packages/oprofile/oprofile_cvs.bb b/meta/packages/oprofile/oprofile_cvs.bb index 548fd00b4..ba9f2570f 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 = "r1" +PV = "0.9.3+cvs${SRCDATE}" +PR = "r0" SECTION = "devel" DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ of profiling all running code at low overhead." diff --git a/meta/packages/oprofile/oprofileui-svn.inc b/meta/packages/oprofile/oprofileui-svn.inc index 42baaa085..65ac682cb 100644 --- a/meta/packages/oprofile/oprofileui-svn.inc +++ b/meta/packages/oprofile/oprofileui-svn.inc @@ -1,7 +1,7 @@ require oprofileui.inc -PV = "0.0+svn${SRCDATE}" -PR = "r1" +PV = "0.0+svnr${SRCREV}" +PR = "r0" S = "${WORKDIR}/trunk" diff --git a/meta/packages/oprofile/oprofileui.inc b/meta/packages/oprofile/oprofileui.inc index d1fc9c27e..9fe000c56 100644 --- a/meta/packages/oprofile/oprofileui.inc +++ b/meta/packages/oprofile/oprofileui.inc @@ -2,7 +2,6 @@ DESCRIPTION = "User interface for the OProfile tool" SECTION = "x11" LICENSE = "GPLv2" DEPENDS = "glib-2.0 gtk+ libglade gnome-vfs libxml2 avahi" -PR = "r3" inherit autotools pkgconfig |