From 2f5e7b0cd3f684a944d657631f7dca95df8611f0 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 12 Oct 2017 17:41:47 -0700 Subject: powertop: update to v2.9 * Upstream filename added "v" before version: - Add UPSTREAM_CHECK_REGEX - Update SRC_URI to include the "v" - Point ${S} to proper directory * Patch for required headers no longer needed in current upstream * Tested on qemux86-64 core-image-full-cmdline image with multilib (From OE-Core rev: c12f7f7492c33134ad6dde65fe119d53301dca2f) Signed-off-by: Tim Orling Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...0001-include-rquired-headers-for-typedefs.patch | 47 ---------------------- meta/recipes-kernel/powertop/powertop_2.8.bb | 31 -------------- meta/recipes-kernel/powertop/powertop_2.9.bb | 33 +++++++++++++++ 3 files changed, 33 insertions(+), 78 deletions(-) delete mode 100644 meta/recipes-kernel/powertop/powertop/0001-include-rquired-headers-for-typedefs.patch delete mode 100644 meta/recipes-kernel/powertop/powertop_2.8.bb create mode 100644 meta/recipes-kernel/powertop/powertop_2.9.bb (limited to 'meta/recipes-kernel') 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 @@ -From 0856d8145d187a7e5a49625247abe43a13f95acc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 15 Sep 2015 19:36:28 +0000 -Subject: [PATCH] include rquired headers for typedefs - -timeval struct needs to include sys/time.h and sprintf() usage requires -to include stdio.h headers from system - -Fixes -src/perf/perf_bundle.cpp:141:2: error: use of undeclared identifier 'sprintf'; did you mean 'vswprintf'? -src/devices/devfreq.h:35:18: error: field has incomplete type 'struct timeval' - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - src/devices/devfreq.h | 1 + - src/perf/perf_bundle.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/devices/devfreq.h b/src/devices/devfreq.h -index 16a60fb..4bede7c 100644 ---- a/src/devices/devfreq.h -+++ b/src/devices/devfreq.h -@@ -25,6 +25,7 @@ - #ifndef _INCLUDE_GUARD_DEVFREQ_H - #define _INCLUDE_GUARD_DEVFREQ_H - -+#include - #include "device.h" - #include "../parameters/parameters.h" - -diff --git a/src/perf/perf_bundle.cpp b/src/perf/perf_bundle.cpp -index cf1ae11..232f894 100644 ---- a/src/perf/perf_bundle.cpp -+++ b/src/perf/perf_bundle.cpp -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.5.2 - diff --git a/meta/recipes-kernel/powertop/powertop_2.8.bb b/meta/recipes-kernel/powertop/powertop_2.8.bb deleted file mode 100644 index 4d7a3e7bd0..0000000000 --- a/meta/recipes-kernel/powertop/powertop_2.8.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Power usage tool" -DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management." -HOMEPAGE = "http://01.org/powertop/" -BUGTRACKER = "http://bugzilla.lesswatts.org/" -DEPENDS = "ncurses libnl pciutils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -SRC_URI = "http://01.org/sites/default/files/downloads/powertop/powertop-${PV}.tar.gz \ - file://0001-include-rquired-headers-for-typedefs.patch \ -" - -SRC_URI[md5sum] = "c55fedb69203e480801b18bd7b886241" -SRC_URI[sha256sum] = "a87b563f73106babfa3e74dcf92f252938c061e309ace20a361358bbfa579c5a" - -UPSTREAM_CHECK_URI = "https://01.org/powertop/downloads" - -inherit autotools gettext pkgconfig - -# we do not want libncursesw if we can -do_configure_prepend() { - # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one - sed -i -e "s/ncursesw//g" ${S}/configure.ac - mkdir -p ${B}/src/tuning/ -} - -inherit update-alternatives -ALTERNATIVE_${PN} = "powertop" -ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop" -ALTERNATIVE_LINK_NAME[powertop] = "${sbindir}/powertop" -ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-kernel/powertop/powertop_2.9.bb b/meta/recipes-kernel/powertop/powertop_2.9.bb new file mode 100644 index 0000000000..4fe5447a03 --- /dev/null +++ b/meta/recipes-kernel/powertop/powertop_2.9.bb @@ -0,0 +1,33 @@ +SUMMARY = "Power usage tool" +DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management." +HOMEPAGE = "http://01.org/powertop/" +BUGTRACKER = "http://bugzilla.lesswatts.org/" +DEPENDS = "ncurses libnl pciutils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" + +SRC_URI = "http://01.org/sites/default/files/downloads/powertop/powertop-v${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "583518c5c4434c6e9b9c58c3920950b6" +SRC_URI[sha256sum] = "aa7fb7d8e9a00f05e7d8a7a2866d85929741e0d03a5bf40cab22d2021c959250" + +UPSTREAM_CHECK_URI = "https://01.org/powertop/downloads" +UPSTREAM_CHECK_REGEX = "powertop-[v]?(?P\d+(\.\d+)+)\.tar" + +inherit autotools gettext pkgconfig + +S = "${WORKDIR}/${BPN}-v${PV}" + +# we do not want libncursesw if we can +do_configure_prepend() { + # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one + sed -i -e "s/ncursesw//g" ${S}/configure.ac + mkdir -p ${B}/src/tuning/ +} + +inherit update-alternatives +ALTERNATIVE_${PN} = "powertop" +ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop" +ALTERNATIVE_LINK_NAME[powertop] = "${sbindir}/powertop" +ALTERNATIVE_PRIORITY = "100" -- cgit v1.2.3-54-g00ecf