From 115c57322dbac9b8f889cfc3b6cfdf99626ad8de Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 4 Dec 2020 17:18:08 +0100 Subject: [PATCH] linux5.4: update to 5.4.81. --- .../patches/wireless_h-fix-include.patch | 37 ------------------- srcpkgs/linux5.4/template | 4 +- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 srcpkgs/linux5.4/patches/wireless_h-fix-include.patch diff --git a/srcpkgs/linux5.4/patches/wireless_h-fix-include.patch b/srcpkgs/linux5.4/patches/wireless_h-fix-include.patch deleted file mode 100644 index 53121e23ca..0000000000 --- a/srcpkgs/linux5.4/patches/wireless_h-fix-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -This also affects aarch64-musl systems at very least. - -From 1b9ae0c92925ac40489be526d67d0010d0724ce0 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Thu, 21 May 2020 22:14:22 +0200 -Subject: [PATCH] wireless: Use linux/stddef.h instead of stddef.h - -When compiling inside the kernel include linux/stddef.h instead of -stddef.h. When I compile this header file in backports for power PC I -run into a conflict with ptrdiff_t. I was unable to reproduce this in -mainline kernel. I still would like to fix this problem in the kernel. - -Fixes: 6989310f5d43 ("wireless: Use offsetof instead of custom macro.") -Signed-off-by: Hauke Mehrtens -Link: https://lore.kernel.org/r/20200521201422.16493-1-hauke@hauke-m.de -Signed-off-by: Johannes Berg ---- - include/uapi/linux/wireless.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/include/uapi/linux/wireless.h b/include/uapi/linux/wireless.h -index a2c006a364e0b..24f3371ad8262 100644 ---- a/include/uapi/linux/wireless.h -+++ b/include/uapi/linux/wireless.h -@@ -74,7 +74,11 @@ - #include /* for "struct sockaddr" et al */ - #include /* for IFNAMSIZ and co... */ - --#include /* for offsetof */ -+#ifdef __KERNEL__ -+# include /* for offsetof */ -+#else -+# include /* for offsetof */ -+#endif - - /***************************** VERSION *****************************/ - /* diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index 77af6f4514..f7d33fd34f 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -1,6 +1,6 @@ # Template file for 'linux5.4' pkgname=linux5.4 -version=5.4.80 +version=5.4.81 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=49da425c1f3c530fd3ff31d85a0461f6b6dc6e459f7faf3eee23e49a98ce64c7 +checksum=9470bde475726996202d845a5fc3bc8bd3bb546bbc6816fb663fa73df25d8427 python_version=3 patch_args="-Np1"