diff options
Diffstat (limited to 'sysutils/memtest86+')
-rw-r--r-- | sysutils/memtest86+/Makefile | 79 | ||||
-rw-r--r-- | sysutils/memtest86+/distinfo | 3 | ||||
-rw-r--r-- | sysutils/memtest86+/files/patch-Makefile | 46 | ||||
-rw-r--r-- | sysutils/memtest86+/files/patch-io.h | 29 | ||||
-rw-r--r-- | sysutils/memtest86+/files/patch-lib.c | 18 | ||||
-rw-r--r-- | sysutils/memtest86+/files/patch-memtest.lds | 11 | ||||
-rw-r--r-- | sysutils/memtest86+/files/patch-setup.S | 11 | ||||
-rw-r--r-- | sysutils/memtest86+/files/patch-test.c | 53 | ||||
-rw-r--r-- | sysutils/memtest86+/files/pkg-message.in | 23 | ||||
-rw-r--r-- | sysutils/memtest86+/pkg-descr | 2 |
10 files changed, 0 insertions, 275 deletions
diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile deleted file mode 100644 index ba427a6c100a..000000000000 --- a/sysutils/memtest86+/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -PORTNAME= memtest86+ -PORTVERSION= 5.01 -PORTREVISION= 5 -CATEGORIES= sysutils -MASTER_SITES= http://www.memtest.org/download/${PORTVERSION}/ - -MAINTAINER= avg@FreeBSD.org -COMMENT= Stand-alone memory test for x86 architecture computers -WWW= https://www.memtest.org/ - -LICENSE= GPLv2 - -ONLY_FOR_ARCHS= i386 amd64 - -USES= gmake -ALL_TARGET= all -PORTDOCS= * - -DEPRECATED= ELF binary for BIOS boot has been broken for a long while -EXPIRATION_DATE=2025-07-31 - -USE_GCC= yes:build - -# Please provide absolute path below (cannot be root) -BOOT_DIR?= /boot/opt - -OPTIONS_DEFINE= SERIAL HISPEED DOCS -OPTIONS_DEFAULT= BOOT -OPTIONS_MULTI= BOOT_TYPE -OPTIONS_MULTI_BOOT_TYPE= ISO BOOT -ISO_DESC= Build bootable ISO image -BOOT_DESC= Build ELF image loadable by boot2 and loader -SERIAL_DESC= Enable serial console at COM1/9600 -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} -BOOT_SUB_FILES= pkg-message -BOOT_SUB_LIST+= BOOT_DIR=${BOOT_DIR} - -pre-fetch: -.if !defined(PACKAGE_BUILDING) - @${ECHO} "If you only need bootable ISO image of memtest86+, you can" - @${ECHO} "simply download it from http://www.memtest.org/. Use this" - @${ECHO} "port if you need ELF image of memtest86+ that can be loaded" - @${ECHO} "by boot2 or loader(8), or if you want to use this port to" - @${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} - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/mt${PORTVERSION:C/\.//}.iso ${STAGEDIR}${DATADIR} -.endif -.if ${PORT_OPTIONS:MBOOT} - @${MKDIR} ${STAGEDIR}${BOOT_DIR} -# XXX is INSTALL_KLD really appropriate here? XXX - ${INSTALL_KLD} ${WRKSRC}/memtest ${STAGEDIR}${BOOT_DIR}/memtest86+ -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/sysutils/memtest86+/distinfo b/sysutils/memtest86+/distinfo deleted file mode 100644 index e0587040be1b..000000000000 --- a/sysutils/memtest86+/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1465956443 -SHA256 (memtest86+-5.01.tar.gz) = 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 -SIZE (memtest86+-5.01.tar.gz) = 214877 diff --git a/sysutils/memtest86+/files/patch-Makefile b/sysutils/memtest86+/files/patch-Makefile deleted file mode 100644 index 41f5504d24bd..000000000000 --- a/sysutils/memtest86+/files/patch-Makefile +++ /dev/null @@ -1,46 +0,0 @@ ---- 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) && \ -- $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) -+ $(LD) -shared -Bsymbolic --oformat elf32-i386-freebsd -T memtest_shared.lds -o $@ $(OBJS) - - memtest_shared.bin: memtest_shared - objcopy -O binary $< memtest_shared.bin - - memtest: memtest_shared.bin memtest.lds -- $(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@ -+ $(LD) -s --oformat elf32-i386-freebsd -T memtest.lds -b binary memtest_shared.bin -o $@ - - head.s: head.S config.h defs.h test.h - $(CC) -E -traditional $< -o $@ -@@ -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 - ./makeiso.sh - - install: all diff --git a/sysutils/memtest86+/files/patch-io.h b/sysutils/memtest86+/files/patch-io.h deleted file mode 100644 index e93567f1867f..000000000000 --- a/sysutils/memtest86+/files/patch-io.h +++ /dev/null @@ -1,29 +0,0 @@ ---- io.h.orig 2013-08-10 02:01:58 UTC -+++ io.h -@@ -31,7 +31,7 @@ - */ - - #define __OUT1(s,x) \ --extern inline void __out##s(unsigned x value, unsigned short port) { -+static inline void __out##s(unsigned x value, unsigned short port) { - - #define __OUT2(s,s1,s2) \ - __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" -@@ -43,7 +43,7 @@ __OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" (value), "d" - __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } - - #define __IN1(s) \ --extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; -+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; - - #define __IN2(s,s1,s2) \ - __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" -@@ -55,7 +55,7 @@ __IN1(s##_p) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) - __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; } - - #define __OUTS(s) \ --extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ -+static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ - { __asm__ __volatile__ ("cld ; rep ; outs" #s \ - : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); } - diff --git a/sysutils/memtest86+/files/patch-lib.c b/sysutils/memtest86+/files/patch-lib.c deleted file mode 100644 index dde80182241a..000000000000 --- a/sysutils/memtest86+/files/patch-lib.c +++ /dev/null @@ -1,18 +0,0 @@ ---- lib.c.orig 2021-02-06 17:28:48 UTC -+++ lib.c -@@ -33,7 +33,7 @@ struct ascii_map_str { - int keycode; - }; - --inline void reboot(void) -+void reboot(void) - { - - /* tell the BIOS to do a cold start */ -@@ -1196,4 +1196,4 @@ void get_list(int x, int y, int len, char *buf) - return; - } - } --} -\ No newline at end of file -+} diff --git a/sysutils/memtest86+/files/patch-memtest.lds b/sysutils/memtest86+/files/patch-memtest.lds deleted file mode 100644 index 759738effa3d..000000000000 --- a/sysutils/memtest86+/files/patch-memtest.lds +++ /dev/null @@ -1,11 +0,0 @@ ---- memtest.lds.orig 2013-08-10 02:01:58 UTC -+++ memtest.lds -@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386); - - ENTRY(_start); - SECTIONS { -- . = 0x10000; -+ . = 0xc0120000; - _start = . ; - .data : { - *(.data) diff --git a/sysutils/memtest86+/files/patch-setup.S b/sysutils/memtest86+/files/patch-setup.S deleted file mode 100644 index 5479c7660601..000000000000 --- a/sysutils/memtest86+/files/patch-setup.S +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 --git a/sysutils/memtest86+/files/patch-test.c b/sysutils/memtest86+/files/patch-test.c deleted file mode 100644 index ce6f9dd219c4..000000000000 --- a/sysutils/memtest86+/files/patch-test.c +++ /dev/null @@ -1,53 +0,0 @@ ---- 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> - - extern struct cpu_ident cpu_id; - extern volatile int mstr_cpu; -@@ -1543,6 +1542,19 @@ void sleep(long n, int flag, int me, int - } - } - -+static inline unsigned char inb(unsigned int port) -+{ -+ unsigned char data; -+ -+ asm __volatile__("inb %1,%0" : "=a" (data) : "id" ((unsigned short)(port))); -+ return (data); -+} -+ -+static inline void outb(unsigned int port, unsigned char data) -+{ -+ asm __volatile__("outb %0,%1" : : "a" (data), "id" ((unsigned short)(port))); -+} -+ - /* Beep function */ - - void beep(unsigned int frequency) -@@ -1551,18 +1563,18 @@ void beep(unsigned int frequency) - unsigned int count = 1193180 / frequency; - - // Switch on the speaker -- outb_p(inb_p(0x61)|3, 0x61); -+ outb(inb(0x61)|3, 0x61); - - // Set command for counter 2, 2 byte write -- outb_p(0xB6, 0x43); -+ outb(0xB6, 0x43); - - // Select desired Hz -- outb_p(count & 0xff, 0x42); -+ outb(count & 0xff, 0x42); - outb((count >> 8) & 0xff, 0x42); - - // Block for 100 microseconds - sleep(100, 0, 0, 1); - - // Switch off the speaker -- outb(inb_p(0x61)&0xFC, 0x61); -+ outb(inb(0x61)&0xFC, 0x61); - } diff --git a/sysutils/memtest86+/files/pkg-message.in b/sysutils/memtest86+/files/pkg-message.in deleted file mode 100644 index bc75e15330c2..000000000000 --- a/sysutils/memtest86+/files/pkg-message.in +++ /dev/null @@ -1,23 +0,0 @@ -[ -{ type: install - message: <<EOM -This port has installed ELF image of memtest86+ to -%%BOOT_DIR%%/memtest86+. You can load it from from boot prompt by -interrupting boot process and entering - - N:ad(M,a)%%BOOT_DIR%%/memtest86+ - -where N and M denote proper disk and slice numbers. See boot(8) for -details. - -Alternatively you can load the image from loader prompt by escaping to -it and entering the following commands: - - unload - load %%BOOT_DIR%%/memtest86+ - boot - -As already advised, see loader(8) for details. -EOM -} -] diff --git a/sysutils/memtest86+/pkg-descr b/sysutils/memtest86+/pkg-descr deleted file mode 100644 index e7970cf3fc40..000000000000 --- a/sysutils/memtest86+/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Memtest86+ is a stand-alone memory test for x86 architecture computers -based on the well-known original memtest86 written by Chris Brady. |