oasis

commit: d33113536a714b163ba94bf31a02881025a2cb17
parent c6f680a6aff351e85375cdf9a98592d13e8802b5
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 23 Jun 2020 14:37:22 -0700

linux-headers: Guard inclusion of linux/sysinfo.h from linux/kernel.h by __GLIBC__

This fixes build issues with musl in qemu.

Diffstat:
A
pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch
26
++++++++++++++++++++++++++
M
pkg/linux-headers/ver
2
+-

2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch b/pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch
@@ -0,0 +1,26 @@
+From 2cea39d1a37c87e65e3bc8892f9d3d37e426b9e7 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Tue, 23 Jun 2020 14:34:45 -0700
+Subject: [PATCH] Only include linux/sysinfo.h from linux/kernel.h on glibc
+
+---
+ include/uapi/linux/kernel.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
+index 0ff8f7477847..b2d59deef093 100644
+--- a/include/uapi/linux/kernel.h
++++ b/include/uapi/linux/kernel.h
+@@ -2,7 +2,9 @@
+ #ifndef _UAPI_LINUX_KERNEL_H
+ #define _UAPI_LINUX_KERNEL_H
+ 
++#ifdef __GLIBC__
+ #include <linux/sysinfo.h>
++#endif
+ 
+ /*
+  * 'kernel.h' contains some often-used function prototypes etc
+-- 
+2.27.0
+
diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver
@@ -1 +1 @@
-5.7 r0
+5.7 r1