[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69899] [PATCH 2/7] vm: use #$ for kernel-arguments.
From: |
Zheng Junjie |
Subject: |
[bug#69899] [PATCH 2/7] vm: use #$ for kernel-arguments. |
Date: |
Tue, 19 Mar 2024 23:18:36 +0800 |
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
---
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 @@ (define* (system-qemu-image/shared-store-script os
(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 @@ (define* (linux-image-startup-command image
(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)))
--
2.41.0
- [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 2/7] vm: use #$ for kernel-arguments.,
Zheng Junjie <=
- [bug#69899] [PATCH 7/7] vm: If not the same local architecture, don't enable kvm., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 5/7] linux-initrd: don't add hid-apple module for riscv64-linux., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 1/7] bootloader: Add u-boot-qemu-riscv64-bootloader., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 4/7] gnu: linux-libre-riscv64-generic: add more options., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 6/7] vm: add arguments to use virt machine type for qemu-riscv64., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 3/7] vm: When target riscv64-linux, use u-boot-qemu-riscv64-bootloader., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64., Leo Famulari, 2024/03/26
- bug#69899: [PATCH 0/7] support to use `guix system vm' with riscv64., Ludovic Courtès, 2024/03/31