Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2019-02-14 14:12:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Thu Feb 14 14:12:45 2019 rev:199 rq:673568 version:2.02 Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2019-02-06 15:44:35.571362155 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new.28833/grub2.changes 2019-02-14 14:12:47.352238425 +0100 @@ -7,0 +8,5 @@ +Fri Jan 25 22:20:36 UTC 2019 - Jan Engelhardt <[email protected]> + +- Replace old $RPM_* shell vars. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.CBN27r/_old 2019-02-14 14:12:49.028237594 +0100 +++ /var/tmp/diff_new_pack.CBN27r/_new 2019-02-14 14:12:49.032237592 +0100 @@ -805,29 +805,28 @@ %ifarch %{ix86} x86_64 cd build-xen -make DESTDIR=$RPM_BUILD_ROOT install -install -m 644 grub.xen $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubxenarch}/. +%make_install +install -m 644 grub.xen %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/. cd .. %endif %ifarch %{efi} cd build-efi -make DESTDIR=$RPM_BUILD_ROOT install - -install -m 644 grub.efi grub-tpm.efi $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/. +%make_install +install -m 644 grub.efi grub-tpm.efi %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/. # Create grub.efi link to system efi directory # This is for tools like kiwi not fiddling with the path %define sysefibasedir %{_datadir}/efi %define sysefidir %{sysefibasedir}/%{_target_cpu} -install -d $RPM_BUILD_ROOT%{sysefidir} -ln -sr $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/grub.efi $RPM_BUILD_ROOT%{sysefidir}/grub.efi +install -d %{buildroot}/%{sysefidir} +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 $RPM_BUILD_ROOT/usr/lib64/efi -ln -srf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/grub.efi $RPM_BUILD_ROOT/usr/lib64/efi/grub.efi -cat <<-EoM > $RPM_BUILD_ROOT/usr/lib64/efi/DEPRECATED - This directory and it's contents was moved to %{_datadir}/efi/x86_64. +install -d %{buildroot}/usr/lib64/efi +ln -srf %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}/usr/lib64/efi/grub.efi +cat <<-EoM >%{buildroot}/usr/lib64/efi/DEPRECATED + This directory and its contents was moved to %{_datadir}/efi/x86_64. Individual symbolic links are provided for a smooth transition and may vanish at any point in time. Please use the new location! EoM @@ -836,7 +835,7 @@ %ifarch x86_64 aarch64 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110 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 @@ -845,60 +844,60 @@ %if ! 0%{?only_efi:1} cd build -make DESTDIR=$RPM_BUILD_ROOT install +%make_install cd .. %endif if [ "%{platform}" = "emu" ]; then # 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 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 # 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 - rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite + rm -f %{buildroot}/%{_bindir}/%{name}-emu-lite 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 ../.. fi # *.module files are installed with executable bits due to the way grub2 build # 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 | \ xargs --no-run-if-empty -0 chmod a-x # 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 -install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/ +install -m 755 %{SOURCE7} %{buildroot}/%{_sysconfdir}/grub.d/ # Ghost config file -install -d $RPM_BUILD_ROOT/boot/%{name} -touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg +install -d %{buildroot}/boot/%{name} +touch %{buildroot}/boot/%{name}/grub.cfg # Remove devel files -rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/*/*.h +rm %{buildroot}/%{_datadir}/%{name}/*/*.h %if 0%{?suse_version} >= 1140 -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h +rm %{buildroot}/%{_datadir}/%{name}/*.h %endif # Defaults -install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub -install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once -install -m 755 -D %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/snapper/plugins/grub -install -m 755 -D %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/80_suse_btrfs_snapshot +install -m 644 -D %{SOURCE2} %{buildroot}/%{_sysconfdir}/default/grub +install -m 755 -D %{SOURCE6} %{buildroot}/%{_sbindir}/grub2-once +install -m 755 -D %{SOURCE12} %{buildroot}/%{_libdir}/snapper/plugins/grub +install -m 755 -D %{SOURCE14} %{buildroot}/%{_sysconfdir}/grub.d/80_suse_btrfs_snapshot %if 0%{?has_systemd:1} -install -m 644 -D %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/grub2-once.service -install -m 755 -D %{SOURCE17} $RPM_BUILD_ROOT%{_libdir}/systemd/system-sleep/grub2.sleep +install -m 644 -D %{SOURCE15} %{buildroot}/%{_unitdir}/grub2-once.service +install -m 755 -D %{SOURCE17} %{buildroot}/%{_libdir}/systemd/system-sleep/grub2.sleep %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 %else rm -f $R%{_sysconfdir}/grub.d/20_memtest86+ @@ -936,7 +935,7 @@ } s{openSUSE}{SUSE Linux Enterprise Server} if (m{^GRUB_DISTRIBUTOR}); print; -' $RPM_BUILD_ROOT%{_sysconfdir}/default/grub +' %{buildroot}/%{_sysconfdir}/default/grub %else %endif
