summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorZheng Junjie <z572@z572.online>2025-03-03 00:02:32 +0800
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:30 +0200
commit93d9cd7c22546b0e968c24834b515bec1e4af963 (patch)
treef9031d87321d05662e88b97f033ff6791580d859 /gnu
parent891942f2c5069d52ee2322708698a15058e05014 (diff)
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
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/commencement.scm2
-rw-r--r--gnu/packages/cross-base.scm8
-rw-r--r--gnu/packages/linux.scm13
-rw-r--r--gnu/packages/make-bootstrap.scm2
4 files changed, 7 insertions, 18 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7c17005873e..c167d25286d 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2666,7 +2666,7 @@ memoized as a function of '%current-system'."
2666 (substitute* "scripts/min-tool-version.sh" 2666 (substitute* "scripts/min-tool-version.sh"
2667 (("echo 5\\.1\\.0") ;GCC 2667 (("echo 5\\.1\\.0") ;GCC
2668 "echo 4.8.4") 2668 "echo 4.8.4")
2669 (("echo 2\\.23\\.0") ;binutils 2669 (("echo 2\\.25\\.0") ;binutils
2670 "echo 2.20.1"))))))))) 2670 "echo 2.20.1")))))))))
2671 (native-inputs 2671 (native-inputs
2672 `(("perl" ,perl-boot0) 2672 `(("perl" ,perl-boot0)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index d3dfe5047df..6f67237df05 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -418,9 +418,7 @@ target that libc."
418(define* (cross-kernel-headers/deprecated target 418(define* (cross-kernel-headers/deprecated target
419 #:optional 419 #:optional
420 (linux-headers 420 (linux-headers
421 (if (target-loongarch64? target) 421 linux-libre-headers)
422 linux-libre-headers-5.19.17
423 linux-libre-headers))
424 (xgcc (cross-gcc target)) 422 (xgcc (cross-gcc target))
425 (xbinutils (cross-binutils target))) 423 (xbinutils (cross-binutils target)))
426 (warning (G_ "'cross-kernel-headers' must be used with keyword arguments~%")) 424 (warning (G_ "'cross-kernel-headers' must be used with keyword arguments~%"))
@@ -495,9 +493,7 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils."
495 493
496(define* (cross-kernel-headers* target 494(define* (cross-kernel-headers* target
497 #:key 495 #:key
498 (linux-headers (if (target-loongarch64? target) 496 (linux-headers linux-libre-headers)
499 linux-libre-headers-5.19.17
500 linux-libre-headers))
501 (xgcc (cross-gcc target)) 497 (xgcc (cross-gcc target))
502 (xbinutils (cross-binutils target))) 498 (xbinutils (cross-binutils target)))
503 "Return headers depending on TARGET." 499 "Return headers depending on TARGET."
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 94d73b0fe8b..a89d2c21500 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -839,16 +839,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
839 839
840;; The following package is used in the early bootstrap, and thus must be kept 840;; The following package is used in the early bootstrap, and thus must be kept
841;; stable and with minimal build requirements. 841;; stable and with minimal build requirements.
842(define-public linux-libre-headers-5.15.49 842(define-public linux-libre-headers-6.12.17
843 (make-linux-libre-headers "5.15.49" "gnu" 843 (make-linux-libre-headers "6.12.17" "gnu"
844 "13zqdcm4664vh7g57sxbfrlpsxm7zrma72mxdfdz7d9yndy2gfv8")) 844 "1j3iyivh8h9abryjqksf4k51wgwnwqy2l3zsc019bm84xmka38xm"))
845 845
846;; linux 5.19 include loongarch support. 846(define-public linux-libre-headers linux-libre-headers-6.12.17)
847(define-public linux-libre-headers-5.19.17
848 (make-linux-libre-headers "5.19.17" "gnu"
849 "0m1yabfvaanbzv0ip04r4kvs16aq0pp2dk93xzi5cq18i3vw351m"))
850
851(define-public linux-libre-headers linux-libre-headers-5.15.49)
852;; linux-libre-headers-latest points to the latest headers package 847;; linux-libre-headers-latest points to the latest headers package
853;; and should be used as a dependency for packages that depend on 848;; and should be used as a dependency for packages that depend on
854;; the headers. 849;; the headers.
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 03a51989469..5a08f89a375 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."
479 (target-hurd? (%current-target-system))) 479 (target-hurd? (%current-target-system)))
480 (string-suffix? "-hurd" (%current-system))) 480 (string-suffix? "-hurd" (%current-system)))
481 gnumach-headers) 481 gnumach-headers)
482 ;; linux 5.19 include loongarch support.
483 ((target-loongarch64?) linux-libre-headers-5.19.17)
484 (else linux-libre-headers))))) 482 (else linux-libre-headers)))))
485 (propagated-inputs '()) 483 (propagated-inputs '())
486 484