diff options
author | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-04-12 18:54:35 +0200 |
---|---|---|
committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-04-12 18:55:24 +0200 |
commit | c00c61bc4cbdc8b7f1c6caf6a91743423d5c67c9 (patch) | |
tree | 40f835f80f9f1fb10e1d4935ceabb370f07eeb42 /app-emulation/virt-firmware | |
parent | app-emulation/virt-firmware: add 24.4 (diff) | |
download | gentoo-c00c61bc4cbdc8b7f1c6caf6a91743423d5c67c9.tar.gz gentoo-c00c61bc4cbdc8b7f1c6caf6a91743423d5c67c9.tar.bz2 gentoo-c00c61bc4cbdc8b7f1c6caf6a91743423d5c67c9.zip |
app-emulation/virt-firmware: drop 24.2-r1, 24.2_p20240402, 24.2_p20240412
Closes: https://bugs.gentoo.org/929222
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'app-emulation/virt-firmware')
6 files changed, 0 insertions, 232 deletions
diff --git a/app-emulation/virt-firmware/Manifest b/app-emulation/virt-firmware/Manifest index 3d4823583d8f..8181799f3918 100644 --- a/app-emulation/virt-firmware/Manifest +++ b/app-emulation/virt-firmware/Manifest @@ -1,4 +1 @@ -DIST virt-firmware-24.2.tar.gz 110844 BLAKE2B db7ad7663678a313bdd0e23de7e374547e5dbc1a04b37a65e366ae042410a3a6c21ccfef3747a2534cb76906868caaf1364ac1ecd1443c1c1053a5b7687da50b SHA512 8583420acb31fb32e4c195c0c1816b36248ec2e486ded0795e51180e2690b2bcdc10eb8707f4fc9fa36da5b24082737c5c3b2e3988f6c5455e08a5d2a0ff92e7 -DIST virt-firmware-24.2_p20240402.tar.gz 106875 BLAKE2B cdc6bde95a7db347e896c3d33e7ad0715c5a6cbb9a80dbcfb87379bb0f7693c0b96544cb3a1394ce115cfe98321d79339b682f02250930b85ff4bef35d038251 SHA512 50899655fe76e7ed71d3a607030a2067ae97f15f0d3698a54ec388ac6e27e2c2f39b2b4cb5552dad17e184124d62f70d045bc8b5b1f6c5931d477a911be11637 -DIST virt-firmware-24.2_p20240412.tar.gz 107558 BLAKE2B 7412ba0d822dbaee57dc7486805f244ffa43abb2452daa984ca2e878a9fe02d429f525af915e935ee1fc2f1ee2a547858dea48be3cae1ed7fbc37bb142171587 SHA512 0a36f473c9b8f6a26c1e80758bd89a279456a4d76af6ee68200ca80c7da316a3cc4646e76dba248f6f90ace7365bbf9cfb682bab9923b88ae35283631dd7ffb0 DIST virt-firmware-24.4.tar.gz 111964 BLAKE2B 16005a6f911abf227988abaedd45237d44d403f367abd3c2d413f899a6c3e7db2a62edcd36b7408263f101a0f0a20bbea83bf51f7f798077311b478dfc6c9fc1 SHA512 3b13df25177fe5c20e460e2d82453e23ae96cb657f1228ff1c061db4c4197eba719a4d7f51a90fec60a4de2da9a0e9d3f056d53011bd4f61df7f40b706911a1d diff --git a/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch b/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch deleted file mode 100644 index bb45026391eb..000000000000 --- a/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://gitlab.com/kraxel/virt-firmware/-/merge_requests/11 -diff --git a/virt/firmware/bootcfg/linuxcfg.py b/virt/firmware/bootcfg/linuxcfg.py -index 5682b15..121af73 100644 ---- a/virt/firmware/bootcfg/linuxcfg.py -+++ b/virt/firmware/bootcfg/linuxcfg.py -@@ -188,9 +188,10 @@ class LinuxOsInfo(OsRelease): - - def shim_path(self): - esp = self.esp_path() -- subdir = self.esp_distro_dir() -+ distro_dir = self.esp_distro_dir() - arch = self.efi_arch() -- shim = f'{esp}/EFI/{subdir}/shim{arch}.efi' -- if os.path.exists(shim): -- return shim -+ for subdir in distro_dir, 'shim', 'Linux': -+ shim = f'{esp}/EFI/{subdir}/shim{arch}.efi' -+ if os.path.exists(shim): -+ return shim - return None -diff --git a/virt/firmware/bootcfg/main.py b/virt/firmware/bootcfg/main.py -index 04888d5..291903b 100644 ---- a/virt/firmware/bootcfg/main.py -+++ b/virt/firmware/bootcfg/main.py -@@ -34,8 +34,7 @@ def update_next_or_order(cfg, options, nr): - - def add_uki(cfg, options): - if not options.shim and cfg.secureboot: -- logging.error('shim binary not specified') -- sys.exit(1) -+ logging.warning('shim binary not specified') - if not options.title: - logging.error('entry title not specified') - sys.exit(1) -@@ -112,8 +111,8 @@ def boot_success(cfg, options): - - def update_boot_csv(cfg, options): - if not options.shim: -- logging.error('shim binary not specified') -- sys.exit(1) -+ logging.warning('shim binary not specified') -+ sys.exit(0) - efishim = linuxcfg.LinuxEfiFile(options.shim) - shimpath = efishim.dev_path_file() - diff --git a/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch b/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch deleted file mode 100644 index 9af50fb4b310..000000000000 --- a/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://gitlab.com/kraxel/virt-firmware/-/merge_requests/11 -diff --git a/virt/firmware/bootcfg/linuxcfg.py b/virt/firmware/bootcfg/linuxcfg.py -index 5682b15..121af73 100644 ---- a/virt/firmware/bootcfg/linuxcfg.py -+++ b/virt/firmware/bootcfg/linuxcfg.py -@@ -188,9 +188,10 @@ class LinuxOsInfo(OsRelease): - - def shim_path(self): - esp = self.esp_path() -- subdir = self.esp_distro_dir() -+ distro_dir = self.esp_distro_dir() - arch = self.efi_arch() -- shim = f'{esp}/EFI/{subdir}/shim{arch}.efi' -- if os.path.exists(shim): -- return shim -+ for subdir in distro_dir, 'shim', 'Linux': -+ shim = f'{esp}/EFI/{subdir}/shim{arch}.efi' -+ if os.path.exists(shim): -+ return shim - return None diff --git a/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild deleted file mode 100644 index 60c7279c9636..000000000000 --- a/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 - -inherit distutils-r1 optfeature pypi systemd - -DESCRIPTION="Tools for ovmf/armvirt firmware volumes" -HOMEPAGE=" - https://gitlab.com/kraxel/virt-firmware - https://pypi.org/project/virt-firmware/ -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/pefile[${PYTHON_USEDEP}] -" - -distutils_enable_tests unittest - -python_test() { - eunittest tests -} - -python_install_all() { - distutils-r1_python_install_all - - doman man/*.1 - - doinitd "${FILESDIR}/kernel-bootcfg-boot-successful" - systemd_dounit systemd/kernel-bootcfg-boot-successful.service - - exeinto /usr/lib/kernel/install.d - doexe systemd/99-uki-uefi-setup.install -} - -pkg_postinst() { - optfeature "managing UEFI entries on Unified Kernel Image installation and removal" \ - "sys-boot/shim sys-kernel/installkernel[systemd,uki]" -} diff --git a/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild deleted file mode 100644 index aa8ad953dd10..000000000000 --- a/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 systemd optfeature - -COMMIT="07a1e03c356766eda0188d033bad38b8d27d55ef" - -DESCRIPTION="Tools for ovmf/armvirt firmware volumes" -HOMEPAGE=" - https://gitlab.com/kraxel/virt-firmware - https://pypi.org/project/virt-firmware/ -" -SRC_URI="https://gitlab.com/kraxel/virt-firmware/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND=" - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/pefile[${PYTHON_USEDEP}] - || ( - sys-apps/systemd[boot(-)] - sys-apps/systemd-utils[boot(-)] - ) -" # We need bootctl from systemd(-utils) - -PATCHES=( - "${FILESDIR}/${PN}-24.2_p20240402-expand-shim-search.patch" -) - -distutils_enable_tests unittest - -python_test() { - eunittest tests -} - -python_install_all() { - distutils-r1_python_install_all - - doman man/*.1 - - doinitd "${FILESDIR}/kernel-bootcfg-boot-successful" - systemd_dounit systemd/kernel-bootcfg-boot-successful.service - - # Use our own provided by sys-kernel/installkernel[efistub] instead - #exeinto /usr/lib/kernel/install.d - #doexe systemd/99-uki-uefi-setup.install -} - -pkg_postinst() { - optfeature "automatically updating UEFI configuration on each kernel installation or removal" \ - "sys-kernel/installkernel[systemd,efistub]" -} diff --git a/app-emulation/virt-firmware/virt-firmware-24.2_p20240412.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2_p20240412.ebuild deleted file mode 100644 index 2bb58eebf716..000000000000 --- a/app-emulation/virt-firmware/virt-firmware-24.2_p20240412.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 systemd optfeature - -COMMIT="a76f90d60e95883c360ddc1dfcf108e359bc0a78" - -DESCRIPTION="Tools for ovmf/armvirt firmware volumes" -HOMEPAGE=" - https://gitlab.com/kraxel/virt-firmware - https://pypi.org/project/virt-firmware/ -" -SRC_URI="https://gitlab.com/kraxel/virt-firmware/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND=" - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/pefile[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}/${PN}-24.2_p20240402-expand-shim-search.patch" -) - -distutils_enable_tests unittest - -python_test() { - eunittest tests -} - -python_install_all() { - distutils-r1_python_install_all - - doman man/*.1 - - doinitd "${FILESDIR}/kernel-bootcfg-boot-successful" - systemd_dounit systemd/kernel-bootcfg-boot-successful.service - - # Use our own provided by sys-kernel/installkernel[efistub,systemd] - #exeinto /usr/lib/kernel/install.d - #doexe systemd/99-uki-uefi-setup.install -} - -pkg_postinst() { - optfeature "automatically updating UEFI configuration on each kernel installation or removal" \ - "sys-kernel/installkernel[systemd,efistub]" -} |