From 355b128de155316861708f15d42ec5c282e73c4d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 7 Aug 2007 22:48:40 +0000
Subject: 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
---
meta/conf/distro/poky.conf | 8 ++---
.../oprofile/oprofile/no_arm_mapping_syms.patch | 21 ------------
.../oprofile/oprofile/opcontrol_bashisms.patch | 16 ---------
meta/packages/oprofile/oprofile_0.9.2.bb | 39 ----------------------
meta/packages/oprofile/oprofile_0.9.3.bb | 38 +++++++++++++++++++++
meta/packages/oprofile/oprofile_cvs.bb | 4 +--
meta/packages/oprofile/oprofileui-svn.inc | 4 +--
meta/packages/oprofile/oprofileui.inc | 1 -
8 files changed, 46 insertions(+), 85 deletions(-)
delete mode 100644 meta/packages/oprofile/oprofile/no_arm_mapping_syms.patch
delete mode 100644 meta/packages/oprofile/oprofile/opcontrol_bashisms.patch
delete mode 100644 meta/packages/oprofile/oprofile_0.9.2.bb
create mode 100644 meta/packages/oprofile/oprofile_0.9.3.bb
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.2.bb
deleted file mode 100644
index e64aa10d4..000000000
--- a/meta/packages/oprofile/oprofile_0.9.2.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-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 = "${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}"
-
-inherit autotools
-
-# NOTE: this disables the build of the kernel modules.
-# Should add the oprofile kernel modules, for those with 2.4
-# kernels, as a seperate .oe file.
-EXTRA_OECONF = "--with-kernel-support \
- --without-x"
-
-do_configure () {
- cp ${WORKDIR}/acinclude.m4 ${S}/
- autotools_do_configure
-}
-# Available config options
-# --enable-abi enable abi portability code (default is disabled)
-# --enable-pch enable precompiled header (default is disabled)
-# --enable-gcov enable option for gcov coverage testing (default is disabled)
-# --disable-werror disable -Werror flag (default is enabled for non-release)
-# --disable-optimization disable optimization flags (default is enabled)
-# --with-kernel-support Use 2.6 kernel (no kernel source tree required)
-# --with-linux=dir Path to Linux source tree
-# --with-module-dir=dir Path to module installation directory
-# --with-extra-includes=DIR add extra include paths
-# --with-extra-libs=DIR add extra library paths
-# --with-x use the X Window System
-# --with-qt-dir where the root of Qt is installed
-# --with-qt-includes where the Qt includes are.
-# --with-qt-libraries where the Qt library is installed.
diff --git a/meta/packages/oprofile/oprofile_0.9.3.bb b/meta/packages/oprofile/oprofile_0.9.3.bb
new file mode 100644
index 000000000..5c8746f0e
--- /dev/null
+++ b/meta/packages/oprofile/oprofile_0.9.3.bb
@@ -0,0 +1,38 @@
+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"
+RDEPENDS = "binutils-symlinks"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
+ file://acinclude.m4"
+S = "${WORKDIR}/oprofile-${PV}"
+
+inherit autotools
+
+# NOTE: this disables the build of the kernel modules.
+# Should add the oprofile kernel modules, for those with 2.4
+# kernels, as a seperate .oe file.
+EXTRA_OECONF = "--with-kernel-support \
+ --without-x"
+
+do_configure () {
+ cp ${WORKDIR}/acinclude.m4 ${S}/
+ autotools_do_configure
+}
+# Available config options
+# --enable-abi enable abi portability code (default is disabled)
+# --enable-pch enable precompiled header (default is disabled)
+# --enable-gcov enable option for gcov coverage testing (default is disabled)
+# --disable-werror disable -Werror flag (default is enabled for non-release)
+# --disable-optimization disable optimization flags (default is enabled)
+# --with-kernel-support Use 2.6 kernel (no kernel source tree required)
+# --with-linux=dir Path to Linux source tree
+# --with-module-dir=dir Path to module installation directory
+# --with-extra-includes=DIR add extra include paths
+# --with-extra-libs=DIR add extra library paths
+# --with-x use the X Window System
+# --with-qt-dir where the root of Qt is installed
+# --with-qt-includes where the Qt includes are.
+# --with-qt-libraries where the Qt library is installed.
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
--
cgit v1.2.3