all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 69899@debbugs.gnu.org
Subject: [bug#69899] [PATCH 2/7] vm: use #$ for kernel-arguments.
Date: Tue, 19 Mar 2024 23:18:36 +0800	[thread overview]
Message-ID: <384e20b4da664cd75a9e6f3be0b6fff8605033e7.1710861023.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <cover.1710861023.git.zhengjunjie@iscas.ac.cn>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1651 bytes --]

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





  parent reply	other threads:[~2024-03-19 15:19 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-19 15:15 [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64 Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 1/7] bootloader: Add u-boot-qemu-riscv64-bootloader Zheng Junjie
2024-03-19 15:18 ` Zheng Junjie [this message]
2024-03-19 15:18 ` [bug#69899] [PATCH 3/7] vm: When target riscv64-linux, use u-boot-qemu-riscv64-bootloader Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 4/7] gnu: linux-libre-riscv64-generic: add more options Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 5/7] linux-initrd: don't add hid-apple module for riscv64-linux Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 6/7] vm: add arguments to use virt machine type for qemu-riscv64 Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 7/7] vm: If not the same local architecture, don't enable kvm Zheng Junjie
2024-03-26 16:07 ` [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64 Leo Famulari
2024-03-27  9:15   ` Zheng Junjie
2024-03-31 21:02     ` Ludovic Courtès
2024-04-01 17:20       ` Zheng Junjie
2024-04-03 22:42         ` Leo Famulari
2024-04-16 17:04         ` Ludovic Courtès
2024-03-31 21:03 ` bug#69899: " Ludovic Courtès
2024-04-15 15:33 ` [bug#69899] [PATCH 1/2] vm: override %CURRENT-SYSTEM to always use a native emulator Zheng Junjie
2024-04-15 15:33   ` [bug#69899] [PATCH 2/2] vm: Don't add -enable-kvm when SYSTEM and %system are not same Zheng Junjie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=384e20b4da664cd75a9e6f3be0b6fff8605033e7.1710861023.git.zhengjunjie@iscas.ac.cn \
    --to=zhengjunjie@iscas.ac.cn \
    --cc=69899@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.