From 60e96a392c3587c0b9bc8f2585f8ee2dd71cbee2 Mon Sep 17 00:00:00 2001
From: Jonathan Steffan <jsteffan@fedoraproject.org>
Date: Sun, 7 Jan 2024 10:59:02 -0700
Subject: [PATCH] Update to 7.00

 - Update version to 7.00
 - Update BLS entry grub_class and title
---
 .gitignore                       |  1 +
 README                           | 47 ++++++++------------------------
 memtest86+.kernel-install-plugin |  4 +--
 memtest86+.spec                  | 12 +-------
 sources                          |  2 +-
 5 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/.gitignore b/.gitignore
index 447af40..95c1369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ memtest86+-4.10.tar.gz
 /memtest86+-5.01.tar.gz
 /memtest86+-5.31b.tar.gz
 /memtest86-plus-6.20.tar.gz
+/memtest86-plus-7.00.tar.gz
diff --git a/README b/README
index 3e16347..5fe7278 100644
--- a/README
+++ b/README
@@ -1,39 +1,16 @@
-The memtest86+ now supports some command line parameters:
-  console= - serial console can be used for memtest86+ control/display,
-             example of usage:
-               console=ttyS0
-               console=ttyS0,115200
-               console=ttyS1,115200n8
-             Only ttyS0 and ttyS1 are supported.
+# Memtest86+
 
-  btrace   - enable boot trace.
+Memtest86+ is a free, open-source, stand-alone memory tester for x86 and
+x86-64 architecture computers. It provides a much more thorough memory
+check than that provided by BIOS memory tests.
 
-  maxcpus= - limit number of CPUs to use.
+It is also able to access almost all the computer's memory, not being
+restricted by the memory used by the operating system and not depending
+on any underlying software like UEFI libraries.
 
-  onepass  - run one pass and exit if there are no errors.
+Memtest86+ can be loaded and run either directly by a PC BIOS (legacy or UEFI)
+or via an intermediate bootloader that supports the Linux 16-bit, 32-bit,
+64-bit, or EFI handover boot protocol. It should work on any Pentium class or
+later 32-bit or 64-bit CPU.
 
-  tstlist= - setup a list of tests to run.
-
-  cpumask= - set a CPU (hexadecimal) mask to select CPU's to use for testing.
-
-You can add memtest86+ command line parameters into grub like you are
-used with kernel command line parameters, e.g.:
- linux /memtest86+-VERSION console=ttyS0
-
-Unfortunately this is currently supported only with non-ELF memtest86+ image.
-You cannot use the command line parameters with the ELF image, because the
-command line handling is currently not supported by grub for ELF images.
-
-If you need to use serial console with ELF image, you need to recompile
-memtest86+ and explicitly enable/configure serial line. In such case
-edit the config.h in memtest86+ sources the following way:
-
-#define SERIAL_CONSOLE_DEFAULT 1
-#define SERIAL_TTY 0
-#define SERIAL_BAUD_RATE 9600
-
-and recompile memtest86+. This will explicitly enable serial console and
-set it to use ttyS0,9600.
-
-NOTE: explicitly enabled serial console may significantly slow down the memory
-testing.
+More information at [memtest.org](https://memtest.org).
diff --git a/memtest86+.kernel-install-plugin b/memtest86+.kernel-install-plugin
index b87aea7..c1b634b 100644
--- a/memtest86+.kernel-install-plugin
+++ b/memtest86+.kernel-install-plugin
@@ -39,12 +39,12 @@ mkbls_grub() {
     local memtestimg=$1 && shift
 
     cat <<EOF
-title Memtest86+ (${memtestimg}-${memtestver})
+title Memory test (${memtestimg})
 version 0-${memtestver}-memtest86+
 linux /${memtestimg}
 grub_users \$grub_users
 grub_arg --unrestricted
-grub_class ${ID}
+grub_class memtest
 EOF
 }
 
diff --git a/memtest86+.spec b/memtest86+.spec
index 1ed634c..a2cbfa4 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -16,7 +16,7 @@ Memtest86+.
 %endif
 
 Name:          memtest86+
-Version:       6.20
+Version:       7.00
 Release:       %autorelease
 Summary:       Stand-alone memory tester for x86-64 computers
 License:       GPL-2.0-only
@@ -63,16 +63,6 @@ popd
 %{_datarootdir}/%{name}/memtest86+%{mt_isa}.iso
 
 
-%post
-if [ $1 -gt 1 ]; then
-  # cleanup upgrade BLS location changes
-  if [ -d /boot/loader/entries ]; then
-    rm -f /boot/loader/entries/*-0-memtest86+-6*.conf
-  fi
-fi
-exit 0
-
-
 %posttrans
 MEMTEST_IMAGE="memtest86+%{mt_isa}.bin"
 if [ -d /sys/firmware/efi/ ]; then
diff --git a/sources b/sources
index f3181b5..d37f570 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (memtest86-plus-6.20.tar.gz) = b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0
+SHA512 (memtest86-plus-7.00.tar.gz) = 1325ee08b280404fb47d37b62d65e51de21dd09b96bef29ece193072b09ff3c6eea8657b2e7c98801bf81ba4288c2bff580a91eb45d5a93744b0a273652266c4