janneke pushed a commit to branch core-packages-team
in repository guix.
commit 3a9914dc1daca14242ccd90e2287f20aae4b9600
Author: Zheng Junjie <z572@z572.online>
AuthorDate: Mon Mar 3 00:02:32 2025 +0800
gnu: linux-libre-headers: Update to 6.12.17.
* gnu/packages/linux.scm (linux-libre-headers-5.15.49):
Update to 6.12.17 and rename to linux-libre-headers-6.12.17.
(linux-libre-headers-5.19.17): Remove it.
* gnu/packages/cross-base.scm (cross-kernel-headers/deprecated): Remove
loongarch64 case.
(cross-kernel-headers*): Remove loongarch64 case.
* gnu/packages/make-bootstrap.scm (%glibc-stripped): Remove loongarch64
case.
* gnu/packages/commencement.scm (linux-libre-headers-boot0)[arguments]:
Adjust
lower-version-requirements phase.
Change-Id: I56a5f6173379f0c4ec305e7db86cccd940e62304
---
gnu/packages/commencement.scm | 2 +-
gnu/packages/cross-base.scm | 8 ++------
gnu/packages/linux.scm | 13 ++++---------
gnu/packages/make-bootstrap.scm | 2 --
4 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index c8910c746a..485b1fcd1a 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2666,7 +2666,7 @@ memoized as a function of '%current-system'."
(substitute* "scripts/min-tool-version.sh"
(("echo 5\\.1\\.0") ;GCC
"echo 4.8.4")
- (("echo 2\\.23\\.0") ;binutils
+ (("echo 2\\.25\\.0") ;binutils
"echo 2.20.1")))))))))
(native-inputs
`(("perl" ,perl-boot0)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index a4e9c2a9cb..06bd1e12f9 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -419,9 +419,7 @@ target that libc."
(define* (cross-kernel-headers/deprecated target
#:optional
(linux-headers
- (if (target-loongarch64? target)
- linux-libre-headers-5.19.17
- linux-libre-headers))
+ linux-libre-headers)
(xgcc (cross-gcc target))
(xbinutils (cross-binutils target)))
(warning (G_ "'cross-kernel-headers' must be used with keyword arguments~%"))
@@ -496,9 +494,7 @@ the base compiler. Use XBINUTILS as the associated
cross-Binutils."
(define* (cross-kernel-headers* target
#:key
- (linux-headers (if (target-loongarch64? target)
- linux-libre-headers-5.19.17
- linux-libre-headers))
+ (linux-headers linux-libre-headers)
(xgcc (cross-gcc target))
(xbinutils (cross-binutils target)))
"Return headers depending on TARGET."
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a5bf9034fe..c5607bd31f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -813,16 +813,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.15.49
- (make-linux-libre-headers "5.15.49" "gnu"
-
"13zqdcm4664vh7g57sxbfrlpsxm7zrma72mxdfdz7d9yndy2gfv8"))
+(define-public linux-libre-headers-6.12.17
+ (make-linux-libre-headers "6.12.17" "gnu"
+
"1j3iyivh8h9abryjqksf4k51wgwnwqy2l3zsc019bm84xmka38xm"))
-;; linux 5.19 include loongarch support.
-(define-public linux-libre-headers-5.19.17
- (make-linux-libre-headers "5.19.17" "gnu"
-
"0m1yabfvaanbzv0ip04r4kvs16aq0pp2dk93xzi5cq18i3vw351m"))
-
-(define-public linux-libre-headers linux-libre-headers-5.15.49)
+(define-public linux-libre-headers linux-libre-headers-6.12.17)
;; linux-libre-headers-latest points to the latest headers package
;; and should be used as a dependency for packages that depend on
;; the headers.
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 03a5198946..5a08f89a37 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -479,8 +479,6 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(target-hurd? (%current-target-system)))
(string-suffix? "-hurd" (%current-system)))
gnumach-headers)
- ;; linux 5.19 include loongarch support.
- ((target-loongarch64?) linux-libre-headers-5.19.17)
(else linux-libre-headers)))))
(propagated-inputs '())
