Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
# $NetBSD: Makefile,v 1.16 2012/10/23 19:51:12 asau Exp $
|
||||
# $NetBSD: Makefile,v 1.18 2013/12/22 21:32:36 wiz Exp $
|
||||
#
|
||||
|
||||
# Note -- version number also in the do-install rule
|
||||
MAJVER=4
|
||||
MINVER=20
|
||||
MAJVER=5
|
||||
MINVER=01
|
||||
|
||||
DISTNAME= memtest86+-${MAJVER}.${MINVER}
|
||||
PKGNAME= memtestplus-${MAJVER}.${MINVER}
|
||||
@@ -17,9 +17,16 @@ LICENSE= gnu-gpl-v2
|
||||
|
||||
ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386 NetBSD-*-x86_64 Linux-*-x86_64
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
|
||||
GCC_REQD+= 4.6
|
||||
.else
|
||||
GCC_REQD+= 4.5
|
||||
.endif
|
||||
|
||||
USE_TOOLS+= gmake
|
||||
SUBST_CLASSES+= delcr
|
||||
SUBST_STAGE.delcr= post-build
|
||||
SUBST_STAGE.delcr= pre-patch
|
||||
SUBST_MESSAGE.delcr= Deleting CRs
|
||||
SUBST_FILES.delcr= README
|
||||
SUBST_SED.delcr= -e 's/.$$//g'
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
$NetBSD: distinfo,v 1.9 2011/05/30 19:58:07 jakllsch Exp $
|
||||
$NetBSD: distinfo,v 1.10 2013/12/08 00:35:28 jakllsch Exp $
|
||||
|
||||
SHA1 (memtest86+-4.20.tar.gz) = df49a3d0b003c575d5a26dedc3d66dbe905db1b6
|
||||
RMD160 (memtest86+-4.20.tar.gz) = abf74cfd34c220b104c3f364d782a4fcd2b7ec8a
|
||||
Size (memtest86+-4.20.tar.gz) = 206044 bytes
|
||||
SHA1 (patch-aa) = d6d193813985ec996495c010a5733ade83d0811c
|
||||
SHA1 (patch-ab) = 8e5ce60b904763c030931a532f3b438968fca434
|
||||
SHA1 (patch-ac) = fbfbcc23549e610af5d42ebe3710025f682ca9ec
|
||||
SHA1 (patch-ad) = aecaa5cee6a27d4e5beb9e3fc0c7efacf21eddf4
|
||||
SHA1 (patch-ae) = 64931515368b099a23c76468c837fae569cb3cc1
|
||||
SHA1 (memtest86+-5.01.tar.gz) = eb4b6d70114db3c9ed320785da44c0ba8349c10c
|
||||
RMD160 (memtest86+-5.01.tar.gz) = 756b57d8f8a3b7408aba0b2fc0cadcdc1df966df
|
||||
Size (memtest86+-5.01.tar.gz) = 214877 bytes
|
||||
SHA1 (patch-aa) = 2f49c00b162a3f5f7c9f94808d1246d283b8e9f6
|
||||
SHA1 (patch-ab) = 04ca819d23656c5a73625b457ad730c0cf33e751
|
||||
SHA1 (patch-ac) = 9186952e34139b4d4aab6c266a224921a4d39659
|
||||
SHA1 (patch-ad) = ab31fec30052fdd3c473ee885ba00d7e3676384f
|
||||
SHA1 (patch-makeiso.sh) = 939056a96a1384e4d27772bf5612a755deca8145
|
||||
SHA1 (patch-nbstart.S) = d97a6e9c25a57d0f5510c3acf4dccf0f0c0c31b0
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-aa,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
|
||||
$NetBSD: patch-aa,v 1.5 2013/12/08 00:35:28 jakllsch Exp $
|
||||
|
||||
--- Makefile.orig 2009-09-22 00:35:46.000000000 +0000
|
||||
--- Makefile.orig 2013-08-10 02:01:58.000000000 +0000
|
||||
+++ Makefile
|
||||
@@ -6,7 +6,7 @@
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# Path for the floppy disk device
|
||||
#
|
||||
@@ -11,11 +11,27 @@ $NetBSD: patch-aa,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
|
||||
|
||||
AS=as -32
|
||||
CC=gcc
|
||||
@@ -61,7 +61,6 @@ asm:
|
||||
iso:
|
||||
make all
|
||||
./makeiso.sh
|
||||
- rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin
|
||||
@@ -20,8 +20,7 @@ OBJS= head.o reloc.o main.o test.o init.
|
||||
smp.o vmem.o random.o
|
||||
|
||||
|
||||
install: all
|
||||
dd <memtest.bin >$(FDISK) bs=8192
|
||||
-all: clean memtest.bin memtest
|
||||
- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
|
||||
+all: memtest.bin memtest
|
||||
|
||||
# Link it statically once so I know I don't have undefined
|
||||
# symbols and then link it dynamically so I have full
|
||||
@@ -34,8 +33,11 @@ memtest_shared: $(OBJS) memtest_shared.l
|
||||
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 $@
|
||||
+nbstart.s: nbstart.S config.h defs.h
|
||||
+ $(CC) -E -traditional $< -o $@
|
||||
+
|
||||
+memtest: memtest_shared.bin memtest.lds nbstart.o
|
||||
+ $(LD) -T memtest.lds -z max-page-size=0x1000 nbstart.o -b binary memtest_shared.bin -o $@
|
||||
|
||||
head.s: head.S config.h defs.h test.h
|
||||
$(CC) -E -traditional $< -o $@
|
||||
|
||||
@@ -1,62 +1,49 @@
|
||||
$NetBSD: patch-ab,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
|
||||
$NetBSD: patch-ab,v 1.5 2013/12/08 00:35:28 jakllsch Exp $
|
||||
|
||||
--- test.c.orig 2009-09-22 00:35:46.000000000 +0000
|
||||
--- test.c.orig 2013-08-10 02:29:44.000000000 +0000
|
||||
+++ test.c
|
||||
@@ -11,10 +11,32 @@
|
||||
|
||||
#include "test.h"
|
||||
#include "config.h"
|
||||
@@ -14,7 +14,6 @@
|
||||
#include "stdint.h"
|
||||
#include "cpuid.h"
|
||||
#include "smp.h"
|
||||
-#include <sys/io.h>
|
||||
#include "dmi.h"
|
||||
#include <inttypes.h>
|
||||
|
||||
+static __inline void
|
||||
+pkg_outb (unsigned char value, unsigned short int port)
|
||||
extern struct cpu_ident cpu_id;
|
||||
extern volatile int mstr_cpu;
|
||||
@@ -29,6 +28,36 @@ void rand_seed( unsigned int seed1, unsi
|
||||
ulong rand(int me);
|
||||
void poll_errors();
|
||||
|
||||
+static inline void outb(unsigned char value, unsigned short int port)
|
||||
+{
|
||||
+ __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
|
||||
+ asm __volatile__ (
|
||||
+ "outb %b0,%w1\n\t"
|
||||
+ : :"a" (value), "Nd" (port)
|
||||
+ );
|
||||
+}
|
||||
+
|
||||
+static __inline void
|
||||
+pkg_outb_p (unsigned char value, unsigned short int port)
|
||||
+static __inline void outb_p(unsigned char value, unsigned short int port)
|
||||
+{
|
||||
+ __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value),
|
||||
+ "Nd" (port));
|
||||
+ asm __volatile__ (
|
||||
+ "outb %b0,%w1\n\t"
|
||||
+ "outb %%al,$0x80\n\t"
|
||||
+ : : "a" (value), "Nd" (port)
|
||||
+ );
|
||||
+}
|
||||
+
|
||||
+static __inline unsigned char
|
||||
+pkg_inb_p (unsigned short int port)
|
||||
+static __inline unsigned char inb_p(unsigned short int port)
|
||||
+{
|
||||
+ unsigned char _v;
|
||||
+ unsigned char v;
|
||||
+
|
||||
+ __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
|
||||
+ return _v;
|
||||
+ asm __volatile__ (
|
||||
+ "inb %w1,%0\n\t"
|
||||
+ "outb %%al,$0x80\n\t"
|
||||
+ : "=a" (v)
|
||||
+ : "Nd" (port)
|
||||
+ );
|
||||
+ return v;
|
||||
+}
|
||||
+
|
||||
+
|
||||
extern int segs, bail;
|
||||
extern volatile ulong *p;
|
||||
extern ulong p1, p2;
|
||||
@@ -1414,18 +1436,18 @@ void beep(unsigned int frequency)
|
||||
unsigned int count = 1193180 / frequency;
|
||||
|
||||
// Switch on the speaker
|
||||
- outb_p(inb_p(0x61)|3, 0x61);
|
||||
+ pkg_outb_p(pkg_inb_p(0x61)|3, 0x61);
|
||||
|
||||
// Set command for counter 2, 2 byte write
|
||||
- outb_p(0xB6, 0x43);
|
||||
+ pkg_outb_p(0xB6, 0x43);
|
||||
|
||||
// Select desired Hz
|
||||
- outb_p(count & 0xff, 0x42);
|
||||
- outb((count >> 8) & 0xff, 0x42);
|
||||
+ pkg_outb_p(count & 0xff, 0x42);
|
||||
+ pkg_outb((count >> 8) & 0xff, 0x42);
|
||||
|
||||
// Block for 100 microseconds
|
||||
sleep(100, 1);
|
||||
|
||||
// Switch off the speaker
|
||||
- outb(inb_p(0x61)&0xFC, 0x61);
|
||||
+ pkg_outb(pkg_inb_p(0x61)&0xFC, 0x61);
|
||||
}
|
||||
static inline ulong roundup(ulong value, ulong mask)
|
||||
{
|
||||
return (value + mask) & ~mask;
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
$NetBSD: patch-ac,v 1.5 2010/07/08 18:54:22 jakllsch Exp $
|
||||
$NetBSD: patch-ac,v 1.6 2013/12/08 00:35:28 jakllsch Exp $
|
||||
|
||||
--- memtest.lds.orig 2010-04-28 12:11:15.000000000 +0000
|
||||
--- memtest.lds.orig 2013-08-10 02:01:58.000000000 +0000
|
||||
+++ memtest.lds
|
||||
@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386);
|
||||
|
||||
ENTRY(_start);
|
||||
SECTIONS {
|
||||
- . = 0x5000;
|
||||
+ . = 0x100000;
|
||||
_start = . ;
|
||||
.data : {
|
||||
*(.data)
|
||||
@@ -3,9 +3,7 @@ OUTPUT_ARCH(i386);
|
||||
|
||||
ENTRY(_start);
|
||||
SECTIONS {
|
||||
- . = 0x10000;
|
||||
- _start = . ;
|
||||
- .data : {
|
||||
- *(.data)
|
||||
+ .text 0x100000 : {
|
||||
+ *(.*)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
$NetBSD: patch-ad,v 1.2 2009/11/24 17:20:40 jakllsch Exp $
|
||||
$NetBSD: patch-ad,v 1.3 2013/12/08 00:35:28 jakllsch Exp $
|
||||
|
||||
--- README.orig 2009-09-22 00:35:46.000000000 +0000
|
||||
--- README.orig 2013-12-08 00:26:53.000000000 +0000
|
||||
+++ README
|
||||
@@ -174,7 +174,7 @@ individual errors. In BadRAM Patterns m
|
||||
use with the Linux BadRAM feature. This slick feature allows Linux to
|
||||
avoid bad memory pages. Details about the BadRAM feature can be found at:
|
||||
|
||||
- http://home.zonnet.nl/vanrein/badram
|
||||
+ http://rick.vanrein.org/linux/badram/
|
||||
|
||||
For individual errors the following information is displayed when a memory
|
||||
error is detected. An error message is only displayed for errors with a
|
||||
@@ -241,7 +241,7 @@ work-around makes it possible for Linux
|
||||
RAM. For more information on BadRAM suppor
|
||||
for Linux, sail t
|
||||
|
||||
- http://home.zonnet.nl/vanrein/badra
|
||||
+ http://rick.vanrein.org/linux/badram/
|
||||
|
||||
Sometimes memory errors show up due to component incompatibility. A memor
|
||||
module may work fine in one system and not in another. This is no
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
$NetBSD: patch-ae,v 1.2 2009/11/24 17:20:40 jakllsch Exp $
|
||||
|
||||
--- error.c.orig 2009-09-22 00:35:46.000000000 +0000
|
||||
+++ error.c
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
#include "test.h"
|
||||
#include "config.h"
|
||||
-#include <sys/io.h>
|
||||
#include "dmi.h"
|
||||
#define NULL 0
|
||||
|
||||
22
sysutils/memtestplus/patches/patch-makeiso.sh
Normal file
22
sysutils/memtestplus/patches/patch-makeiso.sh
Normal file
@@ -0,0 +1,22 @@
|
||||
$NetBSD: patch-makeiso.sh,v 1.1 2013/12/08 00:35:28 jakllsch Exp $
|
||||
|
||||
--- makeiso.sh.orig 2013-08-10 02:03:33.000000000 +0000
|
||||
+++ makeiso.sh
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
# check to see if the correct tools are installed
|
||||
-for X in wc genisoimage
|
||||
+for X in wc mkisofs
|
||||
do
|
||||
if [ "$(which $X)" = "" ]; then
|
||||
echo "makeiso.sh error: $X is not in your path." >&2
|
||||
@@ -37,7 +37,7 @@ cd cd
|
||||
echo -e "There is nothing to do here\r\r\nMemtest86+ is located on the bootsector of this CD\r\r\n" > README.TXT
|
||||
echo -e "Just boot from this CD and Memtest86+ will launch" >> README.TXT
|
||||
|
||||
-genisoimage -A "MKISOFS 1.1.2" -p "Memtest86+ 5.01" -publisher "Samuel D. <sdemeule@memtest.org>" -b boot/memtest.img -c boot/boot.catalog -V "MT501" -o memtest.iso .
|
||||
+mkisofs -A "MKISOFS 1.1.2" -p "Memtest86+ 5.01" -publisher "Samuel D. <sdemeule@memtest.org>" -b boot/memtest.img -c boot/boot.catalog -V "MT501" -o memtest.iso .
|
||||
mv memtest.iso ../mt501.iso
|
||||
cd ..
|
||||
rm -rf cd
|
||||
14
sysutils/memtestplus/patches/patch-nbstart.S
Normal file
14
sysutils/memtestplus/patches/patch-nbstart.S
Normal file
@@ -0,0 +1,14 @@
|
||||
$NetBSD: patch-nbstart.S,v 1.1 2013/12/08 00:35:28 jakllsch Exp $
|
||||
|
||||
--- nbstart.S.orig 2013-12-08 00:26:53.000000000 +0000
|
||||
+++ nbstart.S
|
||||
@@ -0,0 +1,9 @@
|
||||
+#include "defs.h"
|
||||
+ .globl _start
|
||||
+_start:
|
||||
+ movl $LOW_TEST_ADR, %edi
|
||||
+ movl $_binary_memtest_shared_bin_start, %esi
|
||||
+ movl $_binary_memtest_shared_bin_size, %ecx
|
||||
+ movl %edi, %eax
|
||||
+ rep movsb %ds:(%esi),%es:(%edi)
|
||||
+ jmp *%eax
|
||||
Reference in New Issue
Block a user