summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch2
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui_git.bb2
3 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 9a3ae7eae..5e7ab66ce 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -146,7 +146,7 @@ SRCREV_pn-opkg-nogpg-native ??= "${OPKGSRCREV}"
SRCREV_pn-opkg-nogpg-nativesdk ??= "${OPKGSRCREV}"
SRCREV_pn-opkg-utils-native ??= "4747"
SRCREV_pn-opkg-utils ??= "4747"
-SRCREV_pn-oprofileui ??= "2387488fb520725ca9cff888bc1ed25788276b13"
+SRCREV_pn-oprofileui ??= "0c3c32fa754c1d0b70e65767ea7048914f776396"
SRCREV_pn-tcf-agent ??= "1078"
SRCREV_pn-osc-native ??= "9096"
SRCREV_pn-owl-video ??= "394"
diff --git a/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch b/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch
index 4b44c69bc..39ceb22e3 100644
--- a/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch
+++ b/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch
@@ -7,6 +7,8 @@ With dso linking change in gcc, all the libraries are needed to be explicitely s
| collect2: ld returned 1 exit status^M
| make[2]: *** [oprofile-viewer] Error 1^M
+Upstream-Status: Inappropriate [configuration]
+
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb
index c83d43c36..44adcb78d 100644
--- a/meta/recipes-kernel/oprofile/oprofileui_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb
@@ -1,7 +1,7 @@
require oprofileui.inc
PV = "0.0+git${SRCPV}"
-PR = "r3"
+PR = "r4"
S = "${WORKDIR}/git"