commit:     4b9e5a3c992ce5628ca1b87f1b24aef271613c46
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 21:10:23 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 16:30:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9e5a3c

app-containers/incus: Update edk2 OVMF path adjustment

These files now live in /usr/share/edk2/OvmfX64. No revbump as there is a
compatibility symlink.

Closes: https://github.com/gentoo/gentoo/pull/38813
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-containers/incus/incus-6.0.1-r1.ebuild | 2 +-
 app-containers/incus/incus-6.0.2.ebuild    | 2 +-
 app-containers/incus/incus-6.5-r1.ebuild   | 2 +-
 app-containers/incus/incus-6.6.ebuild      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-containers/incus/incus-6.0.1-r1.ebuild 
b/app-containers/incus/incus-6.0.1-r1.ebuild
index 6a00a3b589ab..ff4ba32ceb36 100644
--- a/app-containers/incus/incus-6.0.1-r1.ebuild
+++ b/app-containers/incus/incus-6.0.1-r1.ebuild
@@ -100,7 +100,7 @@ src_prepare() {
 
        # Fix hardcoded ovmf file path, see bug 763180
        sed -i \
-               -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+               -e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
                -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
                doc/environment.md \
                internal/server/apparmor/instance.go \

diff --git a/app-containers/incus/incus-6.0.2.ebuild 
b/app-containers/incus/incus-6.0.2.ebuild
index aaf998d9ce31..edd9f6c5c5e9 100644
--- a/app-containers/incus/incus-6.0.2.ebuild
+++ b/app-containers/incus/incus-6.0.2.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
                Makefile || die
 
        sed -i \
-               -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+               -e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
                -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
                internal/server/instance/drivers/edk2/driver_edk2.go || die 
"Failed to fix hardcoded ovmf paths."
 

diff --git a/app-containers/incus/incus-6.5-r1.ebuild 
b/app-containers/incus/incus-6.5-r1.ebuild
index a703537528cf..65a3654dfb92 100644
--- a/app-containers/incus/incus-6.5-r1.ebuild
+++ b/app-containers/incus/incus-6.5-r1.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
                Makefile || die
 
        sed -i \
-               -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+               -e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
                -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
                internal/server/instance/drivers/edk2/driver_edk2.go || die 
"Failed to fix hardcoded ovmf paths."
 

diff --git a/app-containers/incus/incus-6.6.ebuild 
b/app-containers/incus/incus-6.6.ebuild
index a703537528cf..65a3654dfb92 100644
--- a/app-containers/incus/incus-6.6.ebuild
+++ b/app-containers/incus/incus-6.6.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
                Makefile || die
 
        sed -i \
-               -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+               -e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
                -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
                internal/server/instance/drivers/edk2/driver_edk2.go || die 
"Failed to fix hardcoded ovmf paths."
 

Reply via email to