diff options
| author | Maciek Borzecki | 2025-04-14 14:49:41 +0200 |
|---|---|---|
| committer | Maciek Borzecki | 2025-04-14 14:49:41 +0200 |
| commit | 5b0b6eb83dcbabe687b03f94f74af3e0be7aa593 (patch) | |
| tree | 569e56c91b030076597faf16406b6e0617580edf | |
| parent | b80610a2e3ed13505c1d491a87c5ee5d0f3c7460 (diff) | |
| download | aur-image-garden.tar.gz | |
upgpkg: image-garden 0.2.2-1
upstream release
Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-Allow-overriding-default-OVMF-code-and-vars-blobs-lo.patch | 52 | ||||
| -rw-r--r-- | 0001-Arch-override-default-OVMF-blobs-location.patch (renamed from 0002-Arch-override-default-OVMF-blobs-location.patch) | 0 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
4 files changed, 10 insertions, 68 deletions
@@ -1,16 +1,14 @@ pkgbase = image-garden pkgdesc = Tool for creating test virtual machines - pkgver = 0.1.1 - pkgrel = 3 + pkgver = 0.2.2 + pkgrel = 1 url = https://gitlab.com/zygoon/image-garden arch = any license = Apache-2.0 makedepends = shellcheck - source = image-garden-0.1.1.tar.bz2::https://gitlab.com/zygoon/image-garden/-/archive/v0.1.1/image-garden-v0.1.1.tar.bz2 - source = 0001-Allow-overriding-default-OVMF-code-and-vars-blobs-lo.patch - source = 0002-Arch-override-default-OVMF-blobs-location.patch - sha256sums = e75ce3e9491b474425029787d8b4d456f593d23c62ca593673dfdd3f6bad1595 - sha256sums = 8310ca74ad374b7197d04ed8d4e9ccbea64fd2fc8467a40f7e14c07c2d3d2ece + source = image-garden-0.2.2.tar.bz2::https://gitlab.com/zygoon/image-garden/-/archive/v0.2.2/image-garden-v0.2.2.tar.bz2 + source = 0001-Arch-override-default-OVMF-blobs-location.patch + sha256sums = 92efbfe2c7a0f9221001a043ae2a9e15a556cac548d2922517bceaab6d14a661 sha256sums = 04a824cd0ceee56811f3c1c8b12c0ed7fd7203eefd6559d66cbebffeeff68b48 pkgname = image-garden diff --git a/0001-Allow-overriding-default-OVMF-code-and-vars-blobs-lo.patch b/0001-Allow-overriding-default-OVMF-code-and-vars-blobs-lo.patch deleted file mode 100644 index 0ada8a7d7e40..000000000000 --- a/0001-Allow-overriding-default-OVMF-code-and-vars-blobs-lo.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fc700aa5430881a88fca00cb36d24d6f1d2e75b3 Mon Sep 17 00:00:00 2001 -Message-ID: <fc700aa5430881a88fca00cb36d24d6f1d2e75b3.1738269782.git.maciek.borzecki@gmail.com> -In-Reply-To: <cover.1738269782.git.maciek.borzecki@gmail.com> -References: <cover.1738269782.git.maciek.borzecki@gmail.com> -From: Maciek Borzecki <maciek.borzecki@gmail.com> -Date: Thu, 30 Jan 2025 21:32:12 +0100 -Subject: [PATCH 1/2] Allow overriding default OVMF code and vars blobs - locations - -Not all systems package ovmf binary blobs the same way. Provide lazy -defaults and let packagers override as needed. - -Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com> ---- - mk/010-qemu.mk | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/mk/010-qemu.mk b/mk/010-qemu.mk -index 0d1f38ce77eed5be512b7c8940f1436aec05fe4b..faf43f6982471fb1d21a89dcc640968c9a084bdb 100644 ---- a/mk/010-qemu.mk -+++ b/mk/010-qemu.mk -@@ -72,16 +72,23 @@ QEMU_SYSTEM_AARCH64_EFI_CMDLINE = \ - $${QEMU_NET_OPTION=-netdev user,id=netdev0$${QEMU_NETDEV_USER_EXTRA:-} \ - -device virtio-net-pci,netdev=netdev0,id=net0} - --efi-code.x86_64.img: $(or $(firstword $(wildcard /usr/share/OVMF/OVMF_CODE.fd /usr/share/OVMF/OVMF_CODE_4M.fd)),$(error please install ovmf firmware)) -+# default location on most Debian/Ubuntu systems -+QEMU_OVMF_CODE_X86 ?= /usr/share/OVMF/OVMF_CODE.fd /usr/share/OVMF/OVMF_CODE_4M.fd -+QEMU_OVMF_VARS_X86 ?= /usr/share/OVMF/OVMF_VARS.fd /usr/share/OVMF/OVMF_VARS_4M.fd -+ -+efi-code.x86_64.img: $(or $(firstword $(wildcard $(QEMU_OVMF_CODE_X86))),$(error please install ovmf firmware)) - dd if=$< of=$@ conv=notrunc - --efi-vars.x86_64.img: $(or $(firstword $(wildcard /usr/share/OVMF/OVMF_VARS.fd /usr/share/OVMF/OVMF_VARS_4M.fd)),$(error please install ovmf firmware)) -+efi-vars.x86_64.img: $(or $(firstword $(wildcard $(QEMU_OVMF_VARS_X86))),$(error please install ovmf firmware)) - dd if=$< of=$@ conv=notrunc - --efi-code.aarch64.img: /usr/share/AAVMF/AAVMF_CODE.fd -+QEMU_OVMF_CODE_AARCH64 ?= /usr/share/AAVMF/AAVMF_CODE.fd -+QEMU_OVMF_VARS_AARCH64 ?= /usr/share/AAVMF/AAVMF_VARS.fd -+ -+efi-code.aarch64.img: $(QEMU_OVMF_CODE_AARCH64) - dd if=$< of=$@ conv=notrunc - --efi-vars.aarch64.img: /usr/share/AAVMF/AAVMF_VARS.fd -+efi-vars.aarch64.img: $(QEMU_OVMF_VARS_AARCH64) - dd if=$< of=$@ conv=notrunc - - # UEFI firmware code and state. --- -2.48.1 - diff --git a/0002-Arch-override-default-OVMF-blobs-location.patch b/0001-Arch-override-default-OVMF-blobs-location.patch index ce58f7df6f5f..ce58f7df6f5f 100644 --- a/0002-Arch-override-default-OVMF-blobs-location.patch +++ b/0001-Arch-override-default-OVMF-blobs-location.patch @@ -1,7 +1,7 @@ # Maintainer: Maciej Borzecki <maciek.borzecki@gmail.com pkgname=image-garden -pkgver=0.1.1 -pkgrel=3 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Tool for creating test virtual machines" arch=(any) url="https://gitlab.com/zygoon/image-garden" @@ -17,15 +17,11 @@ options=() install= source=( "$pkgname-$pkgver.tar.bz2::https://gitlab.com/zygoon/${pkgname}/-/archive/v${pkgver}/image-garden-v${pkgver}.tar.bz2" - "0001-Allow-overriding-default-OVMF-code-and-vars-blobs-lo.patch" - "0002-Arch-override-default-OVMF-blobs-location.patch" + "0001-Arch-override-default-OVMF-blobs-location.patch" ) noextract=() -sha256sums=( - 'e75ce3e9491b474425029787d8b4d456f593d23c62ca593673dfdd3f6bad1595' - '8310ca74ad374b7197d04ed8d4e9ccbea64fd2fc8467a40f7e14c07c2d3d2ece' - '04a824cd0ceee56811f3c1c8b12c0ed7fd7203eefd6559d66cbebffeeff68b48' -) +sha256sums=('92efbfe2c7a0f9221001a043ae2a9e15a556cac548d2922517bceaab6d14a661' + '04a824cd0ceee56811f3c1c8b12c0ed7fd7203eefd6559d66cbebffeeff68b48') prepare() { cd "$pkgname-v$pkgver" |