From bd57b1558f3962058257708b54a0d10e824ba3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B0=E6=B8=85=E7=A8=8B?= <8569417+lan-qingcheng@user.noreply.gitee.com> Date: Fri, 9 Jul 2021 03:59:52 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnova=E4=BB=A5=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=AC=A7=E6=8B=89=E7=B3=BB=E7=BB=9F=E7=9A=84UEFI?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Patch0001-default_uefi_loader_path.patch | 12 ++++++++++++ openstack-nova.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Patch0001-default_uefi_loader_path.patch diff --git a/Patch0001-default_uefi_loader_path.patch b/Patch0001-default_uefi_loader_path.patch new file mode 100644 index 0000000..2a93b9c --- /dev/null +++ b/Patch0001-default_uefi_loader_path.patch @@ -0,0 +1,12 @@ +diff -uNr a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py +--- a/nova/virt/libvirt/driver.py 2020-02-25 20:18:32.000000000 +0800 ++++ b/nova/virt/libvirt/driver.py 2021-07-09 10:49:22.616463820 +0800 +@@ -140,7 +140,7 @@ + + DEFAULT_UEFI_LOADER_PATH = { + "x86_64": "/usr/share/OVMF/OVMF_CODE.fd", +- "aarch64": "/usr/share/AAVMF/AAVMF_CODE.fd" ++ "aarch64": "/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw" + } + + MAX_CONSOLE_BYTES = 100 * units.Ki \ No newline at end of file diff --git a/openstack-nova.spec b/openstack-nova.spec index 9077c93..0e3d30f 100644 --- a/openstack-nova.spec +++ b/openstack-nova.spec @@ -9,7 +9,7 @@ redundant and scalable cloud computing platform. Name: openstack-nova Version: 18.3.0 -Release: 3 +Release: 4 Summary: OpenStack Compute (nova) License: Apache-2.0 URL: https://opendev.org/openstack/nova @@ -47,6 +47,8 @@ Source39: nova_migration_authorized_keys Source40: nova_migration-rootwrap.conf Source41: nova_migration-rootwrap_cold_migration +Patch0001: Patch0001-default_uefi_loader_path.patch + BuildArch: noarch BuildRequires: openstack-macros BuildRequires: intltool @@ -428,6 +430,8 @@ This package contains documentation files for nova. %prep %autosetup -n nova-%{upstream_version} -S git +%Patch0001 -p1 + find . \( -name .gitignore -o -name .placeholder \) -delete find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} + @@ -761,6 +765,8 @@ exit 0 %endif %changelog +* Fri Jul 9 2021 lanqingcheng <878609178@qq.com> +- 修复nova以适配欧拉系统的UEFI程序路径 * Tue Jun 8 2021 zhangy1317 - Fix Requires * Mon May 17 2021 openstack-sig -- Gitee From 10cb6825b11f76f33ba55416b6416c01b935435f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B0=E6=B8=85=E7=A8=8B?= <8569417+lan-qingcheng@user.noreply.gitee.com> Date: Fri, 9 Jul 2021 06:32:49 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=BAgit=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=BB=A5=E9=80=82=E5=BA=94=E6=AC=A7=E6=8B=89=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=9A=84CI=E6=93=8D=E4=BD=9C=20=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=B8=BAgit=E6=A8=A1=E5=BC=8F=E4=BB=A5=E9=80=82=E5=BA=94?= =?UTF-8?q?=E6=AC=A7=E6=8B=89=E7=B3=BB=E7=BB=9F=E7=9A=84CI=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Patch0001-default_uefi_loader_path.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Patch0001-default_uefi_loader_path.patch b/Patch0001-default_uefi_loader_path.patch index 2a93b9c..a11fc47 100644 --- a/Patch0001-default_uefi_loader_path.patch +++ b/Patch0001-default_uefi_loader_path.patch @@ -1,7 +1,8 @@ -diff -uNr a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py ---- a/nova/virt/libvirt/driver.py 2020-02-25 20:18:32.000000000 +0800 -+++ b/nova/virt/libvirt/driver.py 2021-07-09 10:49:22.616463820 +0800 -@@ -140,7 +140,7 @@ +diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py +index 84f7769..e270817 100644 +--- a/nova/virt/libvirt/driver.py ++++ b/nova/virt/libvirt/driver.py +@@ -140,7 +140,7 @@ DEFAULT_FIREWALL_DRIVER = "%s.%s" % ( DEFAULT_UEFI_LOADER_PATH = { "x86_64": "/usr/share/OVMF/OVMF_CODE.fd", -- Gitee