Merge remote-tracking branch 'origin/next' into thirteen

[ipfire-2.x.git] / lfs / memtest

diff --git a/lfs/memtest b/lfs/memtest
index c241e3fcf5dbad46eaca5c62309bda42923d5627..4914baed54cf47d8b86c2c693a592830a3fa7d9a 100644 (file)
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        = 2.11
+VER        = 4.20
 
 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 = e457774139c0bfef899359df91f49b3e
+$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3
 
 install : $(TARGET)
 
@@ -70,6 +71,7 @@ $(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)
        -mkdir -p /usr/lib/memtest86+
        cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+