pool/lxd
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 1243461 from Virtualization:containers

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1243461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxd?expand=0&rev=62
This commit is contained in:
Ana Guerrero 2025-02-06 21:05:55 +00:00 committed by Git OBS Bridge
commit 8af3922b4a
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lxd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 25 20:17:42 UTC 2024 - Callum Farmer <gmbr3@opensuse.org>
- Migrate to single LXD/Incus OVMF handling (lxd-ovmf-setup):
* Allow aarch64 arch_vm_support
* Remove OVMF symlinks
* Require the new lxd-ovmf-setup packages
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 11 11:27:33 UTC 2024 - Joshua Smith <smolsheep@opensuse.org> Tue Jun 11 11:27:33 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>

30
lxd.spec
View File

@ -22,12 +22,8 @@
%define _buildshell /bin/bash %define _buildshell /bin/bash
%define import_path github.com/canonical/lxd %define import_path github.com/canonical/lxd
%define lxd_datadir %{_datadir}/lxd # We need OVMF in order to support VMs with LXD.
%define lxd_ovmfdir %{lxd_datadir}/ovmf %ifarch x86_64 aarch64
# We need OVMF in order to support VMs with LXD. At the moment this means we
# can only support it on x86_64.
%ifarch x86_64
%define arch_vm_support 1 %define arch_vm_support 1
%else %else
%define arch_vm_support 0 %define arch_vm_support 0
@ -84,8 +80,12 @@ Requires: tar
Requires: xz Requires: xz
%if 0%{arch_vm_support} != 0 %if 0%{arch_vm_support} != 0
# Needed for VM support. # Needed for VM support.
Requires: qemu-ovmf-x86_64 %ifarch x86_64
BuildRequires: qemu-ovmf-x86_64 Requires: lxd-ovmf-setup-x86_64
%endif
%ifarch aarch64
Requires: lxd-ovmf-setup-aarch64
%endif
# QEMU spice became a separate package for QEMU 5.2, which is not in Leap 15.2. # QEMU spice became a separate package for QEMU 5.2, which is not in Leap 15.2.
# But it exists in Tumbleweed so only require this in Tumbleweed. # But it exists in Tumbleweed so only require this in Tumbleweed.
%if 0%{?suse_version} > 1500 || 0%{?sle_version} == 150300 %if 0%{?suse_version} > 1500 || 0%{?sle_version} == 150300
@ -361,16 +361,6 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}
# sysusers.d # sysusers.d
install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
%if 0%{arch_vm_support} != 0
# In order for VM support in LXD to function, you need to have OVMF configured
# in the way it expects. In particular, LXD depends on specific filenames for
# the firmware files so we create fake ones with symlinks.
mkdir -p %{buildroot}%{lxd_ovmfdir}
ln -s %{_datarootdir}/qemu/ovmf-x86_64-code.bin %{buildroot}%{lxd_ovmfdir}/OVMF_CODE.fd
ln -s %{_datarootdir}/qemu/ovmf-x86_64-vars.bin %{buildroot}%{lxd_ovmfdir}/OVMF_VARS.fd
ln -s OVMF_VARS.fd %{buildroot}%{lxd_ovmfdir}/OVMF_VARS.ms.fd
%endif
%fdupes %{buildroot} %fdupes %{buildroot}
%pre -f %{name}.pre %pre -f %{name}.pre
@ -425,10 +415,6 @@ grep -q '^root:' /etc/subgid || \
%config(noreplace) /etc/lxd/config.yml %config(noreplace) /etc/lxd/config.yml
%dir /etc/lxd/servercerts %dir /etc/lxd/servercerts
%if 0%{arch_vm_support} != 0
%{lxd_datadir}
%endif
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_sysusersdir}/%{name}.conf %{_sysusersdir}/%{name}.conf