From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lRmbK-0006sC-Ib for mharc-grub-devel@gnu.org; Wed, 31 Mar 2021 21:58:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRmbH-0006jn-2J for grub-devel@gnu.org; Wed, 31 Mar 2021 21:58:23 -0400 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]:39745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRmb9-0007Lb-Hi for grub-devel@gnu.org; Wed, 31 Mar 2021 21:58:22 -0400 Received: by mail-ot1-x334.google.com with SMTP id h6-20020a0568300346b02901b71a850ab4so749899ote.6 for ; Wed, 31 Mar 2021 18:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=efIOgYRLptP+jkFIvevtU2lfhLCmJOhGp+xvRyB5iIc=; b=O0ce640KdLO6SS6POiYdaPWc+epsSoSe6O7wQZMiI4EloECWx01aW90JbDFl7pcZWD UOPdtZqos+lPzUQTr1kJE0rvGhCe52AitIuYdZT2B2raYQ6bp2W+soQQBGSXNRazt0zt xOkiSanIEFG2WQD4vdcuLgRMAnWS0gm2CnjUI/qTMxyfG8q02oItx/T94lxWONzbPMSc mFZjVFStROrC7Dnvs29WNQbmPCy1lx5LFwpGAJ+rKWbTgl9a34OkkJPR6Ngrfv1bHZT/ vEZ61EqsNSokwWzAOmirTiy2tCsD2ka+Sn0AsxiVuR9ZbB2Od2NHasXf27cC/z1f8SDj bPGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=efIOgYRLptP+jkFIvevtU2lfhLCmJOhGp+xvRyB5iIc=; b=pkJ0wWPfm+74pToHalMIAIighL9mtB0Dh43xxjI27bO5ttAOVjo0miO6AXjkOedBk9 pziEsoq4FV4Dws3XI9eckig2SyP25e2Tf6WJ2J3lpKZAPCKRRTvBCbtokIXSPeGJ056j Y0d0/2zVevtir/VEgmwsueW+NDMuwvel38/b09A6S+rlKHkoISA8E0/873FzdHM0vSwG xSYF0eMT2HMSh9bFbhSJhoHuJtaSUAg3gGJN95DiaRGVH7PASeeBJLIpHDYkeTpQRYYK SWnxcztnYt4LkzLxMp44yM/s6QUA7R88IDOMx3KRNstHvwbAbQ4GWTxUK1rLZHx255P9 s/kQ== X-Gm-Message-State: AOAM532d42+RyDafmMK4B2bRWtYB0MO/1fLCOuL0YkZoTw+k2Kdiva77 r7BZnpkxKSyu3Fr+4Wqvug3LUlHI+6NVFg== X-Google-Smtp-Source: ABdhPJyW47JfwtqF4hsbTSl1frDhwesfOvusZKQ+gtEz0zOKt5mcTBgSvG+bGABp2crk3W6j/xl24Q== X-Received: by 2002:a05:6830:1219:: with SMTP id r25mr5078544otp.93.1617242292113; Wed, 31 Mar 2021 18:58:12 -0700 (PDT) Received: from localhost.localdomain ([2605:a601:ab16:db00:1cb0:2038:b70a:65b5]) by smtp.gmail.com with ESMTPSA id z25sm902960otj.68.2021.03.31.18.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 18:58:11 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH 12/12] grub-shell: Update qemu UEFI firmware names to be more generic Date: Wed, 31 Mar 2021 20:57:51 -0500 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::334; envelope-from=development@efficientek.com; helo=mail-ot1-x334.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Apr 2021 01:58:23 -0000 The current qemu firmware paths for arm-efi and arm64-efi are hardcoded and not available on Ubuntu/Debian. Make these paths relative and basenames generic. The idea is that regardless where or what names firmware images are installed under they can be copied and renamed into a temporary directory. Then use the -L argument to qemu to point to that directory. For convenience, the GRUB source directory which build grub-shell will be added to the list of firmware paths that qemu will search. So all that is needed is to copy the firmwares to the source directory with potential renames. Signed-off-by: Glenn Washburn --- tests/util/grub-shell.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in index c69fbd080..1bdfbbeba 100644 --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@ -74,7 +74,7 @@ exec_show_error () { work_directory=${WORKDIR:-`mktemp -d "${TMPDIR:-/tmp}/grub-shell.XXXXXXXXXX"`} || exit 1 . "${builddir}/grub-core/modinfo.sh" -qemuopts="${GRUB_QEMU_OPTS}" +qemuopts="${GRUB_QEMU_OPTS} -L ${srcdir}" serial_port=com0 serial_null= halt_cmd=halt @@ -194,7 +194,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in boot=hd console=console trim=1 - qemuopts="-machine virt -cpu cortex-a57 -bios /usr/share/qemu-efi/QEMU_EFI.fd $qemuopts" + qemuopts="-machine virt -cpu cortex-a57 -bios OVMF-aarch64.fd $qemuopts" disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file=" serial_port= ;; @@ -203,7 +203,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in boot=hd console=console trim=1 - qemuopts="-machine virt -bios /usr/share/ovmf-arm/QEMU_EFI.fd $qemuopts" + qemuopts="-machine virt -bios OVMF-arm.fd $qemuopts" disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file=" serial_port=efi0 ;; -- 2.27.0