aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Martinet <dominique.martinet@atmark-techno.com>2021-03-31 12:09:15 +0900
committerNatanael Copa <ncopa@alpinelinux.org>2021-04-15 09:30:16 +0000
commitad1846cfc4cffcf296ff3a3570bf05dc54afa050 (patch)
treeda26237984e5d99b513f73ac0edbcedfa879c119
parent2e4f456b07e23ffaef211f0c77f139ed0f5f702a (diff)
downloadaports-ad1846cfc4cffcf296ff3a3570bf05dc54afa050.tar.gz
aports-ad1846cfc4cffcf296ff3a3570bf05dc54afa050.tar.bz2
aports-ad1846cfc4cffcf296ff3a3570bf05dc54afa050.tar.xz
main/linux-headers: update to 5.10.27
upstream moved constants from linux/kernel.h to linux/const.h, so 0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch had to be slightly adjusted, but there is no change in content. See linux's a85cbe6159ff ("uapi: move constants from <linux/kernel.h> to <linux/const.h>") for details
-rw-r--r--main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch14
-rw-r--r--main/linux-headers/APKBUILD8
2 files changed, 11 insertions, 11 deletions
diff --git a/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
index b5c4e1750e..f3381c4b18 100644
--- a/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ b/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
@@ -13,17 +13,17 @@ Upstream-Status: Submitted
include/uapi/linux/kernel.h | 2 ++
1 file changed, 2 insertions(+)
-Index: linux-4.8-rc4/include/uapi/linux/kernel.h
-===================================================================
---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
-+++ linux-4.8-rc4/include/uapi/linux/kernel.h
-@@ -1,7 +1,9 @@
+diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
+index fadf2db71fe8..813800ed141f 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
+ #include <linux/const.h>
- /*
- * 'kernel.h' contains some often-used function prototypes etc
+ #endif /* _UAPI_LINUX_KERNEL_H */
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index a6078f643d..b723ab151a 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=linux-headers
-pkgver=5.7.8
+pkgver=5.10.27
_kernver=${pkgver%.*}
pkgrel=0
pkgdesc="Linux system headers"
@@ -47,8 +47,8 @@ package() {
rm -rf "$pkgdir"/usr/include/drm
}
-sha512sums="45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6 linux-5.7.tar.xz
-4820a45fba9fa299181a96598a96bbdbf6f5faaf1862173d9cca3cc5ea84c21d8e7d4baf0601697565fad3b7d3c76085f4ac86a726961b62c356d70968edc48f patch-5.7.8.xz
+sha512sums="95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e linux-5.10.tar.xz
+fb18bbd9cfac84e438ea00e3a1a8e9e2a74ea91da57c3ed0f87c0028ffaa7be88be9b5c2f382ac4be06ff468b187480f719eed4df7b38bf9f7beaeddb352c0eb patch-5.10.27.xz
32597f2672d1ec365a936d15041a7cf219ef9353241d4a5c378244cf2fc155610443a19bbcd391c86099a0b08486c45e042ec7c90b0d04fe675c3ad0ffc36b53 revert-broken-uapi.patch
-302283b1b5f560c850e24aad73febcf7f906ed62b4cad2d826bf140ffe59191631f3cd4ac29525c349cdfe61aba6a47886a0d76f1c6a4a16b744d59b94ea5df8 0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+607c074d72aca88fea9ecdbd62198d8f7857daca75e5d027966e0a9997338d6ac8ce0a1e9114b19232b390751d05acca09e28b0cfad2a12d5942f5575a9f4684 0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
7cfa786144009c52d682e307bb512156e4812d7abe03b3fed99651a02d80567d47ee6f347f88d083c1b9805e0c09625fc3df08a8d0ae96b169d24eb5b83917b7 include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch"