rosenthal: linux: Update source to 6.0.11.

* rosenthal/packages/linux.scm (%linux-version,linux-xanmod-patch)
(linux-hardened-patch,linux-hardened-source): Update to 6.0.11.
(linux-hardened-patch-for-xanmod): Use a fixed file name.
* rosenthal/packages/patches/linux-hardened-xanmod-adaption.patch: Updated
accordingly.
remotes/origin/cloudflared-unbundle
Hilton Chain 2 years ago
parent be9036707e
commit 60da81067c
No known key found for this signature in database
GPG Key ID: 5E5AA665614917F7
  1. 9
      rosenthal/packages/linux.scm
  2. 8
      rosenthal/packages/patches/linux-hardened-xanmod-adaption.patch

@ -61,7 +61,7 @@
(define %ldflags "-Wl,-z,defs -Wl,-z,now -Wl,-z,relro -Wl,-pie") (define %ldflags "-Wl,-z,defs -Wl,-z,now -Wl,-z,relro -Wl,-pie")
(define %linux-version "6.0.10") (define %linux-version "6.0.11")
(define %xanmod-version "xanmod1") (define %xanmod-version "xanmod1")
(define %hardened-version "hardened1") (define %hardened-version "hardened1")
@ -95,7 +95,7 @@
(define linux-xanmod-patch (define linux-xanmod-patch
(extract-xanmod-patch (extract-xanmod-patch
(string-append %linux-version "-" %xanmod-version) (string-append %linux-version "-" %xanmod-version)
(base32 "0ypvr7lp9bhlja3zp97vmfxa80144z1kplsrzqdj301xwrmiki37"))) (base32 "0kfjy8g00dw4x9absdr5i0bx54h012a40h23cvlq1pxvsxga17m0")))
(define linux-hardened-patch (define linux-hardened-patch
(origin (origin
@ -105,11 +105,12 @@
%linux-version "-" %hardened-version "/linux-hardened-" %linux-version "-" %hardened-version "/linux-hardened-"
%linux-version "-" %hardened-version ".patch")) %linux-version "-" %hardened-version ".patch"))
(sha256 (sha256
(base32 "1zbhqwhbzjc2jsmbrqk6y4w62b9drhzh2kb1p5bwgi3nd17f43jj")))) (base32 "0y48mj6sj43s1d58gds0v8dbyiavsvl5n0a8iqjs0fb8f6wbld0r"))))
(define linux-hardened-patch-for-xanmod (define linux-hardened-patch-for-xanmod
(origin (origin
(inherit linux-hardened-patch) (inherit linux-hardened-patch)
(file-name "linux-hardened.patch")
(patches (patches
(list (local-file "patches/linux-hardened-xanmod-adaption.patch"))))) (list (local-file "patches/linux-hardened-xanmod-adaption.patch")))))
@ -124,7 +125,7 @@
(origin (origin
(inherit (%upstream-linux-source (inherit (%upstream-linux-source
%linux-version %linux-version
(base32 "1l0xak4w7c16cg8lhracy8r18zzdl0x5s654w6ivyw6dhk6pzr9r"))) (base32 "0qn7m74wfixqk832j2yvgf2lq4vi55agm5gk9ziy2wa9wqqn3bib")))
(patches (list linux-hardened-patch)))) (patches (list linux-hardened-patch))))
(define linux-rosenthal-source (define linux-rosenthal-source

@ -1,7 +1,7 @@
diff --git a/linux-hardened-6.0.10-hardened1.patch b/linux-hardened-6.0.10-hardened1.patch diff --git a/linux-hardened.patch b/linux-hardened.patch
index 9cc8a0f..e7e71a7 100644 index 9e4c6a0..e5e0c5a 100644
--- a/linux-hardened-6.0.10-hardened1.patch --- a/linux-hardened.patch
+++ b/linux-hardened-6.0.10-hardened1.patch +++ b/linux-hardened.patch
@@ -1545,22 +1545,6 @@ index 205d605cacc5b..26c15bed8f7b4 100644 @@ -1545,22 +1545,6 @@ index 205d605cacc5b..26c15bed8f7b4 100644
int proc_dointvec_jiffies(struct ctl_table *table, int write, int proc_dointvec_jiffies(struct ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)

Loading…
Cancel
Save