summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-03-09 18:28:22 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-10 18:14:22 -0800
commitb8da6660cae7e1ff33b8b4ef8a551d1511e02e6e (patch)
tree1a50e01cd997daee72ef569150b6a4f0d458f92c
parent5a7466aeb24ea2129eb4d9ef491d896380509470 (diff)
downloadpoky-b8da6660cae7e1ff33b8b4ef8a551d1511e02e6e.tar.gz
oprofileui: upgrade to the latest version maintained by the Yocto project
Oprofileui at http://labs.o-hand.com/oprofileui/ is not maintained now, so we should change SRC_URI to the one maintained by the Yocto project. This one includes new bugfixes. This fixes [YOCTO #820] [sgw: merged oprofile-git.inc back into .bb as suggested by Joshua] (From OE-Core rev: d694c6700ee27672e5372939a98d5050cda44ca9) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-svn.inc9
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui_git.bb10
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui_svn.bb2
4 files changed, 11 insertions, 12 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 36202a1194..aee17493de 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}"
146SRCREV_pn-opkg-nogpg-nativesdk ??= "${OPKGSRCREV}" 146SRCREV_pn-opkg-nogpg-nativesdk ??= "${OPKGSRCREV}"
147SRCREV_pn-opkg-utils-native ??= "4747" 147SRCREV_pn-opkg-utils-native ??= "4747"
148SRCREV_pn-opkg-utils ??= "4747" 148SRCREV_pn-opkg-utils ??= "4747"
149SRCREV_pn-oprofileui ??= "197" 149SRCREV_pn-oprofileui ??= "e2d998d8a55dc1e49d1588841f83eff8e6809753"
150SRCREV_pn-tcf-agent ??= "1078" 150SRCREV_pn-tcf-agent ??= "1078"
151SRCREV_pn-osc-native ??= "9096" 151SRCREV_pn-osc-native ??= "9096"
152SRCREV_pn-owl-video ??= "394" 152SRCREV_pn-owl-video ??= "394"
diff --git a/meta/recipes-kernel/oprofile/oprofileui-svn.inc b/meta/recipes-kernel/oprofile/oprofileui-svn.inc
deleted file mode 100644
index 5d40914734..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui-svn.inc
+++ /dev/null
@@ -1,9 +0,0 @@
1require oprofileui.inc
2
3PV = "0.0+svnr${SRCPV}"
4PR = "r1"
5
6S = "${WORKDIR}/trunk"
7
8SRC_URI = "svn://svn.o-hand.com/repos/oprofileui;module=trunk;proto=http \
9 file://dso_linking_change_build_fix.patch "
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb
new file mode 100644
index 0000000000..b4a573b66c
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb
@@ -0,0 +1,10 @@
1require oprofileui.inc
2
3PV = "0.0+git${SRCPV}"
4PR = "r2"
5
6S = "${WORKDIR}/git"
7
8# Oprofileui at http://labs.o-hand.com/oprofileui/ is not maintained now.
9SRC_URI = "git://git.pokylinux.org/oprofileui;protocol=git \
10 file://dso_linking_change_build_fix.patch "
diff --git a/meta/recipes-kernel/oprofile/oprofileui_svn.bb b/meta/recipes-kernel/oprofile/oprofileui_svn.bb
deleted file mode 100644
index 39e10b4fd2..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui_svn.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require oprofileui-svn.inc
2