From 833b50ef4a45bec4a6fa74f3faa1ea82b5f53dda Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 4 Dec 2020 17:21:00 +0100 Subject: [PATCH] linux4.19: update to 4.19.161. --- .../patches/wireless_h-fix-include.patch | 37 ------------------- srcpkgs/linux4.19/template | 4 +- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 srcpkgs/linux4.19/patches/wireless_h-fix-include.patch diff --git a/srcpkgs/linux4.19/patches/wireless_h-fix-include.patch b/srcpkgs/linux4.19/patches/wireless_h-fix-include.patch deleted file mode 100644 index 53121e23ca3..00000000000 --- a/srcpkgs/linux4.19/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/linux4.19/template b/srcpkgs/linux4.19/template index 981a0c6e2d2..9274043253b 100644 --- a/srcpkgs/linux4.19/template +++ b/srcpkgs/linux4.19/template @@ -1,6 +1,6 @@ # Template file for 'linux4.19' pkgname=linux4.19 -version=4.19.160 +version=4.19.161 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/v4.x/linux-${version}.tar.xz" -checksum=18345206f9c61e8adafa5204d0ca0b8619f1d9aafd70cbd5cb0fbf1faf521585 +checksum=07412995966899dda7842b808937b55884106465545a162d6f31f3f4ebd43c41 python_version=2 #unverified patch_args="-Np1"