mbakke pushed a commit to branch core-updates
in repository guix.
commit 97fb977eb8d570f05adc5740af5e12fb740cc91c
Author: Marius Bakke <[email protected]>
AuthorDate: Sat Jun 25 20:59:01 2022 +0200
gnu: linux-libre-headers: Update to 5.15.49.
* gnu/packages/linux.scm (linux-libre-headers-5.10.35): Replace with ...
(linux-libre-headers-5.15.49): This new variable.
(linux-libre-headers): Adjust accordingly.
* gnu/packages/commencement.scm (linux-libre-headers-boot0)[arguments]: Add
phase to lower toolchain requirements.
---
gnu/packages/commencement.scm | 15 +++++++++++++--
gnu/packages/linux.scm | 8 ++++----
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 5b7a697b1f..eff396b911 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2017, 2018, 2019, 2021, 2022 Efraim Flashner
<[email protected]>
;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2018, 2019, 2020, 2021, 2022 Jan (janneke) Nieuwenhuizen
<[email protected]>
-;;; Copyright © 2019, 2020, 2021 Marius Bakke <[email protected]>
+;;; Copyright © 2019-2022 Marius Bakke <[email protected]>
;;; Copyright © 2020, 2022 Timothy Sample <[email protected]>
;;; Copyright © 2020 Guy Fleury Iteriteka <[email protected]>
;;; Copyright © 2021 Maxim Cournoyer <[email protected]>
@@ -2486,7 +2486,18 @@ memoized as a function of '%current-system'."
(arguments
`(#:guile ,%bootstrap-guile
#:implicit-inputs? #f
- ,@(package-arguments linux-libre-headers)))
+ ,@(substitute-keyword-arguments (package-arguments linux-libre-headers)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'lower-version-requirements
+ (lambda _
+ ;; Pacify version checks so it works with the bootstrap
+ ;; toolchain, since we are not building the full kernel.
+ (substitute* "scripts/min-tool-version.sh"
+ (("echo 5\\.1\\.0") ;GCC
+ "echo 4.9.4")
+ (("echo 2\\.23\\.0") ;binutils
+ "echo 2.20.1")))))))))
(native-inputs
`(("perl" ,perl-boot0)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e17e1ef42d..2fd813c5b7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -639,11 +639,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the
given DEBLOB-SCRIPTS."
;; The following package is used in the early bootstrap, and thus must be kept
;; stable and with minimal build requirements.
-(define-public linux-libre-headers-5.10.35
- (make-linux-libre-headers "5.10.35" "gnu"
-
"0q2rnchad55d49f3rajrkazz0fcjv1irwrdb1hwjnl01fzm2gjk3"))
+(define-public linux-libre-headers-5.15.49
+ (make-linux-libre-headers "5.15.49" "gnu"
+
"13zqdcm4664vh7g57sxbfrlpsxm7zrma72mxdfdz7d9yndy2gfv8"))
-(define-public linux-libre-headers linux-libre-headers-5.10.35)
+(define-public linux-libre-headers linux-libre-headers-5.15.49)
;;;
