diff --git a/memtest86+/.md5sum b/memtest86+/.md5sum index 9e4f346dc..5ad766fc2 100644 --- a/memtest86+/.md5sum +++ b/memtest86+/.md5sum @@ -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 diff --git a/memtest86+/Pkgfile b/memtest86+/Pkgfile index fa1863bfa..59db22514 100644 --- a/memtest86+/Pkgfile +++ b/memtest86+/Pkgfile @@ -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 } - diff --git a/memtest86+/memtest86+-2.10-gnu_hash.patch b/memtest86+/memtest86+-2.10-gnu_hash.patch deleted file mode 100644 index fa31f5aff..000000000 --- a/memtest86+/memtest86+-2.10-gnu_hash.patch +++ /dev/null @@ -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.*) } diff --git a/memtest86+/memtest86+-2.10-makefile.patch b/memtest86+/memtest86+-2.10-makefile.patch deleted file mode 100644 index 18a9dff24..000000000 --- a/memtest86+/memtest86+-2.10-makefile.patch +++ /dev/null @@ -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 $(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 - diff --git a/memtest86+/memtest86+-2.11-makefile_cflags_asflags.patch b/memtest86+/memtest86+-2.11-makefile_cflags_asflags.patch new file mode 100644 index 000000000..406118121 --- /dev/null +++ b/memtest86+/memtest86+-2.11-makefile_cflags_asflags.patch @@ -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 \ diff --git a/memtest86+/memtest86+-2.11-makefile_install_remove.patch b/memtest86+/memtest86+-2.11-makefile_install_remove.patch new file mode 100644 index 000000000..d9735452d --- /dev/null +++ b/memtest86+/memtest86+-2.11-makefile_install_remove.patch @@ -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 ++