X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmemtest;h=d98ea872bd89cd0d748fe3440afed19c90a124ac;hb=6e9fc7b868c52a6d2991d9878e1e96a7eb1eb4b4;hp=a6179ed362de9b4518e152d7c2a864daf93d424c;hpb=cf997605e529e895e90c4691c3b418e279dcfbb1;p=ipfire-2.x.git

diff --git a/lfs/memtest b/lfs/memtest
index a6179ed362..d98ea872bd 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  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,13 +24,14 @@
 
 include Config
 
-VER        = 4.20
+VER        = 5.01
 
 THISAPP    = memtest86+-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3
+$(DL_FILE)_MD5 = 43c5832baa919e1206e251e735cdee2d
 
 install : $(TARGET)
 
@@ -70,8 +71,10 @@ $(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) && sed -i -e "s| -fno-stack-protector||g" Makefile
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	# 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)
 	-mkdir -p /usr/lib/memtest86+
 	cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
 	@rm -rf $(DIR_APP)