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-03-18 22:54:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxd (Old)
and /work/SRC/openSUSE:Factory/.lxd.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxd"
Thu Mar 18 22:54:58 2021 rev:27 rq:879766 version:4.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxd/lxd.changes 2021-03-06 21:19:15.733273295
+0100
+++ /work/SRC/openSUSE:Factory/.lxd.new.2401/lxd.changes 2021-03-18
22:54:59.095533713 +0100
@@ -1,0 +2,6 @@
+Mon Mar 15 16:49:41 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Move OVMF symlinks to /usr/share, /opt is not allowed in SUSE
+ packages.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxd.spec ++++++
--- /var/tmp/diff_new_pack.mj7TX5/_old 2021-03-18 22:54:59.787534460 +0100
+++ /var/tmp/diff_new_pack.mj7TX5/_new 2021-03-18 22:54:59.791534464 +0100
@@ -22,7 +22,8 @@
%define _buildshell /bin/bash
%define import_path github.com/lxc/lxd
-%define lxd_optdir /opt/lxd
+%define lxd_datadir %{_datadir}/lxd
+%define lxd_ovmfdir %{lxd_datadir}/ovmf
Name: lxd
Version: 4.12
@@ -83,8 +84,8 @@
# Storage backends -- we don't recommend ZFS since it's not *technically* a
# blessed configuration.
Recommends: lvm2
-Recommends: thin-provisioning-tools
Recommends: btrfsprogs
+Recommends: thin-provisioning-tools
Suggests: zfs
%description
@@ -305,11 +306,10 @@
# 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.
-export OVMF_DIR="%{buildroot}%{lxd_optdir}/ovmf"
-mkdir -p "$OVMF_DIR"
-ln -s %{_datarootdir}/qemu/ovmf-x86_64-ms-code.bin "$OVMF_DIR/OVMF_CODE.fd"
-ln -s %{_datarootdir}/qemu/ovmf-x86_64-ms-vars.bin "$OVMF_DIR/OVMF_VARS.ms.fd"
-ln -s %{_datarootdir}/qemu/ovmf-x86_64-vars.bin "$OVMF_DIR/OVMF_VARS.fd"
+mkdir -p %{buildroot}%{lxd_ovmfdir}
+ln -s %{_datarootdir}/qemu/ovmf-x86_64-ms-code.bin
%{buildroot}%{lxd_ovmfdir}/OVMF_CODE.fd
+ln -s %{_datarootdir}/qemu/ovmf-x86_64-ms-vars.bin
%{buildroot}%{lxd_ovmfdir}/OVMF_VARS.ms.fd
+ln -s %{_datarootdir}/qemu/ovmf-x86_64-vars.bin
%{buildroot}%{lxd_ovmfdir}/OVMF_VARS.fd
%fdupes %{buildroot}
@@ -363,11 +363,11 @@
%{_mandir}/man*/*
%{_libdir}/%{name}
+%{lxd_datadir}
+
%{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service
-%{lxd_optdir}
-
%dir %{_localstatedir}/lib/%{name}
%dir %{_localstatedir}/log/%{name}
++++++ lxd.service ++++++
--- /var/tmp/diff_new_pack.mj7TX5/_old 2021-03-18 22:54:59.871534551 +0100
+++ /var/tmp/diff_new_pack.mj7TX5/_new 2021-03-18 22:54:59.871534551 +0100
@@ -5,7 +5,7 @@
Documentation=man:lxd(1)
[Service]
-Environment=LXD_OVMF_PATH=/opt/lxd/ovmf
+Environment=LXD_OVMF_PATH=/usr/share/lxd/ovmf
ExecStart=/usr/bin/lxd --group=lxd --logfile=/var/log/lxd/lxd.log
ExecStartPost=/usr/bin/lxd waitready --timeout=600
TimeoutStartSec=600s
