diff --git a/fix-destdir b/fix-destdir deleted file mode 100644 index 834851c..0000000 --- a/fix-destdir +++ /dev/null @@ -1,24 +0,0 @@ -Index: memtest86+-5.31b/Makefile -=================================================================== ---- memtest86+-5.31b.orig/Makefile -+++ memtest86+-5.31b/Makefile -@@ -8,6 +8,7 @@ - # Path for the floppy disk device - # - FDISK=/dev/fd0 -+TARGETDIR=/boot - - AS=as -32 - CC=gcc -@@ -75,7 +76,10 @@ iso: - make all - ./makeiso.sh - --install: all -+install: -+ install -o root -g root memtest.bin $(DESTDIR)$(TARGETDIR)/ -+ -+install-floppy: all - dd $(FDISK) bs=8192 - - install-precomp: diff --git a/memtest86+-5.01-no-optimization.patch b/memtest86+-5.01-no-optimization.patch deleted file mode 100644 index fed92f6..0000000 --- a/memtest86+-5.01-no-optimization.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: memtest86+-5.31b/Makefile -=================================================================== ---- memtest86+-5.31b.orig/Makefile -+++ memtest86+-5.31b/Makefile -@@ -13,7 +13,7 @@ TARGETDIR=/boot - AS=as -32 - CC=gcc - --CFLAGS= -Wall -Werror -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ -+CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ - -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector - - SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g diff --git a/memtest86+-5.31b-discard-note_gnu_property.patch b/memtest86+-5.31b-discard-note_gnu_property.patch deleted file mode 100644 index b1c5d6e..0000000 --- a/memtest86+-5.31b-discard-note_gnu_property.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: memtest86+-5.31b/Makefile -=================================================================== ---- memtest86+-5.31b.orig/Makefile -+++ memtest86+-5.31b/Makefile -@@ -10,11 +10,11 @@ - FDISK=/dev/fd0 - TARGETDIR=/boot - --AS=as -32 -+AS=as -32 -mx86-used-note=no - CC=gcc - - CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ -- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -+ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -Wa,-mx86-used-note=no - - SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g - -Index: memtest86+-5.31b/memtest.bin.lds -=================================================================== ---- memtest86+-5.31b.orig/memtest.bin.lds -+++ memtest86+-5.31b/memtest.bin.lds -@@ -11,5 +11,6 @@ SECTIONS { - *(.data) - _end = . ; - } -+ /DISCARD/ : { *(.note.gnu.property) } - _syssize = (_end - _start + 15) >> 4; - } diff --git a/memtest86+-5.31b.tar.gz b/memtest86+-5.31b.tar.gz deleted file mode 100644 index 06ca4bc..0000000 --- a/memtest86+-5.31b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7146ffb182c0eb324e216ec5db284ef4bd8296122cf45e1695eabd8320cb1f09 -size 227779 diff --git a/memtest86+-6.10.tar.gz b/memtest86+-6.10.tar.gz new file mode 100644 index 0000000..0cd5fd8 --- /dev/null +++ b/memtest86+-6.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6274c11d54a1a3feb29339d828150c3c5722e38ffbfee3b8cbd9b2038c548e1 +size 230056 diff --git a/memtest86+.changes b/memtest86+.changes index 66ad14d..23274d1 100644 --- a/memtest86+.changes +++ b/memtest86+.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sat Feb 4 15:41:14 UTC 2023 - ecsos + +- Update to 6.10 + - Add support for Secure Boot Signing + - Add support for Headless EFI system + - Add various command line options + - Add support for legacy ATI SB400 + - Fix an issue related to BadRAM pattern + - Fix disabling SMP using F2 at startup + - Fix crash on SuperMicro X10SDV + - Various bug fixes and optimizations +- Update to 6.01 + - False positives in test 9 [Modulo 20, random pattern] (issue #216) + - Failing to remove the big PASS/FAIL status banner (issue #130 and #173) + +------------------------------------------------------------------- +Sat Oct 29 10:23:02 UTC 2022 - ecsos + +- Update to 6.00: +- Drop all patches can no more use: + fix-destdir + memtest86+-5.01-no-optimization.patch + memtest86+-5.31b-discard-note_gnu_property.patch + ------------------------------------------------------------------- Wed May 12 12:34:56 UTC 2021 - olaf@aepfle.de diff --git a/memtest86+.spec b/memtest86+.spec index 985fd04..46b3e31 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -1,7 +1,7 @@ # # spec file for package memtest86+ # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,13 @@ Name: memtest86+ -Version: 5.31b +Version: 6.10 Release: 0 Summary: Memory Testing Image for x86 Architecture License: BSD-3-Clause Group: System/Boot URL: https://www.memtest.org -Source: https://www.memtest.org/download/%{version}/memtest86+-%{version}.tar.gz -Patch0: fix-destdir -Patch1: memtest86+-5.01-no-optimization.patch -Patch2: memtest86+-5.31b-discard-note_gnu_property.patch +Source: https://github.com/memtest86plus/memtest86plus/archive/v%{version}/%{name}-%{version}.tar.gz #!BuildIgnore: gcc-PIE Provides: lilo:/boot/memtest.bin Obsoletes: memtest86 <= 3.2 @@ -44,27 +41,34 @@ Memtest86 is an image that can be booted instead of a real OS. Once booted, it can be used to test the computer's memory. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n memtest86plus-%{version} %build # dependencies are broken for the package and it should not be built in parallel +cd build64 make %install +cd build64 install -Dpm 0644 memtest.bin \ %{buildroot}/boot/memtest.bin +install -Dpm 0644 memtest.efi \ + %{buildroot}/boot/efi/EFI/memtest86/memtest.efi %post -%update_bootloader_check_type_refresh_post grub2 +%update_bootloader_check_type_refresh_post grub2 grub2-efi %posttrans %update_bootloader_posttrans %files +%license LICENSE +%doc README.md +%doc doc /boot/memtest.bin -%doc README* changelog FAQ +%dir /boot/efi +%dir /boot/efi/EFI +%dir /boot/efi/EFI/memtest86 +/boot/efi/EFI/memtest86/memtest.efi %changelog