Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lxd for openSUSE:Factory checked in
at 2021-06-04 00:33:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxd (Old)
and /work/SRC/openSUSE:Factory/.lxd.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxd"
Fri Jun 4 00:33:20 2021 rev:31 rq:896774 version:4.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxd/lxd.changes 2021-06-01 10:40:53.525163459
+0200
+++ /work/SRC/openSUSE:Factory/.lxd.new.1898/lxd.changes 2021-06-04
00:33:29.952888079 +0200
@@ -1,0 +2,10 @@
+Tue Jun 1 20:35:20 UTC 2021 - Dirk M??ller <dmuel...@suse.com>
+
+- fix dependencies for aarch64/armv7l
+
+-------------------------------------------------------------------
+Tue Jun 1 11:57:52 UTC 2021 - Aleksa Sarai <asa...@suse.com>
+
+- Fix build on i586 by if_arch-ing out the VM support on non-x86_64 platforms.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxd.spec ++++++
--- /var/tmp/diff_new_pack.nZOyfl/_old 2021-06-04 00:33:30.472888483 +0200
+++ /var/tmp/diff_new_pack.nZOyfl/_new 2021-06-04 00:33:30.476888486 +0200
@@ -25,6 +25,14 @@
%define lxd_datadir %{_datadir}/lxd
%define lxd_ovmfdir %{lxd_datadir}/ovmf
+# 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
+%else
+%define arch_vm_support 0
+%endif
+
Name: lxd
Version: 4.14
Release: 0
@@ -72,6 +80,7 @@
Requires: squashfs
Requires: tar
Requires: xz
+%if 0%{arch_vm_support} != 0
# Needed for VM support.
Requires: qemu-ovmf-x86_64
BuildRequires: qemu-ovmf-x86_64
@@ -82,7 +91,13 @@
%else
Requires: qemu-ui-spice-app
%endif
+%ifarch %ix86 x86_64
Requires: qemu-x86
+%endif
+%ifarch aarch64 %arm
+Requires: qemu-arm
+%endif
+%endif
# Storage backends -- we don't recommend ZFS since it's not *technically* a
# blessed configuration.
Recommends: lvm2
@@ -309,6 +324,7 @@
install -d -m 0711 %{buildroot}%{_localstatedir}/lib/%{name}
install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}
+%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.
@@ -316,6 +332,7 @@
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}
@@ -373,7 +390,9 @@
%config(noreplace) /etc/lxd/config.yml
%dir /etc/lxd/servercerts
+%if 0%{arch_vm_support} != 0
%{lxd_datadir}
+%endif
%{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service
