From 74165feb3c660c2f4c6adf76f2f3787e173461c6a6270d71ececcd398b64780a Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Thu, 14 Feb 2019 15:38:58 +0000 Subject: [PATCH 1/4] Accepting request 674894 from home:michael-chang:boo:1123942 - Create compatibility sym-link of grub.xen in the old location to which old VM definition is pointing (boo#1123942) OBS-URL: https://build.opensuse.org/request/show/674894 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=326 --- grub2.changes | 7 ++++++- grub2.spec | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/grub2.changes b/grub2.changes index f448844..34b30bc 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 (boo#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..1a38d94 100644 --- a/grub2.spec +++ b/grub2.spec @@ -807,6 +807,9 @@ 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 cd .. %endif @@ -1273,6 +1276,10 @@ fi %files %{grubxenarch} %dir %{_datadir}/%{name}/%{grubxenarch} %{_datadir}/%{name}/%{grubxenarch}/* +# provide compatibility sym-link for VM definitions pointing to old location +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/%{grubxenarch} +%{_libdir}/%{name}/%{grubxenarch}/grub.xen %endif %if 0%{?has_systemd:1} From 00d6c5894e8acd94fe3763dc4896a09bccb2fd0905bd9a755aa19a90f728dacf Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Thu, 14 Feb 2019 15:51:15 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=327 --- grub2.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/grub2.spec b/grub2.spec index 1a38d94..8493134 100644 --- a/grub2.spec +++ b/grub2.spec @@ -808,8 +808,13 @@ 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 +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 @@ -823,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 @@ -1274,12 +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} -%dir %{_libdir}/%{name}/%{grubxenarch} -%{_libdir}/%{name}/%{grubxenarch}/grub.xen +%dir %{_datadir}/%{name} +%{_libdir}/%{name}/%{grubxenarch} %endif %if 0%{?has_systemd:1} From 0a1083c9b1dc270f40d38d8b88a836710b2e8b68cbe03fb0e43e06c63d229d53 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Thu, 14 Feb 2019 15:59:25 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=328 --- grub2.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub2.changes b/grub2.changes index 34b30bc..93fc136 100644 --- a/grub2.changes +++ b/grub2.changes @@ -2,7 +2,7 @@ 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 (boo#1123942) + old VM definition is pointing (bsc#1123942) ------------------------------------------------------------------- Mon Jan 28 14:12:05 UTC 2019 - Guillaume GARDET From 9633303c76949f961727227355277976e84251b2cb3a60d10f924cb6ca75f0e6 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Thu, 14 Feb 2019 16:35:45 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=329 --- grub2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub2.spec b/grub2.spec index 8493134..05ad9f4 100644 --- a/grub2.spec +++ b/grub2.spec @@ -1283,7 +1283,7 @@ fi %dir %{_datadir}/%{name}/%{grubxenarch} %{_datadir}/%{name}/%{grubxenarch}/* # provide compatibility sym-link for VM definitions pointing to old location -%dir %{_datadir}/%{name} +%dir %{_libdir}/%{name} %{_libdir}/%{name}/%{grubxenarch} %endif