civodul pushed a commit to branch master
in repository guix.
commit 30cef697d1cd77580d1cf23e42f6a3a410fd726f
Author: Ludovic Courtès <[email protected]>
AuthorDate: Sat Oct 12 18:59:16 2024 +0200
gnu: linux-libre: Add ‘timeout’ property.
This changes adds a ‘timeout’ property, which is necessary when building
either ‘linux-libre’ or ‘linux-libre-headers’ on aarch64-linux, where
deblobbing takes more than 5 hours (the default timeout for Cuirass
jobs).
* gnu/packages/linux.scm (%linux-libre-timeout-properties): New
variable.
(make-linux-libre-headers*): Use it.
(make-linux-libre*): Likewise.
Change-Id: I0c398e06f1b9b1d217fa82493b79bca8589408c0
---
gnu/packages/linux.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 375915bdb3..5888ea470e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -697,6 +697,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given
DEBLOB-SCRIPTS."
;;; Kernel headers.
;;;
+(define %linux-libre-timeout-properties
+ ;; Package properties for 'linux-libre' and 'linux-libre-headers' packages.
+ `((timeout . ,(* 8 3600)) ;deblob takes >5h on AArch64
+ (max-silent-time . ,(* 3 3600)))) ;don't time out on blob scan
+
(define (make-linux-libre-headers version gnu-revision hash-string)
(make-linux-libre-headers* version gnu-revision
(origin
@@ -765,6 +770,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given
DEBLOB-SCRIPTS."
#:allowed-references ()
#:tests? #f))
(supported-systems (delete "i586-gnu" %supported-systems))
+ (properties %linux-libre-timeout-properties)
(home-page "https://www.gnu.org/software/linux-libre/";)
(synopsis "GNU Linux-Libre kernel headers")
(description "Headers of the Linux-Libre kernel.")
@@ -1129,7 +1135,7 @@ ARCH and optionally VARIANT, or #f if there is no such
configuration."
(description "GNU Linux-Libre is a free (as in freedom) variant of the
Linux kernel. It has been modified to remove all non-free binary blobs.")
(license license:gpl2)
- (properties '((max-silent-time . 10800))))) ;don't timeout on blob scan
+ (properties %linux-libre-timeout-properties)))
;;;
