From b8da6660cae7e1ff33b8b4ef8a551d1511e02e6e Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 9 Mar 2011 18:28:22 +0800 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/conf/distro/include/poky-default-revisions.inc | 2 +- meta/recipes-kernel/oprofile/oprofileui-svn.inc | 9 --------- meta/recipes-kernel/oprofile/oprofileui_git.bb | 10 ++++++++++ meta/recipes-kernel/oprofile/oprofileui_svn.bb | 2 -- 4 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-kernel/oprofile/oprofileui-svn.inc create mode 100644 meta/recipes-kernel/oprofile/oprofileui_git.bb delete mode 100644 meta/recipes-kernel/oprofile/oprofileui_svn.bb (limited to 'meta') 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}" SRCREV_pn-opkg-nogpg-nativesdk ??= "${OPKGSRCREV}" SRCREV_pn-opkg-utils-native ??= "4747" SRCREV_pn-opkg-utils ??= "4747" -SRCREV_pn-oprofileui ??= "197" +SRCREV_pn-oprofileui ??= "e2d998d8a55dc1e49d1588841f83eff8e6809753" SRCREV_pn-tcf-agent ??= "1078" SRCREV_pn-osc-native ??= "9096" SRCREV_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 @@ -require oprofileui.inc - -PV = "0.0+svnr${SRCPV}" -PR = "r1" - -S = "${WORKDIR}/trunk" - -SRC_URI = "svn://svn.o-hand.com/repos/oprofileui;module=trunk;proto=http \ - 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 @@ +require oprofileui.inc + +PV = "0.0+git${SRCPV}" +PR = "r2" + +S = "${WORKDIR}/git" + +# Oprofileui at http://labs.o-hand.com/oprofileui/ is not maintained now. +SRC_URI = "git://git.pokylinux.org/oprofileui;protocol=git \ + 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 @@ -require oprofileui-svn.inc - -- cgit v1.2.3-54-g00ecf