From c3030487a0a00fd58660f1629357d4c639645a66 Mon Sep 17 00:00:00 2001 From: Bogdan Marinescu Date: Wed, 8 May 2013 16:10:45 +0300 Subject: [PATCH] oprofileui(-server): upgraded to GIT revision f168b8bf 'obsolete_automake_macros.patch' is not needed anymore, because it was integrated in the specified commit. (From OE-Core rev: 4c7120a24cef2ff6b9df821c69153363c938ac77) Signed-off-by: Bogdan Marinescu Signed-off-by: Richard Purdie --- .../oprofileui-server/obsolete_automake_macros.patch | 20 -------------------- .../recipes-kernel/oprofile/oprofileui-server_git.bb | 7 ++----- meta/recipes-kernel/oprofile/oprofileui_git.bb | 3 +-- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch diff --git a/meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch b/meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch deleted file mode 100644 index 2f86f48..0000000 --- a/meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Marko Lindqvist -diff --git a/configure.ac b/configure.ac -index 2a7010b..62a177e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,11 +3,10 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(oprofileui, 0.2.0) - - AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_ISC_POSIX - AC_PROG_CC --AM_PROG_CC_STDC - AC_HEADER_STDC - AC_PROG_RANLIB - AC_PROG_INTLTOOL diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb index 6b848af..a872acc 100644 --- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb @@ -1,15 +1,12 @@ require oprofileui.inc -SRCREV = "82ecf8c6b53b84f80682a8312f9defa83a95f2a3" +SRCREV = "f168b8bfdc63660033de1739c6ddad1abd97c379" PV = "0.0+git${SRCPV}" -PR = "r1" S = "${WORKDIR}/git" SRC_URI = "git://git.yoctoproject.org/oprofileui;protocol=git \ - file://init \ - file://obsolete_automake_macros.patch \ -" + file://init" EXTRA_OECONF += "--disable-client --enable-server" diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb index cafbf1a..03a7932 100644 --- a/meta/recipes-kernel/oprofile/oprofileui_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb @@ -2,9 +2,8 @@ require oprofileui.inc DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf" -SRCREV = "82ecf8c6b53b84f80682a8312f9defa83a95f2a3" +SRCREV = "f168b8bfdc63660033de1739c6ddad1abd97c379" PV = "0.0+git${SRCPV}" -PR = "r1" S = "${WORKDIR}/git" -- 2.7.4