deleted file mode 100644
@@ -1,55 +0,0 @@
-From 4c24fdd8e0a42359df7308155b2d43c28a5e02fd Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 20 May 2019 20:25:00 +0200
-Subject: [PATCH] wakeup_xxx.h: include limits.h
-
-limits.h must be included to define PATH_MAX otherwise build will fail
-on:
-
-In file included from wakeup/wakeup_ethernet.cpp:45:0:
-wakeup/wakeup_ethernet.h:35:16: error: 'PATH_MAX' was not declared in this scope
- char eth_path[PATH_MAX];
-
-In file included from wakeup/wakeup_usb.cpp:45:0:
-wakeup/wakeup_usb.h:35:16: error: 'PATH_MAX' was not declared in this scope
- char usb_path[PATH_MAX];
-
-Fixes:
- - http://autobuild.buildroot.org/results/a0b3337cf4a827e6566f8b15b6bb180f0dcef7a3
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Upstream-Status: Submitted [https://lists.01.org/pipermail/powertop/2019-May/002052.html]
----
- src/wakeup/wakeup_ethernet.h | 1 +
- src/wakeup/wakeup_usb.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/wakeup/wakeup_ethernet.h b/src/wakeup/wakeup_ethernet.h
-index 682bf95..e0fa628 100644
---- a/src/wakeup/wakeup_ethernet.h
-+++ b/src/wakeup/wakeup_ethernet.h
-@@ -25,6 +25,7 @@
- #ifndef _INCLUDE_GUARD_ETHERNET_WAKEUP_H
- #define _INCLUDE_GUARD_ETHERNET_WAKEUP_H
-
-+#include <limits.h>
- #include <vector>
-
- #include "wakeup.h"
-diff --git a/src/wakeup/wakeup_usb.h b/src/wakeup/wakeup_usb.h
-index f7a1f7e..15898e3 100644
---- a/src/wakeup/wakeup_usb.h
-+++ b/src/wakeup/wakeup_usb.h
-@@ -25,6 +25,7 @@
- #ifndef _INCLUDE_GUARD_USB_WAKEUP_H
- #define _INCLUDE_GUARD_USB_WAKEUP_H
-
-+#include <limits.h>
- #include <vector>
-
- #include "wakeup.h"
-2.20.1
-
similarity index 67%
rename from meta/recipes-kernel/powertop/powertop_2.15.bb
rename to meta/recipes-kernel/powertop/powertop_2.16.bb
@@ -2,21 +2,21 @@ SUMMARY = "Power usage tool"
DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
HOMEPAGE = "https://01.org/powertop/"
BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla"
-DEPENDS = "ncurses libnl pciutils autoconf-archive-native"
+DEPENDS = "ncurses libnl pciutils libtracefs"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
-SRC_URI = "git://github.com/fenrus75/powertop;protocol=https;branch=master;tag=v${PV} \
- file://0001-wakeup_xxx.h-include-limits.h.patch \
- "
-SRCREV = "d51ad395436d4d1dcc3ca46e1519ffeb475bf651"
+SRC_URI = "git://github.com/fenrus75/powertop;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "6147262e506c607036eaca4182ee491b61d06aa3"
-LDFLAGS += "-pthread"
+inherit meson gettext pkgconfig bash-completion
-inherit autotools gettext pkgconfig bash-completion
+# meson defaults to /usr/bin, keep /usr/sbin for backward compatibility
+EXTRA_OEMESON = "--bindir=${sbindir}"
inherit update-alternatives
ALTERNATIVE:${PN} = "powertop"
ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop"
ALTERNATIVE_LINK_NAME[powertop] = "${sbindir}/powertop"
ALTERNATIVE_PRIORITY = "100"
+
Release: https://github.com/fenrus75/powertop/releases/tag/v2.16 CompareLog: https://github.com/fenrus75/powertop/compare/v2.15...v2.16 - switch to meson (upstream default since 2.16, 6a18fe2 [1]) - add libtracefs to DEPENDS (internal copy removed upstream, 2b133ed [2]) - use --bindir to keep installing to /usr/sbin - drop autoconf-archive-native and LDFLAGS -pthread - drop 0001-wakeup_xxx.h-include-limits.h.patch (PATH_MAX no longer used in those headers after upstream C++ modernization) [1] https://github.com/fenrus75/powertop/commit/6a18fe2d933ad0f16ccc64b40e832f571319c518 [2] https://github.com/fenrus75/powertop/commit/2b133ed512c6852cf81cb98831bdfd585c0317bf Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech> --- .../0001-wakeup_xxx.h-include-limits.h.patch | 55 ------------------- .../{powertop_2.15.bb => powertop_2.16.bb} | 14 ++--- 2 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-kernel/powertop/powertop/0001-wakeup_xxx.h-include-limits.h.patch rename meta/recipes-kernel/powertop/{powertop_2.15.bb => powertop_2.16.bb} (67%)