[git.ipfire.org] IPFire 2.x development tree branch, core100, updated. ae04f2400a66b8a5f7fdeb4fb940898c1572220f

[git.ipfire.org] IPFire 2.x development tree branch, core100, updated. ae04f2400a66b8a5f7fdeb4fb940898c1572220f

[git]

[-- Attachment #1: Type: text/plain, Size: 3080 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core100 has been updated
       via  ae04f2400a66b8a5f7fdeb4fb940898c1572220f (commit)
      from  ed974e08c54b293afb71405dc71e2cc56779fc9b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ae04f2400a66b8a5f7fdeb4fb940898c1572220f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Mar 27 11:04:49 2016 +0200

    memtest: use always precompiled version
    
    gcc-4.9.3 build a corrupted version
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/memtest | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/lfs/memtest b/lfs/memtest
index cef29d6..c92fab6 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2016  IPFire Team  <info(a)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        #
@@ -73,17 +73,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	-mkdir -p /usr/lib/memtest86+
 
-ifeq "$(MACHINE)" "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
+# gcc-4.9.3 produce a corrupted version of memtest
+# we use the precomp version at the moment
+
+#ifeq "$(MACHINE)" "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
+#endif
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


hooks/post-receive
--
IPFire 2.x development tree