diff --git a/package/x86/memtest86/hotfixes.patch b/package/x86/memtest86/hotfixes.patch deleted file mode 100644 index 034f0aac8..000000000 --- a/package/x86/memtest86/hotfixes.patch +++ /dev/null @@ -1,42 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/x86/memtest86/hotfixes.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./test.h.orig 2002-08-31 18:47:01.000000000 +0200 -+++ ./test.h 2002-08-31 18:47:13.000000000 +0200 -@@ -277,7 +277,6 @@ - #define FIRMWARE_PCBIOS 1 - #define FIRMWARE_LINUXBIOS 2 - --extern struct vars * const v; - extern unsigned char _start[], _end[], startup_32[]; - extern unsigned char _size, _pages; - ---- ./memsize.c.orig 2002-08-31 18:47:20.000000000 +0200 -+++ ./memsize.c 2002-08-31 18:47:53.000000000 +0200 -@@ -18,6 +18,7 @@ - - extern ulong p1, p2; - extern volatile ulong *p; -+extern struct vars *v; - - static void sort_pmap(void); - static int check_ram(void); diff --git a/package/x86/memtest86/ld-gnu-linkonce.patch b/package/x86/memtest86/ld-gnu-linkonce.patch new file mode 100644 index 000000000..89621db11 --- /dev/null +++ b/package/x86/memtest86/ld-gnu-linkonce.patch @@ -0,0 +1,10 @@ +--- memtest86+_v1.11/memtest_shared.lds 2003-12-30 08:20:16.000000000 +0100 ++++ memtest86+_v1.11-jsaw/memtest_shared.lds 2004-02-23 19:38:22.000000000 +0100 +@@ -9,6 +9,7 @@ + *(.text) + *(.text.*) + *(.plt) ++ *(.gnu.linkonce.*) + _etext = . ; + } = 0x9090 + .rodata : { diff --git a/package/x86/memtest86/memtest86.desc b/package/x86/memtest86/memtest86.desc index b6fd0952f..b25406af1 100644 --- a/package/x86/memtest86/memtest86.desc +++ b/package/x86/memtest86/memtest86.desc @@ -23,20 +23,18 @@ [I] A stand-alone memory siagnostic program for x86 -[T] Memtest86 is thorough, stand alone memory test for Intel i386 architecture -[T] systems. BIOS based memory tests are only a quick check and often miss -[T] failures that are detected by Memtest86. Memtest86 is it's own mini-os and -[T] can be booted using lilo, grub or directly from the bios (e.g. if written -[T] to the boot sector of a floppy disk). -[T] -[T] Bad memory or problems on the cpu<->memory bus are common reasons for -[T] the well-known 'Signal 11 while compiling the kernel' problem. Please -[T] read the Sig11 FAQ for details. -[T] -[T] The command 'memtest_install' can be used to create a memtest boot floppy. - -[U] http://www.memtest86.com/ {Memtest86 Homepage} -[U] http://www.BitWizard.nl/sig11/ {Sig11 FAQ} +[T] Based on the well-known original memtest86 written by Chris Brady, +[T] memtest86+ is a port by some members of the x86-secret team. Our goal +[T] is to provide an up-to-date and completly reliable version of this +[T] software tool aimed at memory failures detection. +[T] +[T] Memtest86+ is, like the original, released under the terms of the Gnu +[T] Public License (GPL). No restrictions for use, private or commercial +[T] exist other than the ones mentioned in the Gnu Public License +[T] (GPL). Texts about the original version was taken from the original +[T] website and written by Chris Brady. + +[U] http://www.memtest.org/ [A] Chris Brady [M] Clifford Wolf @@ -46,8 +44,8 @@ [L] GPL [S] Stable -[V] 3.0 +[V] 1.11 [P] X -----5---9 126.000 -[D] 2701925663 memtest86-3.0.tar.gz http://www.memtest86.com/ +[D] 2341927028 memtest_source_v1.11.tar.gz http://www.memtest.org/download/