linuxHeaders: 5.18 -> 5.19
This commit is contained in:
parent
24ae20a455
commit
8907016b22
|
@ -84,18 +84,15 @@ let
|
||||||
in {
|
in {
|
||||||
inherit makeLinuxHeaders;
|
inherit makeLinuxHeaders;
|
||||||
|
|
||||||
linuxHeaders = let version = "5.18"; in
|
linuxHeaders = let version = "5.19"; in
|
||||||
makeLinuxHeaders {
|
makeLinuxHeaders {
|
||||||
inherit version;
|
inherit version;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "1vjwhl4s8qxfg1aabn8xnpjza3qzrjcp5450h9qpjvl999lg3wsi";
|
sha256 = "1a05a3hw4w3k530mxhns96xw7hag743xw5w967yazqcykdbhq97z";
|
||||||
};
|
};
|
||||||
patches = [
|
patches = [
|
||||||
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
|
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
|
||||||
|
|
||||||
# 5.19 backport. Can be removed on update.
|
|
||||||
./restore-__bitwise__.patch
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
https://github.com/torvalds/linux/commit/caa28984163cb63ea0be4cb8dbf05defdc7303f9
|
|
||||||
|
|
||||||
Fixes openiscsi build.
|
|
||||||
--- a/include/uapi/linux/types.h
|
|
||||||
+++ b/include/uapi/linux/types.h
|
|
||||||
@@ -26,6 +26,9 @@
|
|
||||||
#define __bitwise
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* The kernel doesn't use this legacy form, but user space does */
|
|
||||||
+#define __bitwise__ __bitwise
|
|
||||||
+
|
|
||||||
typedef __u16 __bitwise __le16;
|
|
||||||
typedef __u16 __bitwise __be16;
|
|
||||||
typedef __u32 __bitwise __le32;
|
|
Loading…
Reference in a new issue