ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
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. program to run in that initrd.
@deffn {Scheme Procedure} expression->initrd @var{exp} @ @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) Return as a file-like object a Linux initrd (a gzipped cpio archive)
containing @var{guile} and that evaluates @var{exp}, a G-expression, containing @var{guile} and that evaluates @var{exp}, a G-expression,
upon booting. All the derivations referenced by @var{exp} are upon booting. All the derivations referenced by @var{exp} are

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

@ -55,7 +55,7 @@ (define-module (gnu packages make-bootstrap)
%mes-bootstrap-tarball %mes-bootstrap-tarball
%bootstrap-tarballs %bootstrap-tarballs
%guile-3.0-static-stripped)) %guile-static-stripped))
;;; Commentary: ;;; Commentary:
;;; ;;;
@ -798,7 +798,7 @@ (define* (make-guile-static-stripped static-guile)
(outputs '("out")) (outputs '("out"))
(synopsis "Minimal statically-linked and relocatable Guile"))) (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 ;; A stripped static Guile 3.0 binary, for use in initrds
;; and during bootstrap. ;; and during bootstrap.
(make-guile-static-stripped (make-guile-static-stripped
@ -863,7 +863,7 @@ (define %gcc-bootstrap-tarball
(define %guile-bootstrap-tarball (define %guile-bootstrap-tarball
;; A tarball with the statically-linked, relocatable Guile. ;; 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 (define %mescc-tools-bootstrap-tarball
;; A tarball with statically-linked MesCC binary seed. ;; A tarball with statically-linked MesCC binary seed.

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

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