Attachment 171451 Details for Bug 210293 – memtest86+-5.01.patch

[patch] memtest86+-5.01.patch

memtest86+.patch (text/plain), 10.38 KB, created by takefu on 2016-06-15 04:55:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2016-06-15 04:55:21 UTC

Size: 10.38 KB

patch

obsolete

>diff -dpruN /usr/ports/sysutils/memtest86+/Makefile ./Makefile
>--- /usr/ports/sysutils/memtest86+/Makefile	2016-04-01 14:25:16.000000000 +0000
>+++ ./Makefile	2016-06-15 04:47:02.000000000 +0000
>@@ -2,17 +2,18 @@
> # $FreeBSD: head/sysutils/memtest86+/Makefile 412349 2016-04-01 14:25:16Z mat $
> 
> PORTNAME=	memtest86+
>-PORTVERSION=	4.20
>-PORTREVISION=	2
>+PORTVERSION=	5.01
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.memtest.org/download/${PORTVERSION}/
> 
> MAINTAINER=	avg@icyb.net.ua
> COMMENT=	Stand-alone memory test for x86 architecture computers
> 
>+LICENSE=	GPLv2
>+
> ONLY_FOR_ARCHS=	i386 amd64
> 
>-USES=	gmake dos2unix
>+USES=	gmake
> ALL_TARGET=	all
> PORTDOCS=	*
> 
>@@ -31,28 +32,12 @@ SERIAL_DESC=	Enable serial console at CO
> HISPEED_DESC=	Set COM1 serial console speed to 115200
> 
> ISO_PLIST_FILES=	${DATADIR}/mt${PORTVERSION:C/\.//}.iso
>+ISO_BUILD_DEPENDS=	genisoimage:sysutils/genisoimage
>+ISO_ALL_TARGET=	iso
> BOOT_PLIST_FILES=	${BOOT_DIR}/memtest86+
> BOOT_PLIST_DIRS=	${BOOT_DIR}
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MBOOT}
>-SUB_FILES=	pkg-message
>-SUB_LIST+=	BOOT_DIR=${BOOT_DIR}
>-.endif
>-
>-.if ${PORT_OPTIONS:MISO}
>-BUILD_DEPENDS+=	mkisofs:sysutils/cdrtools
>-ALL_TARGET+=	iso
>-.endif
>-
>-.if ${PORT_OPTIONS:MSERIAL}
>-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-config.h
>-
>-.if ${PORT_OPTIONS:MHISPEED}
>-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-config.h-115200
>-.endif
>-.endif	# WITH_SERIAL
>+BOOT_SUB_FILES=	pkg-message
>+BOOT_SUB_LIST+=	BOOT_DIR=${BOOT_DIR}
> 
> pre-fetch:
> .if !defined(PACKAGE_BUILDING)
>@@ -63,8 +48,16 @@ pre-fetch:
> 	@${ECHO} "build ISO image with custom tweaks in memtest86+ code."
> .endif
> 
>+.include <bsd.port.options.mk>
>+
> post-patch:
> 	${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile
>+.if ${PORT_OPTIONS:MSERIAL}
>+	${REINPLACE_CMD} -e 's|SERIAL_CONSOLE_DEFAULT 0|SERIAL_CONSOLE_DEFAULT 1|' ${WRKSRC}/config.h
>+. if ${PORT_OPTIONS:MHISPEED}
>+	${REINPLACE_CMD} -e 's|9600|115200|' ${WRKSRC}/config.h
>+. endif
>+.endif
> 
> do-install:
> .if ${PORT_OPTIONS:MISO}
>@@ -82,5 +75,3 @@ do-install:
> .endif
> 
> .include <bsd.port.mk>
>-
>-RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
>diff -dpruN /usr/ports/sysutils/memtest86+/distinfo ./distinfo
>--- /usr/ports/sysutils/memtest86+/distinfo	2014-01-22 15:30:13.000000000 +0000
>+++ ./distinfo	2016-06-15 02:07:23.000000000 +0000
>@@ -1,2 +1,3 @@
>-SHA256 (memtest86+-4.20.tar.gz) = 5630ce978d0e6b671891df4253fc5c54659764d0cdfc7515ac0df3d8dd9e8737
>-SIZE (memtest86+-4.20.tar.gz) = 206044
>+TIMESTAMP = 1465956443
>+SHA256 (memtest86+-5.01.tar.gz) = 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
>+SIZE (memtest86+-5.01.tar.gz) = 214877
>diff -dpruN /usr/ports/sysutils/memtest86+/files/extra-patch-Makefile ./files/extra-patch-Makefile
>--- /usr/ports/sysutils/memtest86+/files/extra-patch-Makefile	2015-05-22 20:34:27.000000000 +0000
>+++ ./files/extra-patch-Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- Makefile.orig
>-+++ Makefile
>-@@ -11,7 +11,7 @@
>- AS=as -32
>- CC=gcc
>- 
>--CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
>-+CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
>- 
>- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
>-       config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
>diff -dpruN /usr/ports/sysutils/memtest86+/files/extra-patch-config.h ./files/extra-patch-config.h
>--- /usr/ports/sysutils/memtest86+/files/extra-patch-config.h	2015-05-22 20:34:27.000000000 +0000
>+++ ./files/extra-patch-config.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,17 +0,0 @@
>---- config.h.orig
>-+++ config.h
>-@@ -13,13 +13,13 @@
>- /* SERIAL_CONSOLE_DEFAULT -  The default state of the serial console. */
>- /*	This is normally off since it slows down testing.  Change to a 1 */
>- /*	to enable. */
>--#define SERIAL_CONSOLE_DEFAULT 0
>-+#define SERIAL_CONSOLE_DEFAULT 1
>- 
>- /* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */ 
>- #define SERIAL_TTY 0
>- 
>- /* SERIAL_BAUD_RATE - Baud rate for the serial console */
>- #define SERIAL_BAUD_RATE 9600
>- 
>- /* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */
>- #define BEEP_MODE 0
>diff -dpruN /usr/ports/sysutils/memtest86+/files/extra-patch-config.h-115200 ./files/extra-patch-config.h-115200
>--- /usr/ports/sysutils/memtest86+/files/extra-patch-config.h-115200	2015-05-22 20:34:27.000000000 +0000
>+++ ./files/extra-patch-config.h-115200	1970-01-01 00:00:00.000000000 +0000
>@@ -1,17 +0,0 @@
>---- config.h.orig
>-+++ config.h
>-@@ -13,13 +13,13 @@
>- /* SERIAL_CONSOLE_DEFAULT -  The default state of the serial console. */
>- /*	This is normally off since it slows down testing.  Change to a 1 */
>- /*	to enable. */
>- #define SERIAL_CONSOLE_DEFAULT 1
>- 
>- /* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */ 
>- #define SERIAL_TTY 0
>- 
>- /* SERIAL_BAUD_RATE - Baud rate for the serial console */
>--#define SERIAL_BAUD_RATE 9600
>-+#define SERIAL_BAUD_RATE 115200
>- 
>- /* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */
>- #define BEEP_MODE 0
>diff -dpruN /usr/ports/sysutils/memtest86+/files/patch-Makefile ./files/patch-Makefile
>--- /usr/ports/sysutils/memtest86+/files/patch-Makefile	2015-01-25 11:45:45.000000000 +0000
>+++ ./files/patch-Makefile	2016-06-15 02:35:16.000000000 +0000
>@@ -1,12 +1,18 @@
>---- Makefile.orig	2015-01-19 13:24:01.512893165 +0000
>-+++ Makefile	2015-01-19 13:24:23.844906601 +0000
>-@@ -23,15 +23,15 @@
>+--- Makefile.orig	2013-08-10 02:01:58 UTC
>++++ Makefile
>+@@ -21,21 +21,20 @@ OBJS= head.o reloc.o main.o test.o init.
>+       
>+ 
>+ all: clean memtest.bin memtest 
>+-		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
>+ 
>+ # Link it statically once so I know I don't have undefined
>  # symbols and then link it dynamically so I have full
>  # relocation information
>  memtest_shared: $(OBJS) memtest_shared.lds Makefile
> -	$(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
> +	$(LD) --warn-constructors --warn-common -static --oformat elf32-i386-freebsd -T memtest_shared.lds \
>- 	-o $@ $(OBJS) && \
>+ 	 -o $@ $(OBJS) && \
> -	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
> +	$(LD) -shared -Bsymbolic --oformat elf32-i386-freebsd -T memtest_shared.lds -o $@ $(OBJS)
>  
>@@ -19,15 +25,22 @@
>  
>  head.s: head.S config.h defs.h test.h
>  	$(CC) -E -traditional $< -o $@
>-@@ -58,10 +58,8 @@
>- asm:
>- 	@./makedos.sh
>+@@ -47,7 +46,7 @@ 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 \
>++	$(LD) --oformat elf32-i386-freebsd -T memtest.bin.lds bootsect.o setup.o -b binary \
>+ 	memtest_shared.bin -o memtest.bin
>+ 
>+ reloc.o: reloc.c
>+@@ -67,8 +66,7 @@ clean:
>+ 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
>+ 		memtest_shared.bin memtest.iso
>  
> -iso:
> -	make all
>-+iso: all
>++iso:	all
>  	./makeiso.sh
>--	rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin
>  
>  install: all
>- 	dd <memtest.bin >$(FDISK) bs=8192
>diff -dpruN /usr/ports/sysutils/memtest86+/files/patch-error.c ./files/patch-error.c
>--- /usr/ports/sysutils/memtest86+/files/patch-error.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-error.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>---- error.c	2008-11-16 02:18:14.000000000 +0200
>-+++ error.c	2009-02-18 00:27:40.000000000 +0200
>-@@ -11,7 +11,6 @@
>-  
>- #include "test.h"
>- #include "config.h"
>--#include <sys/io.h>
>- #include "dmi.h"
>- 
>- extern int test_ticks, nticks, beepmode;
>diff -dpruN /usr/ports/sysutils/memtest86+/files/patch-memtest.lds ./files/patch-memtest.lds
>--- /usr/ports/sysutils/memtest86+/files/patch-memtest.lds	2015-05-22 20:34:27.000000000 +0000
>+++ ./files/patch-memtest.lds	2016-06-15 02:25:22.000000000 +0000
>@@ -1,11 +1,11 @@
>---- memtest.lds.orig
>+--- memtest.lds.orig	2013-08-10 02:01:58 UTC
> +++ memtest.lds
>-@@ -3,7 +3,7 @@
>+@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386);
>  
>  ENTRY(_start); 
>  SECTIONS {
>--	. = 0x5000;
>-+ 	. = 0xc0120000;
>+-	. = 0x10000;
>++	. = 0xc0120000;
>  	_start = . ;
>  	.data : {
>  		*(.data)
>diff -dpruN /usr/ports/sysutils/memtest86+/files/patch-setup.S ./files/patch-setup.S
>--- /usr/ports/sysutils/memtest86+/files/patch-setup.S	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-setup.S	2016-06-15 02:27:18.000000000 +0000
>@@ -1,11 +1,11 @@
>---- setup.S	2008-11-16 02:18:14.000000000 +0200
>-+++ setup.S	2009-02-18 00:28:02.000000000 +0200
>-@@ -42,7 +42,7 @@ start:
>- 	jz	alt_a20_done
>- 	
>- 	/* set or clear bit1, the ALT_A20_GATE bit */
>--	movb	4(%esp), %ah
>-+	addr32 movb	4(%esp), %ah
>- 	testb	%ah, %ah
>- 	jz	alt_a20_cont1
>- 	orb	$2, %al
>+--- setup.S.orig	2013-08-10 02:01:58 UTC
>++++ setup.S
>+@@ -50,7 +50,7 @@ reload:
>+      	jz	alt_a20_done
>+      	
>+      	/* set or clear bit1, the ALT_A20_GATE bit */
>+-     	movb	4(%esp), %ah
>++     	addr32 movb	4(%esp), %ah
>+      	testb	%ah, %ah
>+      	jz	alt_a20_cont1
>+      	orb	$2, %al
>diff -dpruN /usr/ports/sysutils/memtest86+/files/patch-test.c ./files/patch-test.c
>--- /usr/ports/sysutils/memtest86+/files/patch-test.c	2014-01-22 17:40:44.000000000 +0000
>+++ ./files/patch-test.c	2016-06-15 02:33:06.000000000 +0000
>@@ -1,20 +1,14 @@
>---- test.c	2008-11-16 02:18:14.000000000 +0200
>-+++ test.c	2009-02-18 00:27:11.000000000 +0200
>-@@ -6,12 +6,11 @@
>-  * ----------------------------------------------------
>-  * MemTest86+ V2.01 Specific code (GPL V2.0)
>-  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
>-  * http://www.canardpc.com - http://www.memtest.org
>-  */
>- 
>--#include "test.h"
>- #include "config.h"
>+--- test.c.orig	2013-08-10 02:29:44 UTC
>++++ test.c
>+@@ -14,7 +14,6 @@
>+ #include "stdint.h"
>+ #include "cpuid.h"
>+ #include "smp.h"
> -#include <sys/io.h>
>-+#include "test.h"
>- #include "dmi.h"
>  
>- extern int segs, bail;
>-@@ -1400,6 +1399,20 @@ void sleep(int n, int sms)
>+ extern struct cpu_ident cpu_id;
>+ extern volatile int    mstr_cpu;
>+@@ -1543,6 +1542,19 @@ void sleep(long n, int flag, int me, int
>  	}
>  }
>  
>@@ -31,11 +25,10 @@
> +        asm __volatile__("outb %0,%1" : : "a" (data), "id" ((unsigned short)(port)));
> +}
> +
>-+
>  /* Beep function */
>  
>  void beep(unsigned int frequency)
>-@@ -1407,18 +1420,18 @@ void beep(unsigned int frequency)
>+@@ -1551,18 +1563,18 @@ void beep(unsigned int frequency)
>  	unsigned int count = 1193180 / frequency;
>  
>  	// Switch on the speaker
>@@ -52,7 +45,7 @@
>  	outb((count >> 8) & 0xff, 0x42);
>  
>  	// Block for 100 microseconds
>- 	sleep(100, 1);
>+ 	sleep(100, 0, 0, 1);
>  
>  	// Switch off the speaker
> -	outb(inb_p(0x61)&0xFC, 0x61);

Flags:

avg: maintainer-approval+

Actions: View | Diff

Attachments on bug 210293: 171450 | 171451