From 91a42305c13b558cfb1f510754afcb0a0008aca8 Mon Sep 17 00:00:00 2001 From: Mark Pryor Date: Sun, 13 Oct 2024 13:49:31 -0700 Subject: [PATCH] mkimage for each xen platform at install Signed-off-by: Mark Pryor --- grub.macros | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/grub.macros b/grub.macros index ba7ff0f..a4ff1ae 100644 --- a/grub.macros +++ b/grub.macros @@ -790,6 +790,7 @@ cd .. \ %define do_xen_install() \ cd grub-%{1}-%{tarversion} \ make DESTDIR=$RPM_BUILD_ROOT install \ +%{expand:%%{xen_mkimage %{1}}} \ if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then \ rm -f $RPM_BUILD_ROOT%{_infodir}/grub.info \ fi \ @@ -800,9 +801,22 @@ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;' \ cd .. \ %{nil} +%define xen_mkimage() \ +pvfile=grub2-%{1}.bin \ + ./grub-mkstandalone -v --compress=xz --locale-dir=%{buildroot}/usr/share/locale --locales=en\@quot --fonts="unicode" \\\ + --modules="linux normal" --themes="" -d grub-core \\\ + -O %{1} -o $pvfile boot/grub/grub.cfg \ +pvdir=%{buildroot}/usr/share/${1}/pvgrub2 \ +if [ ! -d $pvdir ]; then \\\ +install -m 755 -d $pvdir \ +fi \ +install -m 755 $pvfile $pvdir/$pvfile \ +%{nil} + %define do_xen_pvh_install() \ cd grub-%{1}-%{tarversion} \ make DESTDIR=$RPM_BUILD_ROOT install \ +%{expand:%%{xen_mkimage %{1}}} \ if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then \ rm -f $RPM_BUILD_ROOT%{_infodir}/grub.info \ fi \ @@ -906,6 +925,7 @@ ln -s ../boot/grub2/grub.cfg \\\ %dir %{_libdir}/grub/%{2}/ \ %{_libdir}/grub/%{2}/* \ %exclude %{_libdir}/grub/%{2}/*.module \ +%{_datadir}/${2}/pvgrub2/${2} \ %{nil} %define define_xen_pvh_variant_files() \ @@ -914,4 +934,5 @@ ln -s ../boot/grub2/grub.cfg \\\ %dir %{_libdir}/grub/%{2}/ \ %{_libdir}/grub/%{2}/* \ %exclude %{_libdir}/grub/%{2}/*.module \ +%{_datadir}/${2}/pvgrub2/${2} \ %{nil} -- 2.43.5