rpms/memtest86+/devel memtest-fix-makefile-for-x86_64.diff, NONE, 1.1 memtest86+.spec, 1.32, 1.33 additional-lib-functions.diff, 1.1, NONE console-boot-parameter.diff, 1.1, NONE parity-bits.diff, 1.1, NONE use-strtoul-in-getval.diff, 1.1, NONE

[Michal Schmidt (michich)]

Author: michich

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15796

Modified Files:
	memtest86+.spec 
Added Files:
	memtest-fix-makefile-for-x86_64.diff 
Removed Files:
	additional-lib-functions.diff console-boot-parameter.diff 
	parity-bits.diff use-strtoul-in-getval.diff 
Log Message:
* Mon Feb 11 2008 Michal Schmidt <mschmidt at redhat.com> - 2.00-2
- forgot to cvs add the compilation patch.


memtest-fix-makefile-for-x86_64.diff:

--- NEW FILE memtest-fix-makefile-for-x86_64.diff ---
Fix Makefile for x86_64

Tell as to generate 32-bit code.
*.s files are generated from *.S, so clean them too.

diff -up memtest86+-2.00/Makefile.orig memtest86+-2.00/Makefile
--- memtest86+-2.00/Makefile.orig	2008-02-11 14:10:25.000000000 +0100
+++ memtest86+-2.00/Makefile	2008-02-11 14:32:35.000000000 +0100
@@ -8,6 +8,7 @@
 #
 FDISK=/dev/fd0
 
+AS=as -32
 CC=gcc
 
 CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
@@ -32,6 +33,15 @@ memtest_shared.bin: memtest_shared
 memtest: memtest_shared.bin memtest.lds
 	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
 
+head.s: head.S config.h defs.h test.h
+	$(CC) -E -traditional $< -o $@
+
+bootsect.s: bootsect.S config.h defs.h
+	$(CC) -E -traditional $< -o $@
+
+setup.s: setup.S config.h defs.h
+	$(CC) -E -traditional $< -o $@
+
 memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds
 	$(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \
 	memtest_shared.bin -o memtest.bin
@@ -43,7 +53,7 @@ test.o: test.c
 	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
 
 clean:
-	rm -f *.o memtest.bin memtest memtest_shared memtest_shared.bin
+	rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin
 
 install: all
 	dd <memtest.bin >$(FDISK) bs=8192


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- memtest86+.spec	11 Feb 2008 17:16:16 -0000	1.32
+++ memtest86+.spec	11 Feb 2008 17:27:51 -0000	1.33
@@ -6,7 +6,7 @@
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
 Version: 2.00
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
@@ -69,6 +69,9 @@
 /sbin/new-memtest-pkg --remove %{version}
 
 %changelog
+* Mon Feb 11 2008 Michal Schmidt <mschmidt at redhat.com> - 2.00-2
+- forgot to cvs add the compilation patch.
+
 * Mon Feb 11 2008 Michal Schmidt <mschmidt at redhat.com> - 2.00-1
 - New upstream release: 2.00.
 - Dropped boot time console configuration patches (already upstream).


--- additional-lib-functions.diff DELETED ---


--- console-boot-parameter.diff DELETED ---


--- parity-bits.diff DELETED ---


--- use-strtoul-in-getval.diff DELETED ---