From 27beff3d2d4f58443b817cbe72d216ee2cbda589 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 25 Sep 2019 22:54:38 +0200 Subject: [PATCH] linux-tools: update to 5.3.1. --- srcpkgs/linux-tools/patches/musl.patch | 3 ++- srcpkgs/linux-tools/patches/turbostat.patch | 20 -------------------- srcpkgs/linux-tools/template | 8 ++++---- 3 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/linux-tools/patches/turbostat.patch diff --git a/srcpkgs/linux-tools/patches/musl.patch b/srcpkgs/linux-tools/patches/musl.patch index 740607a8f7e..d43f29ae2ed 100644 --- a/srcpkgs/linux-tools/patches/musl.patch +++ b/srcpkgs/linux-tools/patches/musl.patch @@ -10,10 +10,11 @@ #include --- tools/power/x86/turbostat/turbostat.c.orig +++ tools/power/x86/turbostat/turbostat.c -@@ -43,6 +43,7 @@ +@@ -43,7 +43,8 @@ #include #include #include + #include +#include char *proc_stat = "/proc/stat"; diff --git a/srcpkgs/linux-tools/patches/turbostat.patch b/srcpkgs/linux-tools/patches/turbostat.patch deleted file mode 100644 index a060eaa1cd7..00000000000 --- a/srcpkgs/linux-tools/patches/turbostat.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- tools/power/x86/turbostat/Makefile.orig -+++ tools/power/x86/turbostat/Makefile -@@ -8,13 +8,13 @@ - endif - - turbostat : turbostat.c --CFLAGS += -Wall --CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' --CFLAGS += -DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"' -+override CFLAGS += -Wall -+override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' -+override CFLAGS += -DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"' - - %: %.c - @mkdir -p $(BUILD_OUTPUT) -- $(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@ -+ $(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@ $(LDFLAGS) - - .PHONY : clean - clean : diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index d96426e7a7c..6c177c8b580 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,7 +1,7 @@ # Template file for 'linux-tools' pkgname=linux-tools -version=4.20 -revision=2 +version=5.3.1 +revision=1 wrksrc="linux-${version}" build_style=meta hostmakedepends="asciidoc automake flex libtool perl python xmlto" @@ -13,8 +13,8 @@ short_desc="Linux kernel tools meta-pkg" maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://www.kernel.org" -distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=ad0823183522e743972382df0aa08fb5ae3077f662b125f1e599b0b2aaa12438 +distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz" +checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858 subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"