summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Kehayias <john.kehayias@protonmail.com>2022-12-12 20:59:44 -0500
committerJohn Kehayias <john.kehayias@protonmail.com>2022-12-12 20:59:44 -0500
commit3d53be2c5cc9e0a8f5a76447eb392d7b0901232d (patch)
treed0930acbd466f8ab1c015b9998e6440c4698a04a
parente95e2b573cbc4b96bdca2c11540e90d23e6428fc (diff)
nongnu: corrupt-linux: Rewrite to use customize-linux.kernel-rewrite
This simplifies our linux package definitions to not need hash updates as they simply follow from the inherited part of the source field. The newly added 'customize-linux' procedure from Guix is the preferred way to customize the kernel as well. * nongnu/packages/linux.scm (corrupt-linux): No longer take 'version' or 'hash' arguments. Inherit from 'customize-linux' as a starting package. Remove patch for now removed 'build-doc' phase. (linux-6.0, linux-5.15, linux-5.10, linux-5.4, linux4.19, linux-4.14, linux-4.9, linux-arm64-generic-6.0, linux-arm64-generic-5.15): Remove version and hash strings.
-rw-r--r--nongnu/packages/linux.scm61
1 files changed, 22 insertions, 39 deletions
diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm
index ab9c743..0fd3ac1 100644
--- a/nongnu/packages/linux.scm
+++ b/nongnu/packages/linux.scm
@@ -55,69 +55,52 @@
55 (list (string-append "https://www.kernel.org/pub/linux/kernel/v" 55 (list (string-append "https://www.kernel.org/pub/linux/kernel/v"
56 (version-major version) ".x/linux-" version ".tar.xz"))) 56 (version-major version) ".x/linux-" version ".tar.xz")))
57 57
58(define* (corrupt-linux freedo version hash #:key (name "linux")) 58(define* (corrupt-linux freedo #:key (name "linux"))
59 (package 59 (package
60 (inherit freedo) 60 (inherit
61 (name name) 61 (customize-linux
62 (version version) 62 #:name name
63 (source (origin 63 #:source (origin (inherit (package-source freedo))
64 (method url-fetch) 64 (method url-fetch)
65 (uri (linux-urls version)) 65 (uri (linux-urls (package-version freedo)))
66 (sha256 (base32 hash)) 66 (patches '()))))
67 ;; By default the linux-libre package will "make infodocs" for 67 (version (package-version freedo))
68 ;; supported kernels (version > 5.10) which needs the following 68 (home-page "https://www.kernel.org/")
69 ;; patch. Include the patch if it applies rather than disabling 69 (synopsis "Linux kernel with nonfree binary blobs included")
70 ;; the associated "build-doc" phase. 70 (description
71 (patches (if ((@@ (gnu packages linux) doc-supported?) version) 71 "The unmodified Linux kernel, including nonfree blobs, for running Guix
72 (search-patches "linux-libre-infodocs-target.patch")
73 '()))))
74 (home-page "https://www.kernel.org/")
75 (synopsis "Linux kernel with nonfree binary blobs included")
76 (description
77 "The unmodified Linux kernel, including nonfree blobs, for running Guix
78System on hardware which requires nonfree software to function."))) 72System on hardware which requires nonfree software to function.")))
79 73
80(define-public linux-6.0 74(define-public linux-6.0
81 (corrupt-linux linux-libre-6.0 "6.0.12" 75 (corrupt-linux linux-libre-6.0))
82 "00ag63lnxw2gijw3b6v29lhrlv480m12954q5zh4jawlz3nk1dw9"))
83 76
84(define-public linux-5.15 77(define-public linux-5.15
85 (corrupt-linux linux-libre-5.15 "5.15.82" 78 (corrupt-linux linux-libre-5.15))
86 "0r8v7113favmch2x6br7jk6idihza99l9qyd7ik99i5sg6xzdvpw"))
87 79
88(define-public linux-5.10 80(define-public linux-5.10
89 (corrupt-linux linux-libre-5.10 "5.10.158" 81 (corrupt-linux linux-libre-5.10))
90 "1rq7lyp41fydybs53rcdjhiy271arh95xch16s5s3jhhanxj82hy"))
91 82
92(define-public linux-5.4 83(define-public linux-5.4
93 (corrupt-linux linux-libre-5.4 "5.4.224" 84 (corrupt-linux linux-libre-5.4))
94 "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb"))
95 85
96(define-public linux-4.19 86(define-public linux-4.19
97 (corrupt-linux linux-libre-4.19 "4.19.265" 87 (corrupt-linux linux-libre-4.19))
98 "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p"))
99 88
100(define-public linux-4.14 89(define-public linux-4.14
101 (corrupt-linux linux-libre-4.14 "4.14.299" 90 (corrupt-linux linux-libre-4.14))
102 "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6"))
103 91
104(define-public linux-4.9 92(define-public linux-4.9
105 (corrupt-linux linux-libre-4.9 "4.9.333" 93 (corrupt-linux linux-libre-4.9))
106 "0ash877gkrrc063h6ncl9d4gzyhndanpxsdgf1a93abbfv281gs1"))
107 94
108(define-public linux linux-6.0) 95(define-public linux linux-6.0)
109;; linux-lts points to the *newest* released long-term support version. 96;; linux-lts points to the *newest* released long-term support version.
110(define-public linux-lts linux-5.15) 97(define-public linux-lts linux-5.15)
111 98
112(define-public linux-arm64-generic-6.0 99(define-public linux-arm64-generic-6.0
113 (corrupt-linux linux-libre-arm64-generic "6.0.9" 100 (corrupt-linux linux-libre-arm64-generic #:name "linux-arm64-generic"))
114 "1irip1yk62carcisxlacwcxsiqib4qswx6h5mfhv8f97x04a4531"
115 #:name "linux-arm64-generic"))
116 101
117(define-public linux-arm64-generic-5.15 102(define-public linux-arm64-generic-5.15
118 (corrupt-linux linux-libre-arm64-generic "5.15.79" 103 (corrupt-linux linux-libre-arm64-generic #:name "linux-arm64-generic"))
119 "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb"
120 #:name "linux-arm64-generic"))
121 104
122(define-public linux-arm64-generic linux-arm64-generic-6.0) 105(define-public linux-arm64-generic linux-arm64-generic-6.0)
123 106