X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fmemtest;h=0e10533b6c12a7cf099eb9f9a31766644d1e0a00;hp=a1d6e2c5fee1afc7071dba4232b5c80622465490;hb=HEAD;hpb=65ca3f05075a11e2bce7daef5980f9bb4715ae84

diff --git a/lfs/memtest b/lfs/memtest
index a1d6e2c5fe..6617a92b20 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,14 +24,14 @@
 
 include Config
 
-VER        = 5.01
+VER        = 7.00
 
-THISAPP    = memtest86+-$(VER)
+THISAPP    = memtest86plus-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586 x86_64
+SUP_ARCH   = x86_64
 
 ###############################################################################
 # Top-level Rules
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 43c5832baa919e1206e251e735cdee2d
+$(DL_FILE)_BLAKE2 = 608f4e31ddaee01d828cb1574086196c26f5e96c5049806ac3ab174ddf669db8cdcb8f336bec5a1ce74439d96fca505fea81311a06581bb43a8034156a4f8165
 
 install : $(TARGET)
 
@@ -49,10 +49,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -61,8 +61,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -71,22 +71,8 @@ $(subst %,%_MD5,$(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+
-
-# gcc-4.9.3 produce a corrupted version of memtest
-# we use the precomp version at the moment
-
-#ifeq "$(BUILD_ARCH)" "i586"
-#	# Enable SMP as default
-#	cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h
-#	cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile
-#	cd $(DIR_APP) && make $(EXTRA_MAKE)
-#	cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
-#else
-	# 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
-#endif
-
+	cd $(DIR_APP)/build64 && cp -f memtest.efi /usr/lib/memtest86+/memtest.efi
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)