summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/oprofile
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/oprofile')
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch20
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-server_git.bb7
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui_git.bb3
3 files changed, 3 insertions, 27 deletions
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 2f86f48fe6..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff --git a/configure.ac b/configure.ac
5index 2a7010b..62a177e 100644
6--- a/configure.ac
7+++ b/configure.ac
8@@ -3,11 +3,10 @@ dnl Process this file with autoconf to produce a configure script.
9 AC_INIT(oprofileui, 0.2.0)
10
11 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
12-AM_CONFIG_HEADER(config.h)
13+AC_CONFIG_HEADERS(config.h)
14
15 AC_ISC_POSIX
16 AC_PROG_CC
17-AM_PROG_CC_STDC
18 AC_HEADER_STDC
19 AC_PROG_RANLIB
20 AC_PROG_INTLTOOL
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index 6b848af75f..a872acc4bb 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
@@ -1,15 +1,12 @@
1require oprofileui.inc 1require oprofileui.inc
2 2
3SRCREV = "82ecf8c6b53b84f80682a8312f9defa83a95f2a3" 3SRCREV = "f168b8bfdc63660033de1739c6ddad1abd97c379"
4PV = "0.0+git${SRCPV}" 4PV = "0.0+git${SRCPV}"
5PR = "r1"
6 5
7S = "${WORKDIR}/git" 6S = "${WORKDIR}/git"
8 7
9SRC_URI = "git://git.yoctoproject.org/oprofileui;protocol=git \ 8SRC_URI = "git://git.yoctoproject.org/oprofileui;protocol=git \
10 file://init \ 9 file://init"
11 file://obsolete_automake_macros.patch \
12"
13 10
14EXTRA_OECONF += "--disable-client --enable-server" 11EXTRA_OECONF += "--disable-client --enable-server"
15 12
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb
index cafbf1a8f4..03a79325ca 100644
--- a/meta/recipes-kernel/oprofile/oprofileui_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb
@@ -2,9 +2,8 @@ require oprofileui.inc
2 2
3DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf" 3DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf"
4 4
5SRCREV = "82ecf8c6b53b84f80682a8312f9defa83a95f2a3" 5SRCREV = "f168b8bfdc63660033de1739c6ddad1abd97c379"
6PV = "0.0+git${SRCPV}" 6PV = "0.0+git${SRCPV}"
7PR = "r1"
8 7
9S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"
10 9