me
/
guix
Archived
1
0
Fork 0
Code

gnu: %guile-3.0-static-stripped: Rename to %guile-static-stripped. 

* gnu/packages/make-bootstrap.scm (%guile-3.0-static-stripped): Rename
to %guile-static-stripped.
(%guile-bootstrap-tarball): Adjust accordingly.
* gnu/system/linux-initrd.scm (expression->initrd): Use
%guile-static-stripped as default guile.
* doc/guix.texi (initial RAM disk)[expression->initrd]: Adjust
documentation accordingly.
master
Efraim Flashner 2021-07-08 09:39:05 +03:00
parent e48cff0965
commit 49e2e75ced
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -32775,7 +32775,7 @@ program. That gives a lot of flexibility. The
program to run in that initrd.
@deffn {Scheme Procedure} expression->initrd @var{exp} @
[#:guile %guile-3.0-static-stripped] [#:name "guile-initrd"]
[#:guile %guile-static-stripped] [#:name "guile-initrd"]
Return as a file-like object a Linux initrd (a gzipped cpio archive)
containing @var{guile} and that evaluates @var{exp}, a G-expression,
upon booting. All the derivations referenced by @var{exp} are

6
gnu/packages/make-bootstrap.scm
View File

@ -55,7 +55,7 @@
%mes-bootstrap-tarball
%bootstrap-tarballs
%guile-3.0-static-stripped))
%guile-static-stripped))
;;; Commentary:
;;;
@ -798,7 +798,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(outputs '("out"))
(synopsis "Minimal statically-linked and relocatable Guile")))
(define %guile-3.0-static-stripped
(define %guile-static-stripped
;; A stripped static Guile 3.0 binary, for use in initrds
;; and during bootstrap.
(make-guile-static-stripped
@ -863,7 +863,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define %guile-bootstrap-tarball
;; A tarball with the statically-linked, relocatable Guile.
(tarball-package %guile-3.0-static-stripped))
(tarball-package %guile-static-stripped))
(define %mescc-tools-bootstrap-tarball
;; A tarball with statically-linked MesCC binary seed.

4
gnu/system/linux-initrd.scm
View File

@ -36,7 +36,7 @@
#:use-module ((gnu packages xorg)
#:select (console-setup xkeyboard-config))
#:use-module ((gnu packages make-bootstrap)
#:select (%guile-3.0-static-stripped))
#:select (%guile-static-stripped))
#:use-module (gnu system file-systems)
#:use-module (gnu system mapped-devices)
#:use-module (gnu system keyboard)
@ -62,7 +62,7 @@
(define* (expression->initrd exp
#:key
(guile %guile-3.0-static-stripped)
(guile %guile-static-stripped)
(gzip gzip)
(name "guile-initrd")
(system (%current-system)))