From 56226245aa260db9ba7ee7a7b9b31c53706752a4 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 20 Apr 2018 14:12:03 +0200 Subject: powertop: remove old patches Disabling is now handled with the correct environment variable. No need for a patch. Signed-off-by: Michael Olbrich --- .../0001-powertop-add-enable-pci-argument.patch | 68 ---------------------- patches/powertop-2.5/autogen.sh | 1 - patches/powertop-2.5/series | 1 - 3 files changed, 70 deletions(-) delete mode 100644 patches/powertop-2.5/0001-powertop-add-enable-pci-argument.patch delete mode 120000 patches/powertop-2.5/autogen.sh delete mode 100644 patches/powertop-2.5/series diff --git a/patches/powertop-2.5/0001-powertop-add-enable-pci-argument.patch b/patches/powertop-2.5/0001-powertop-add-enable-pci-argument.patch deleted file mode 100644 index aeb5a7e2b..000000000 --- a/patches/powertop-2.5/0001-powertop-add-enable-pci-argument.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f62aebb863312b624aec0ebef304a0bdb362e77b Mon Sep 17 00:00:00 2001 -From: Alexander Aring -Date: Thu, 3 Apr 2014 09:30:13 +0200 -Subject: [PATCH] powertop: add --enable-pci argument - -Signed-off-by: Alexander Aring ---- - configure.ac | 37 +++++++++++++++++++++++-------------- - 1 file changed, 23 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b69d608..27c01af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -48,10 +48,29 @@ AC_CHECK_FUNCS([fdatasync getpagesize gettimeofday memmove memset mkdir munmap p - - AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], AC_MSG_ERROR([ncurses is required but was not found]), []) - --has_libpci=0 --PKG_CHECK_MODULES([PCIUTILS], [libpci],[has_libpci=1],[ -- AC_SEARCH_LIBS([pci_get_dev], [pci],[has_libpci=1], [has_libpci=0] )]) -- -+AC_ARG_ENABLE([pci], -+ AS_HELP_STRING([--enable-pci], [enable pci support @<:@default=disabled@:>@]), -+ [enable_pci=$enableval], [enable_pci=no]) -+AS_IF([test "x$enable_pci" = "xno"], [ -+ AC_DEFINE(HAVE_NO_PCI, [1], [pci support.]) -+]) -+ -+if (test "$enable_pci" == "yes"); then -+ has_libpci=0 -+ PKG_CHECK_MODULES([PCIUTILS], [libpci],[has_libpci=1],[ -+ AC_SEARCH_LIBS([pci_get_dev], [pci],[has_libpci=1], [has_libpci=0])]) -+ -+ if (test "$has_libpci" -eq 0); then -+ AC_DEFINE([HAVE_NO_PCI],[1],[Define if pci is not supported]) -+ AC_MSG_ERROR([ -+ ************* LIBPCI SUPPORT NOT CONFIGURED************** -+ If you need pci support, please install libpci and -+ re-configure PowerTOP with --enable-pci or disable pci -+ support with --disable-pci. -+ ********************************************************* -+ ]) -+ fi -+fi - - has_libnl_ver=0 - # libnl-2 provides only libnl-2.0.pc file, so we check for separate libnl-genl-3.0.pc -@@ -67,16 +86,6 @@ if (test "$has_libnl_ver" -gt 1); then - AC_DEFINE([HAVE_LIBNL20], [1], [Define if you have libnl-2.0 or higher]) - fi - --if (test "$has_libpci" -eq 0); then -- AC_DEFINE([HAVE_NO_PCI],[1],[Define if pci is not supported]) -- AC_MSG_WARN([ -- ************* LIBPCI SUPPORT NOT CONFIGURED************** -- If you need or want pci support, please install libpci -- and re-configure PowerTOP. -- ********************************************************* -- ]) --fi -- - AC_SEARCH_LIBS([pthread_create], [pthread], [], AC_MSG_ERROR([libpthread is required but was not found]), []) - AC_SEARCH_LIBS([inet_aton], [resolv], [], AC_MSG_ERROR([libresolv is required but was not found]), []) - --- -1.9.1 - diff --git a/patches/powertop-2.5/autogen.sh b/patches/powertop-2.5/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/powertop-2.5/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/powertop-2.5/series b/patches/powertop-2.5/series deleted file mode 100644 index 143dde4fb..000000000 --- a/patches/powertop-2.5/series +++ /dev/null @@ -1 +0,0 @@ -0001-powertop-add-enable-pci-argument.patch -- cgit v1.2.3