summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/powertop/powertop/0001-include-rquired-headers-for-typedefs.patch47
-rw-r--r--meta/recipes-kernel/powertop/powertop_2.9.bb (renamed from meta/recipes-kernel/powertop/powertop_2.8.bb)10
2 files changed, 6 insertions, 51 deletions
diff --git a/meta/recipes-kernel/powertop/powertop/0001-include-rquired-headers-for-typedefs.patch b/meta/recipes-kernel/powertop/powertop/0001-include-rquired-headers-for-typedefs.patch
deleted file mode 100644
index 0fd63106d6..0000000000
--- a/meta/recipes-kernel/powertop/powertop/0001-include-rquired-headers-for-typedefs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 0856d8145d187a7e5a49625247abe43a13f95acc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 15 Sep 2015 19:36:28 +0000
4Subject: [PATCH] include rquired headers for typedefs
5
6timeval struct needs to include sys/time.h and sprintf() usage requires
7to include stdio.h headers from system
8
9Fixes
10src/perf/perf_bundle.cpp:141:2: error: use of undeclared identifier 'sprintf'; did you mean 'vswprintf'?
11src/devices/devfreq.h:35:18: error: field has incomplete type 'struct timeval'
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15Upstream-Status: Pending
16
17 src/devices/devfreq.h | 1 +
18 src/perf/perf_bundle.cpp | 1 +
19 2 files changed, 2 insertions(+)
20
21diff --git a/src/devices/devfreq.h b/src/devices/devfreq.h
22index 16a60fb..4bede7c 100644
23--- a/src/devices/devfreq.h
24+++ b/src/devices/devfreq.h
25@@ -25,6 +25,7 @@
26 #ifndef _INCLUDE_GUARD_DEVFREQ_H
27 #define _INCLUDE_GUARD_DEVFREQ_H
28
29+#include <sys/time.h>
30 #include "device.h"
31 #include "../parameters/parameters.h"
32
33diff --git a/src/perf/perf_bundle.cpp b/src/perf/perf_bundle.cpp
34index cf1ae11..232f894 100644
35--- a/src/perf/perf_bundle.cpp
36+++ b/src/perf/perf_bundle.cpp
37@@ -27,6 +27,7 @@
38 #include <algorithm>
39 #include <string.h>
40 #include <stdint.h>
41+#include <stdio.h>
42 #include <sys/types.h>
43 #include <sys/stat.h>
44 #include <fcntl.h>
45--
462.5.2
47
diff --git a/meta/recipes-kernel/powertop/powertop_2.8.bb b/meta/recipes-kernel/powertop/powertop_2.9.bb
index 4d7a3e7bd0..4fe5447a03 100644
--- a/meta/recipes-kernel/powertop/powertop_2.8.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.9.bb
@@ -6,17 +6,19 @@ DEPENDS = "ncurses libnl pciutils"
6LICENSE = "GPLv2" 6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" 7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
8 8
9SRC_URI = "http://01.org/sites/default/files/downloads/powertop/powertop-${PV}.tar.gz \ 9SRC_URI = "http://01.org/sites/default/files/downloads/powertop/powertop-v${PV}.tar.gz \
10 file://0001-include-rquired-headers-for-typedefs.patch \
11" 10"
12 11
13SRC_URI[md5sum] = "c55fedb69203e480801b18bd7b886241" 12SRC_URI[md5sum] = "583518c5c4434c6e9b9c58c3920950b6"
14SRC_URI[sha256sum] = "a87b563f73106babfa3e74dcf92f252938c061e309ace20a361358bbfa579c5a" 13SRC_URI[sha256sum] = "aa7fb7d8e9a00f05e7d8a7a2866d85929741e0d03a5bf40cab22d2021c959250"
15 14
16UPSTREAM_CHECK_URI = "https://01.org/powertop/downloads" 15UPSTREAM_CHECK_URI = "https://01.org/powertop/downloads"
16UPSTREAM_CHECK_REGEX = "powertop-[v]?(?P<pver>\d+(\.\d+)+)\.tar"
17 17
18inherit autotools gettext pkgconfig 18inherit autotools gettext pkgconfig
19 19
20S = "${WORKDIR}/${BPN}-v${PV}"
21
20# we do not want libncursesw if we can 22# we do not want libncursesw if we can
21do_configure_prepend() { 23do_configure_prepend() {
22 # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one 24 # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one