branch master updated: hydra: honeycomb: Remove custom Linux libre sources.

[Ricardo Wurmus]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 36f8349  hydra: honeycomb: Remove custom Linux libre sources.
36f8349 is described below

commit 36f83499e4c9f6558023c58bbfbb2089a7ff8c77
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Jan 29 21:52:59 2022 +0100

    hydra: honeycomb: Remove custom Linux libre sources.
    
    * hydra/modules/sysadmin/honeycomb.scm (linux-libre-5.15-version,
    linux-libre-5.15-gnu-revision, deblob-scripts-5.15,
    linux-libre-5.15-pristine-source, linux-libre-5.15-source): Remove.
    (linux-libre-arm64-honeycomb): Use linux-libre-5.15-version.
---
 hydra/modules/sysadmin/honeycomb.scm | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/hydra/modules/sysadmin/honeycomb.scm 
b/hydra/modules/sysadmin/honeycomb.scm
index c8ab875..b845be0 100644
--- a/hydra/modules/sysadmin/honeycomb.scm
+++ b/hydra/modules/sysadmin/honeycomb.scm
@@ -59,31 +59,12 @@
   ;; List of authorized 'guix archive' keys.
   (list (local-file "../../keys/guix/berlin.guixsd.org-export.pub")))
 
-(define linux-libre-5.15-version "5.15.5")
-(define linux-libre-5.15-gnu-revision "gnu")
 (define make-linux-libre*
   (@@ (gnu packages linux) make-linux-libre*))
-(define deblob-scripts-5.15
-  ((@@ (gnu packages linux) linux-libre-deblob-scripts)
-   linux-libre-5.15-version
-   linux-libre-5.15-gnu-revision
-   (base32 "1rfhwfzifmbpnrhmrn3srm736nkm1v6affw915d0fgqzqgi8qfai")
-   (base32 "04fj1x3zmi310cr3m9hxpi26gdcmwfsqciv5yb6q6rrnqjqs1pc0")))
-(define linux-libre-5.15-pristine-source
-  (let ((version linux-libre-5.15-version)
-        (hash (base32 "07w5k2y5hk6ys19zgg3x21g6im9x0pwk5f6f8b0q3b152lq5lmp9")))
-    ((@@ (gnu packages linux) make-linux-libre-source)
-     version ((@@ (gnu packages linux) %upstream-linux-source) version hash)
-     deblob-scripts-5.15)))
-(define linux-libre-5.15-source
-  ((@@ (gnu packages linux) source-with-patches)
-   linux-libre-5.15-pristine-source
-   (list (@@ (gnu packages linux) %boot-logo-patch)
-         (@@ (gnu packages linux) 
%linux-libre-arm-export-__sync_icache_dcache-patch))))
 
 (define linux-libre-arm64-honeycomb
   (make-linux-libre*
-   "5.15.5"
+   linux-libre-5.15-version
    linux-libre-5.15-gnu-revision
    linux-libre-5.15-source
    '("aarch64-linux")
@@ -129,7 +110,7 @@
          ("CONFIG_TMPFS" . #true)
          ("CONFIG_TMPFS_POSIX_ACL" . #true)
          ("CONFIG_TMPFS_XATTR" . #true)
-;         ("CONFIG_BLK_DEV_RAM_SIZE" . 524288)
+         ;;("CONFIG_BLK_DEV_RAM_SIZE" . 524288)
          ("CONFIG_POWER_RESET_GPIO" . #true)
          ("CONFIG_CRYPTO_USER_API_HASH" . #true)
          ("CONFIG_CRYPTO_USER_API_SKCIPHER" . #true)