Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package memtest86+ for openSUSE:Factory checked in at 2024-04-18 22:10:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/memtest86+ (Old) and /work/SRC/openSUSE:Factory/.memtest86+.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "memtest86+" Thu Apr 18 22:10:26 2024 rev:42 rq:1155821 version:7.00 Changes: -------- --- /work/SRC/openSUSE:Factory/memtest86+/memtest86+.changes 2024-01-26 22:46:37.090795539 +0100 +++ /work/SRC/openSUSE:Factory/.memtest86+.new.26366/memtest86+.changes 2024-04-18 22:11:11.318355817 +0200 @@ -1,0 +2,7 @@ +Mon Mar 4 14:56:40 UTC 2024 - Giacomo Comes <gcomes....@gmail.com> + +- add source 20_memtest86 + * replace similar file from package grub2 +- don't install files in /boot. The OS needs to stay in /usr + +------------------------------------------------------------------- New: ---- 20_memtest86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ memtest86+.spec ++++++ --- /var/tmp/diff_new_pack.6s4yDq/_old 2024-04-18 22:11:12.006381101 +0200 +++ /var/tmp/diff_new_pack.6s4yDq/_new 2024-04-18 22:11:12.006381101 +0200 @@ -25,6 +25,7 @@ Group: System/Boot URL: https://www.memtest.org Source: https://github.com/memtest86plus/memtest86plus/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: 20_memtest86 #!BuildIgnore: gcc-PIE Provides: lilo:/boot/memtest.bin Obsoletes: memtest86 <= 3.2 @@ -55,15 +56,18 @@ make %install +# Script to generate memtest86+ menu entry +mkdir -p %{buildroot}/%{_sysconfdir}/grub.d +install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/grub.d/ %ifarch x86_64 cd build64 %else cd build32 %endif install -Dpm 0644 memtest.bin \ - %{buildroot}/boot/memtest.bin + %{buildroot}%{_prefix}/lib/memtest86/memtest.bin install -Dpm 0644 memtest.efi \ - %{buildroot}/boot/efi/EFI/memtest86/memtest.efi + %{buildroot}%{_prefix}/lib/memtest86/memtest.efi export BRP_PESIGN_FILES="*.efi" %post @@ -76,9 +80,8 @@ %license LICENSE %doc README.md %doc doc -/boot/memtest.bin -%dir /boot/efi -%dir /boot/efi/EFI -%dir /boot/efi/EFI/memtest86 -/boot/efi/EFI/memtest86/memtest.efi +%dir %{_prefix}/lib/memtest86 +%{_prefix}/lib/memtest86/memtest.* +%dir %{_sysconfdir}/grub.d +%config(noreplace) %{_sysconfdir}/grub.d/20_memtest86 ++++++ 20_memtest86 ++++++ #! /bin/sh set -e # grub-mkconfig helper script. # Copyright (C) 2011 Michal Ambroz <re...@seznam.cz> # Adapted for openSUSE by Andrey Borzenkov <arvidj...@gmail.com> # Adapted for EFI by Hans-Peter Jansen <h...@urpla.net> # # you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # Distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with the script. If not, see <http://www.gnu.org/licenses/>. . "$pkgdatadir/grub-mkconfig_lib" export TEXTDOMAIN=grub2 export TEXTDOMAINDIR=/usr/share/locale CLASS="--class memtest86 --class gnu --class tools" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=Memtest else OS="${GRUB_DISTRIBUTOR} Memtest" CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" fi # memtest86+ comes in two flavours, one EFI and one suitable for x86 real mode. if [ -d /sys/firmware/efi ]; then if [ -f /usr/lib/memtest86/memtest.efi ]; then memtest=/usr/lib/memtest86/memtest.efi else #memtest.efi not found exit 0 fi loader='linux ' message="$(gettext_printf "Loading EFI memtest ...\n" | grub_quote)" else if [ -f /usr/lib/memtest86/memtest.bin ]; then memtest=/usr/lib/memtest86/memtest.bin else #memtest.bin not found exit 0 fi loader='linux16' message="$(gettext_printf "Loading x86 memtest ...\n" | grub_quote)" fi # locate the real partition GRUB_DEVICE_BOOT=$(grub2-probe -t device "$memtest") if grub_file_is_not_garbage "$memtest" ; then gettext_printf "Found memtest image: %s\n" "$memtest" >&2 basename=`basename $memtest` dirname=`dirname $memtest` rel_dirname=`make_system_path_relative_to_its_root $dirname` boot_device_id="$(grub_get_device_id "${GRUB_DEVICE_BOOT}")" printf "menuentry '%s' %s \$menuentry_id_option '%s' {\n" "${OS}" "${CLASS}" "memtest-$boot_device_id" prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" printf '%s\n' "${prepare_boot_cache}" cat << EOF echo '$message' ${loader} ${rel_dirname}/${basename} } EOF fi
