pool/grub2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 668764 from home:jengelh:branches:Base:System

Browse Source 
- Replace old $RPM_* shell vars.

OBS-URL: https://build.opensuse.org/request/show/668764
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=325
This commit is contained in:
Michael Chang 2019-02-12 08:10:12 +00:00 committed by Git OBS Bridge
parent 2db2e060f1
commit d55d47e08d
2 changed files with 126 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grub2.changes
View File

@ -4,6 +4,11 @@ Mon Jan 28 14:12:05 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add patch to fix ARM boot, when kernel become too big: - Add patch to fix ARM boot, when kernel become too big:
* grub2-move-initrd-upper.patch (boo#1123350) * grub2-move-initrd-upper.patch (boo#1123350)
-------------------------------------------------------------------
Fri Jan 25 22:20:36 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Replace old $RPM_* shell vars.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 25 07:08:32 UTC 2019 - mchang@suse.com Fri Jan 25 07:08:32 UTC 2019 - mchang@suse.com

67
grub2.spec
View File

@ -805,29 +805,28 @@ cd ..
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
cd build-xen cd build-xen
make DESTDIR=$RPM_BUILD_ROOT install %make_install
install -m 644 grub.xen $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubxenarch}/. install -m 644 grub.xen %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/.
cd .. cd ..
%endif %endif
%ifarch %{efi} %ifarch %{efi}
cd build-efi cd build-efi
make DESTDIR=$RPM_BUILD_ROOT install %make_install
install -m 644 grub.efi grub-tpm.efi %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/.
install -m 644 grub.efi grub-tpm.efi $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/.
# Create grub.efi link to system efi directory # Create grub.efi link to system efi directory
# This is for tools like kiwi not fiddling with the path # This is for tools like kiwi not fiddling with the path
%define sysefibasedir %{_datadir}/efi %define sysefibasedir %{_datadir}/efi
%define sysefidir %{sysefibasedir}/%{_target_cpu} %define sysefidir %{sysefibasedir}/%{_target_cpu}
install -d $RPM_BUILD_ROOT%{sysefidir} install -d %{buildroot}/%{sysefidir}
ln -sr $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/grub.efi $RPM_BUILD_ROOT%{sysefidir}/grub.efi ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}/%{sysefidir}/grub.efi
%ifarch x86_64 %ifarch x86_64
# provide compatibility sym-link for previous shim-install and the like # provide compatibility sym-link for previous shim-install and the like
install -d $RPM_BUILD_ROOT/usr/lib64/efi install -d %{buildroot}/usr/lib64/efi
ln -srf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/grub.efi $RPM_BUILD_ROOT/usr/lib64/efi/grub.efi ln -srf %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}/usr/lib64/efi/grub.efi
cat <<-EoM > $RPM_BUILD_ROOT/usr/lib64/efi/DEPRECATED cat <<-EoM >%{buildroot}/usr/lib64/efi/DEPRECATED
This directory and it's contents was moved to %{_datadir}/efi/x86_64. This directory and its contents was moved to %{_datadir}/efi/x86_64.
Individual symbolic links are provided for a smooth transition and Individual symbolic links are provided for a smooth transition and
may vanish at any point in time. Please use the new location! may vanish at any point in time. Please use the new location!
EoM EoM
@ -836,7 +835,7 @@ EoM
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
export BRP_PESIGN_FILES="%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{_datadir}/%{name}/%{grubefiarch}/grub-tpm.efi" export BRP_PESIGN_FILES="%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{_datadir}/%{name}/%{grubefiarch}/grub-tpm.efi"
install -m 444 grub.der $RPM_BUILD_ROOT%{sysefidir}/ install -m 444 grub.der %{buildroot}/%{sysefidir}/
%endif %endif
%endif %endif
@ -845,60 +844,60 @@ cd ..
%if ! 0%{?only_efi:1} %if ! 0%{?only_efi:1}
cd build cd build
make DESTDIR=$RPM_BUILD_ROOT install %make_install
cd .. cd ..
%endif %endif
if [ "%{platform}" = "emu" ]; then if [ "%{platform}" = "emu" ]; then
# emu-lite is currently broken (and not needed), don't install! # emu-lite is currently broken (and not needed), don't install!
rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite rm -f %{buildroot}/%{_bindir}/%{name}-emu-lite
elif [ -d build-emu/grub-core ]; then elif [ -d build-emu/grub-core ]; then
cd build-emu/grub-core cd build-emu/grub-core
install -m 755 grub-emu $RPM_BUILD_ROOT%{_bindir}/%{name}-emu install -m 755 grub-emu %{buildroot}/%{_bindir}/%{name}-emu
if false; then if false; then
# this needs to go to '-emu'-package; until that is ready, don't install! # this needs to go to '-emu'-package; until that is ready, don't install!
install -m 755 grub-emu-lite $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite install -m 755 grub-emu-lite %{buildroot}/%{_bindir}/%{name}-emu-lite
else else
rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite rm -f %{buildroot}/%{_bindir}/%{name}-emu-lite
fi fi
install -m 644 grub-emu.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-emu.1 install -m 644 grub-emu.1 %{buildroot}/%{_mandir}/man1/%{name}-emu.1
cd ../.. cd ../..
fi fi
# *.module files are installed with executable bits due to the way grub2 build # *.module files are installed with executable bits due to the way grub2 build
# system works. Clear executable bits to not confuse find-debuginfo.sh # system works. Clear executable bits to not confuse find-debuginfo.sh
find $RPM_BUILD_ROOT%{_datadir}/%{name} \ find %{buildroot}/%{_datadir}/%{name} \
\( -name '*.module' -o -name '*.image' -o -name '*.exec' \) -print0 | \ \( -name '*.module' -o -name '*.image' -o -name '*.exec' \) -print0 | \
xargs --no-run-if-empty -0 chmod a-x xargs --no-run-if-empty -0 chmod a-x
# Script that makes part of grub.cfg persist across updates # Script that makes part of grub.cfg persist across updates
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/ install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/grub.d/
# Script to generate memtest86+ menu entry # Script to generate memtest86+ menu entry
install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/ install -m 755 %{SOURCE7} %{buildroot}/%{_sysconfdir}/grub.d/
# Ghost config file # Ghost config file
install -d $RPM_BUILD_ROOT/boot/%{name} install -d %{buildroot}/boot/%{name}
touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg touch %{buildroot}/boot/%{name}/grub.cfg
# Remove devel files # Remove devel files
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/*/*.h rm %{buildroot}/%{_datadir}/%{name}/*/*.h
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h rm %{buildroot}/%{_datadir}/%{name}/*.h
%endif %endif
# Defaults # Defaults
install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub install -m 644 -D %{SOURCE2} %{buildroot}/%{_sysconfdir}/default/grub
install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once install -m 755 -D %{SOURCE6} %{buildroot}/%{_sbindir}/grub2-once
install -m 755 -D %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/snapper/plugins/grub install -m 755 -D %{SOURCE12} %{buildroot}/%{_libdir}/snapper/plugins/grub
install -m 755 -D %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/80_suse_btrfs_snapshot install -m 755 -D %{SOURCE14} %{buildroot}/%{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
%if 0%{?has_systemd:1} %if 0%{?has_systemd:1}
install -m 644 -D %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/grub2-once.service install -m 644 -D %{SOURCE15} %{buildroot}/%{_unitdir}/grub2-once.service
install -m 755 -D %{SOURCE17} $RPM_BUILD_ROOT%{_libdir}/systemd/system-sleep/grub2.sleep install -m 755 -D %{SOURCE17} %{buildroot}/%{_libdir}/systemd/system-sleep/grub2.sleep
%endif %endif
install -m 755 -D %{SOURCE18} $RPM_BUILD_ROOT%{_sbindir}/grub2-check-default install -m 755 -D %{SOURCE18} %{buildroot}/%{_sbindir}/grub2-check-default
R=$RPM_BUILD_ROOT R="%{buildroot}"
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%else %else
rm -f $R%{_sysconfdir}/grub.d/20_memtest86+ rm -f $R%{_sysconfdir}/grub.d/20_memtest86+
@ -936,7 +935,7 @@ perl -ni -e '
} }
s{openSUSE}{SUSE Linux Enterprise Server} if (m{^GRUB_DISTRIBUTOR}); s{openSUSE}{SUSE Linux Enterprise Server} if (m{^GRUB_DISTRIBUTOR});
print; print;
' $RPM_BUILD_ROOT%{_sysconfdir}/default/grub ' %{buildroot}/%{_sysconfdir}/default/grub
%else %else
%endif %endif