mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-09 00:23:52 +02:00
linux4.19: update to 4.19.161.
This commit is contained in:
parent
115c57322d
commit
833b50ef4a
2 changed files with 2 additions and 39 deletions
|
@ -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 <hauke@hauke-m.de>
|
|
||||||
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 <hauke@hauke-m.de>
|
|
||||||
Link: https://lore.kernel.org/r/20200521201422.16493-1-hauke@hauke-m.de
|
|
||||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
||||||
---
|
|
||||||
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 <linux/socket.h> /* for "struct sockaddr" et al */
|
|
||||||
#include <linux/if.h> /* for IFNAMSIZ and co... */
|
|
||||||
|
|
||||||
-#include <stddef.h> /* for offsetof */
|
|
||||||
+#ifdef __KERNEL__
|
|
||||||
+# include <linux/stddef.h> /* for offsetof */
|
|
||||||
+#else
|
|
||||||
+# include <stddef.h> /* for offsetof */
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/***************************** VERSION *****************************/
|
|
||||||
/*
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'linux4.19'
|
# Template file for 'linux4.19'
|
||||||
pkgname=linux4.19
|
pkgname=linux4.19
|
||||||
version=4.19.160
|
version=4.19.161
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc="linux-${version}"
|
wrksrc="linux-${version}"
|
||||||
short_desc="Linux kernel and modules (${version%.*} series)"
|
short_desc="Linux kernel and modules (${version%.*} series)"
|
||||||
|
@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
|
||||||
license="GPL-2.0-only"
|
license="GPL-2.0-only"
|
||||||
homepage="https://www.kernel.org"
|
homepage="https://www.kernel.org"
|
||||||
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
|
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
|
||||||
checksum=18345206f9c61e8adafa5204d0ca0b8619f1d9aafd70cbd5cb0fbf1faf521585
|
checksum=07412995966899dda7842b808937b55884106465545a162d6f31f3f4ebd43c41
|
||||||
python_version=2 #unverified
|
python_version=2 #unverified
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue