From 3dcc817fb5d081ab3a0f879113332e6ee1f4a3aace720ebed8db16453665dd95 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 17 Feb 2019 11:18:40 +0000 Subject: [PATCH] Accepting request 676194 from Base:System - Create compatibility sym-link of grub.xen in the old location to which old VM definition is pointing (bsc#1123942) OBS-URL: https://build.opensuse.org/request/show/676194 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=200 --- grub2.changes | 7 ++++++- grub2.spec | 14 +++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/grub2.changes b/grub2.changes index f448844..93fc136 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 12 08:57:03 UTC 2019 - mchang@suse.com + +- Create compatibility sym-link of grub.xen in the old location to which + old VM definition is pointing (bsc#1123942) + ------------------------------------------------------------------- Mon Jan 28 14:12:05 UTC 2019 - Guillaume GARDET @@ -30,7 +36,6 @@ Wed Jan 23 10:44:09 UTC 2019 - rw@suse.com * grub2-efi-xen-chainload.patch (bsc#1122563) * grub2-efi-xen-removable.patch (refresh) - ------------------------------------------------------------------- Thu Dec 20 09:21:27 UTC 2018 - mchang@suse.com diff --git a/grub2.spec b/grub2.spec index 3bd8e2d..05ad9f4 100644 --- a/grub2.spec +++ b/grub2.spec @@ -807,6 +807,14 @@ cd .. cd build-xen %make_install install -m 644 grub.xen %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/. +# provide compatibility sym-link for VM definitions pointing to old location +install -d %{buildroot}%{_libdir}/%{name}/%{grubxenarch} +ln -srf %{buildroot}%{_datadir}/%{name}/%{grubxenarch}/grub.xen %{buildroot}%{_libdir}/%{name}/%{grubxenarch}/grub.xen +cat <<-EoM >%{buildroot}%{_libdir}/%{name}/%{grubxenarch}/DEPRECATED + This directory and its contents was moved to %{_datadir}/%{name}/%{grubxenarch}. + Individual symbolic links are provided for a smooth transition. + Please update your VM definition files to use the new location! +EoM cd .. %endif @@ -820,7 +828,7 @@ install -m 644 grub.efi grub-tpm.efi %{buildroot}/%{_datadir}/%{name}/%{grubefia %define sysefibasedir %{_datadir}/efi %define sysefidir %{sysefibasedir}/%{_target_cpu} install -d %{buildroot}/%{sysefidir} -ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}/%{sysefidir}/grub.efi +ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}%{sysefidir}/grub.efi %ifarch x86_64 # provide compatibility sym-link for previous shim-install and the like install -d %{buildroot}/usr/lib64/efi @@ -1271,8 +1279,12 @@ fi %ifarch %{ix86} x86_64 %files %{grubxenarch} +%defattr(-,root,root,-) %dir %{_datadir}/%{name}/%{grubxenarch} %{_datadir}/%{name}/%{grubxenarch}/* +# provide compatibility sym-link for VM definitions pointing to old location +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/%{grubxenarch} %endif %if 0%{?has_systemd:1}