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, next has been updated via 0d77b70188a5b0423ae70d9093d8daee864fb8e4 (commit) via bfc3e1f34030d7a3970281a60035aa07078db38d (commit) from 1ca232eb4c2655de8ca2adacb41fdc4c8e8f60ca (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 0d77b70188a5b0423ae70d9093d8daee864fb8e4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Sep 15 20:46:51 2015 +0200
memtest: use precompiled memtest binary on x86_64
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit bfc3e1f34030d7a3970281a60035aa07078db38d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Sep 15 20:46:37 2015 +0200
Revert "cdrom: Disable memtest on x86_64"
This reverts commit 5d1c3aca0ab582ed3bca4d28e148a336e2a50b08.
-----------------------------------------------------------------------
Summary of changes: lfs/cdrom | 2 -- lfs/memtest | 12 ++++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
Difference in files: diff --git a/lfs/cdrom b/lfs/cdrom index 3a95911..79920b8 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -93,9 +93,7 @@ ifneq "$(MACHINE_TYPE)" "arm" cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png -ifeq "$(MACHINE)" "i586" cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest -endif cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin cp /usr/share/hwdata/pci.ids /install/cdrom/boot/isolinux/pci.ids diff --git a/lfs/memtest b/lfs/memtest index d98ea87..cef29d6 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 +SUP_ARCH = i586 x86_64
############################################################################### # Top-level Rules @@ -71,11 +71,19 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @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) - -mkdir -p /usr/lib/memtest86+ 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 + @rm -rf $(DIR_APP) @$(POSTBUILD)
hooks/post-receive -- IPFire 2.x development tree