[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: vm: use #$ for kernel-arguments.
From: |
guix-commits |
Subject: |
04/09: vm: use #$ for kernel-arguments. |
Date: |
Sun, 31 Mar 2024 17:05:15 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit a5deb90fd45872e0f4e3c2446b9848e1ea592068
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Tue Mar 19 23:18:36 2024 +0800
vm: use #$ for kernel-arguments.
Use #$ allow cross-compile to with support current system kernel.
e.g. linux-libre-riscv64-generic.
* gnu/system/vm.scm(system-qemu-image/shared-store-script)
(linux-image-startup-command): use #$ for kernel-arguments.
Change-Id: I9d2e7df296ce590b95cd30996b33f8ca692ac1b1
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/system/vm.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index fcfd1cdb48..40e965d272 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -270,7 +271,7 @@ useful when FULL-BOOT? is true."
(volatile-root? volatile?)))))
(define kernel-arguments
#~(list #$@(if graphic? #~() #~("console=ttyS0"))
- #+@(operating-system-kernel-arguments os "/dev/vda1")))
+ #$@(operating-system-kernel-arguments os "/dev/vda1")))
(define rw-image
#~(format #f "/tmp/guix-image-~a" (basename #$base-image)))
@@ -340,7 +341,7 @@ host."
(define kernel-arguments
#~(list #$@(if graphic? #~() #~("console=ttyS0"))
- #+@(operating-system-kernel-arguments os "/dev/vda1")))
+ #$@(operating-system-kernel-arguments os "/dev/vda1")))
#~`(#+(file-append qemu "/bin/"
(qemu-command (or target system)))
- branch master updated (4d79a9cd6b -> 16c7130835), guix-commits, 2024/03/31
- 03/09: bootloader: Add u-boot-qemu-riscv64-bootloader., guix-commits, 2024/03/31
- 04/09: vm: use #$ for kernel-arguments.,
guix-commits <=
- 05/09: vm: When target riscv64-linux, use u-boot-qemu-riscv64-bootloader., guix-commits, 2024/03/31
- 02/09: gnu: shepherd: Update to 0.10.4., guix-commits, 2024/03/31
- 07/09: linux-initrd: don't add hid-apple module for riscv64-linux., guix-commits, 2024/03/31
- 01/09: ui: Autoload some more., guix-commits, 2024/03/31
- 06/09: gnu: linux-libre-riscv64-generic: add more options., guix-commits, 2024/03/31
- 08/09: vm: add arguments to use virt machine type for qemu-riscv64., guix-commits, 2024/03/31
- 09/09: vm: If not the same local architecture, don't enable kvm., guix-commits, 2024/03/31