rosenthal: linux-xanmod: Update to 6.0.10.

* rosenthal/packages/linux.scm (%xanmod-version): Update to 6.0.10.
(doc-supported?): New variable.
(linux-xanmod-source,linux-xanmod): Adjusted accordingly.
remotes/origin/cloudflared-unbundle
Hilton Chain 2 years ago
parent 5478467f96
commit 1f31dedb6f
No known key found for this signature in database
GPG Key ID: 5E5AA665614917F7
  1. 15
      rosenthal/packages/linux.scm
  2. 5
      rosenthal/packages/patches/linux-libre-deblob-check-omit-error.patch

@ -33,6 +33,9 @@
(define deblob-scripts (define deblob-scripts
(@@ (gnu packages linux) deblob-scripts-6.0)) (@@ (gnu packages linux) deblob-scripts-6.0))
(define doc-supported?
(@@ (gnu packages linux) doc-supported?))
(define make-linux-libre-source (define make-linux-libre-source
(@@ (gnu packages linux) make-linux-libre-source)) (@@ (gnu packages linux) make-linux-libre-source))
@ -61,7 +64,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 %xanmod-version "6.0.9") (define %xanmod-version "6.0.10")
(define %xanmod-revision "xanmod1") (define %xanmod-revision "xanmod1")
(define (extract-xanmod-patch version hash) (define (extract-xanmod-patch version hash)
@ -94,14 +97,18 @@
(define linux-xanmod-patch (define linux-xanmod-patch
(extract-xanmod-patch (extract-xanmod-patch
(string-append %xanmod-version "-" %xanmod-revision) (string-append %xanmod-version "-" %xanmod-revision)
"0ar9k5bj75s4ac2a1xlm6l5x96jd6v2azpab19cx19hmgg3c3wh2")) "0ypvr7lp9bhlja3zp97vmfxa80144z1kplsrzqdj301xwrmiki37"))
(define linux-xanmod-source (define linux-xanmod-source
(origin (origin
(inherit (%upstream-linux-source (inherit (%upstream-linux-source
"6.0" "6.0"
(base32 "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w"))) (base32 "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w")))
(patches (list linux-xanmod-patch)))) (patches
(append (list linux-xanmod-patch)
(if (doc-supported? %xanmod-version)
(search-patches "linux-libre-infodocs-target.patch")
'())))))
(define linux-rosenthal-source (define linux-rosenthal-source
(make-linux-libre-source (make-linux-libre-source
@ -125,8 +132,6 @@
(substitute-keyword-arguments (package-arguments base) (substitute-keyword-arguments (package-arguments base)
((#:phases phases) ((#:phases phases)
#~(modify-phases #$phases #~(modify-phases #$phases
(delete 'build-doc)
(delete 'install-doc)
(add-before 'configure 'setenv (add-before 'configure 'setenv
(lambda _ (lambda _
(setenv "LLVM" "1") (setenv "LLVM" "1")

@ -1,8 +1,8 @@
diff --git a/linux-libre-deblob-check b/linux-libre-deblob-check diff --git a/linux-libre-deblob-check b/linux-libre-deblob-check
index 3de0900..e4c7591 100644 index d75b6b3..b45aa90 100644
--- a/linux-libre-deblob-check --- a/linux-libre-deblob-check
+++ b/linux-libre-deblob-check +++ b/linux-libre-deblob-check
@@ -7974,6 +7974,6 @@ $eormatch /^[;][/][*]end .*[*][/][;]$eornl$/ { @@ -7978,7 +7978,7 @@ $eormatch /^[;][/][*]end .*[*][/][;]$eornl$/ {
for (i = nfilenames; --i > 0;) for (i = nfilenames; --i > 0;)
print filenames[i] " within"; print filenames[i] " within";
print filenames[0]; print filenames[0];
@ -10,3 +10,4 @@ index 3de0900..e4c7591 100644
+ exit (0); + exit (0);
} }
} }

Loading…
Cancel
Save