tb/contrib
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

memtest86+: 2.10 -> 2.11

Browse Source
This commit is contained in:
Danny Rawlins 2008-12-24 22:14:23 +11:00
parent 1591a3b3d6
commit ba2df6f6c1
6 changed files with 41 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
memtest86+/.md5sum
View File

@ -1,3 +1,3 @@
dc72920bf708a67036febe7a9e106703 memtest86+-2.10-gnu_hash.patch
006bdc5ab394d2da06ee9aef2faff736 memtest86+-2.10-makefile.patch
9ca90f6225b5fa4ed1334583c3d6b855 memtest86+-2.10.tar.gz
3554b58e74e11ad17f01b9b2e218cd62 memtest86+-2.11-makefile_cflags_asflags.patch
abdc336e015ba789c6e63321c0e99e81 memtest86+-2.11-makefile_install_remove.patch
e457774139c0bfef899359df91f49b3e memtest86+-2.11.tar.gz

11
memtest86+/Pkgfile
View File

@ -5,17 +5,16 @@
# Depends on:
name=memtest86+
version=2.10
version=2.11
release=1
source=(http://www.memtest.org/download/$version/$name-$version.tar.gz
$name-2.10-gnu_hash.patch
$name-2.10-makefile.patch)
memtest86+-2.11-makefile_cflags_asflags.patch
memtest86+-2.11-makefile_install_remove.patch)
build() {
cd $name-$version
patch -p 1 -i $SRC/$name-2.10-gnu_hash.patch
patch -p 1 -i $SRC/$name-2.10-makefile.patch
patch -p 1 -i $SRC/memtest86+-2.11-makefile_cflags_asflags.patch
patch -p 1 -i $SRC/memtest86+-2.11-makefile_install_remove.patch
make memtest.bin
make DESTDIR=$PKG install-memtest.bin
}

11
memtest86+/memtest86+-2.10-gnu_hash.patch
View File

@ -1,11 +0,0 @@
diff -pruNa memtest86+-2.10.orig/memtest_shared.lds memtest86+-2.10/memtest_shared.lds
--- memtest86+-2.10.orig/memtest_shared.lds 2008-11-18 16:26:00.349952851 +1100
+++ memtest86+-2.10/memtest_shared.lds 2008-11-18 16:27:33.211953405 +1100
@@ -18,6 +18,7 @@ SECTIONS {
.dynsym : { *(.dynsym) }
.dynstr : { *(.dynstr) }
.hash : { *(.hash) }
+ .gnu.hash : { *(.gnu.hash) }
.dynamic : { *(.dynamic) }
.rel.text : { *(.rel.text .rel.text.*) }

31
memtest86+/memtest86+-2.10-makefile.patch
View File

@ -1,31 +0,0 @@
diff -pruN memtest86+-2.10.orig/Makefile memtest86+-2.10/Makefile
--- memtest86+-2.10.orig/Makefile 2008-11-18 15:16:45.879971731 +1100
+++ memtest86+-2.10/Makefile 2008-11-18 16:08:03.084953799 +1100
@@ -8,10 +8,13 @@
#
FDISK=/dev/fd0
-AS=as -32
-CC=gcc
+AS?=as
+CC?=gcc
-CFLAGS= -fno-stack-protector -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
+CPPFLAGS=-m32
+CFLAGS?=-0s -march=i486 -fomit-frame-pointer
+CFLAGS+= -m32 -fPIC -Wall -ffreestanding -fno-builtin -fno-stack-protector
+ASFLAGS=-32
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 extra.o \
@@ -65,6 +68,9 @@ install: all
install-precomp:
dd <precomp.bin >$(FDISK) bs=8192
+
+install-memtest.bin:
+ install -m 0644 -D memtest.bin $(DESTDIR)/boot/memtest.bin
dos: all
cat mt86+_loader memtest.bin > memtest.exe

20
memtest86+/memtest86+-2.11-makefile_cflags_asflags.patch Normal file
View File

@ -0,0 +1,20 @@
diff -pruN memtest86+-2.11.orig/Makefile memtest86+-2.11/Makefile
--- memtest86+-2.11.orig/Makefile 2008-12-24 10:41:30.410800131 +0000
+++ memtest86+-2.11/Makefile 2008-12-24 10:51:17.727550623 +0000
@@ -8,10 +8,13 @@
#
FDISK=/dev/fd0
-AS=as -32
-CC=gcc
+AS?=as
+CC?=gcc
-CFLAGS= -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
+CPPFLAGS=-m32
+CFLAGS?=-0s -march=i486 -fomit-frame-pointer
+CFLAGS+= -m32 -fPIC -Wall -ffreestanding -fno-builtin
+ASFLAGS=-32
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 extra.o \

13
memtest86+/memtest86+-2.11-makefile_install_remove.patch Normal file
View File

@ -0,0 +1,13 @@
diff -pruN memtest86+-2.11.orig/Makefile memtest86+-2.11/Makefile
--- memtest86+-2.11.orig/Makefile 2008-12-24 10:41:30.410800131 +0000
+++ memtest86+-2.11/Makefile 2008-12-24 10:55:52.043549975 +0000
@@ -69,3 +69,9 @@ install-precomp:
dos: all
cat mt86+_loader memtest.bin > memtest.exe
+install-memtest.bin:
+ install -m 0644 -D memtest.bin $(DESTDIR)/boot/memtest.bin
+
+remove-memtest.bin:
+ rm $(DESTDIR)/boot/memtest.bin
+