From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] memtest: update to memtest86+ v6.00
Date: Thu, 27 Oct 2022 10:26:39 +0200 [thread overview]
Message-ID: <20221027082639.11737-1-arne_f@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2781 bytes --]
This is now a version 64bit version that can also boot via efi.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
config/cdrom/grub.cfg | 6 ++++++
config/rootfiles/common/memtest | 2 +-
lfs/cdrom | 2 +-
lfs/memtest | 14 ++++++--------
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/config/cdrom/grub.cfg b/config/cdrom/grub.cfg
index 421c0e662..50a7c2488 100644
--- a/config/cdrom/grub.cfg
+++ b/config/cdrom/grub.cfg
@@ -32,3 +32,9 @@ submenu 'Other Installation Options -->' {
initrd /boot/isolinux/instroot
}
}
+
+submenu 'Tools -->' {
+ menuentry 'memtest86+' {
+ linux /boot/isolinux/memtest
+ }
+}
diff --git a/config/rootfiles/common/memtest b/config/rootfiles/common/memtest
index 1804dfa94..7978436fd 100644
--- a/config/rootfiles/common/memtest
+++ b/config/rootfiles/common/memtest
@@ -1,2 +1,2 @@
#usr/lib/memtest86+
-#usr/lib/memtest86+/memtest.bin
+#usr/lib/memtest86+/memtest.efi
diff --git a/lfs/cdrom b/lfs/cdrom
index a47faa49e..f4e6e050c 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -199,7 +199,7 @@ endif
ifeq "$(HAS_MEMTEST)" "1"
# Install memtest
- cp /usr/lib/memtest86+/memtest.bin $(DIR_TMP)/cdrom/boot/isolinux/memtest
+ cp /usr/lib/memtest86+/memtest.efi $(DIR_TMP)/cdrom/boot/isolinux/memtest
endif
ifeq "$(HAS_IPXE)" "1"
diff --git a/lfs/memtest b/lfs/memtest
index 7e5ac895f..ae87558de 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -24,9 +24,9 @@
include Config
-VER = 5.01
+VER = 6.00
-THISAPP = memtest86+-$(VER)
+THISAPP = memtest86plus-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -41,7 +41,8 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050
+$(DL_FILE)_BLAKE2 = bba26dab7165239fe95dc7f174e5f876f47421008ca6201bc57549598f512df56a6a0ca71f8c2c26c01188d243b58ab6ddd525cf01f0dece0cdb61a6acf38685
+
install : $(TARGET)
@@ -71,11 +72,8 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP)/build64 && make memtest.efi
-mkdir -p /usr/lib/memtest86+
-
- # 64bit only systems cannot link mentest without 32bit gcc libs
- # so we use the precompiled binary from memtest author
- cd $(DIR_APP) && cp -f precomp.bin /usr/lib/memtest86+/memtest.bin
-
+ cd $(DIR_APP)/build64 && cp -f memtest.efi /usr/lib/memtest86+/memtest.efi
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
2.37.1
next reply other threads:[~2022-10-27 8:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 8:26 Arne Fitzenreiter [this message]
2022-10-27 9:20 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221027082639.11737-1-arne_f@ipfire.org \
--to=arne_f@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox