This commit is contained in:
commit
3377c88819
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
37
memtest86+-1.65.diff
Normal file
37
memtest86+-1.65.diff
Normal file
@ -0,0 +1,37 @@
|
||||
Index: Makefile
|
||||
===================================================================
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -7,6 +7,7 @@
|
||||
# Path for the floppy disk device
|
||||
#
|
||||
FDISK=/dev/fd0
|
||||
+TARGETDIR=/boot
|
||||
|
||||
CC=gcc
|
||||
#
|
||||
@@ -114,7 +115,10 @@ clean:
|
||||
wormkill:
|
||||
rm -f *~
|
||||
|
||||
-install: all
|
||||
+install:
|
||||
+ install -o root -g root memtest.bin $(DESTDIR)$(TARGETDIR)/
|
||||
+
|
||||
+install-floppy: all
|
||||
dd <memtest.bin >$(FDISK) bs=8192
|
||||
|
||||
install-bin:
|
||||
Index: config.h
|
||||
===================================================================
|
||||
--- config.h.orig
|
||||
+++ config.h
|
||||
@@ -13,7 +13,7 @@
|
||||
/* SERIAL_CONSOLE_DEFAULT - The default state of the serial console. */
|
||||
/* This is normally off since it slows down testing. Change to a 1 */
|
||||
/* to enable. */
|
||||
-#define SERIAL_CONSOLE_DEFAULT 0
|
||||
+#define SERIAL_CONSOLE_DEFAULT 1
|
||||
|
||||
/* SERIAL_BAUD_RATE - Baud rate for the serial console */
|
||||
#define SERIAL_BAUD_RATE 9600
|
3
memtest86+-1.65.tar.gz
Normal file
3
memtest86+-1.65.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fb27b1e0b65128921c551096a2e0f8ec51ffa27a45b1e76a54ca6b6685d0e980
|
||||
size 146203
|
12
memtest86+-1.65_include-linkonce.patch
Normal file
12
memtest86+-1.65_include-linkonce.patch
Normal file
@ -0,0 +1,12 @@
|
||||
Index: memtest_shared.lds
|
||||
===================================================================
|
||||
--- memtest_shared.lds.orig
|
||||
+++ memtest_shared.lds
|
||||
@@ -8,6 +8,7 @@ SECTIONS {
|
||||
_start = .;
|
||||
*(.text)
|
||||
*(.text.*)
|
||||
+ *(.gnu.linkonce.t.*)
|
||||
*(.plt)
|
||||
_etext = . ;
|
||||
} = 0x9090
|
43
memtest86+-1.65_timeout-serialconsole.diff
Normal file
43
memtest86+-1.65_timeout-serialconsole.diff
Normal file
@ -0,0 +1,43 @@
|
||||
Index: init.c
|
||||
===================================================================
|
||||
--- init.c.orig
|
||||
+++ init.c
|
||||
@@ -29,6 +29,7 @@ static ulong memspeed(ulong src, ulong l
|
||||
static void cpu_type(void);
|
||||
static void cacheable(void);
|
||||
static int cpuspeed(void);
|
||||
+extern short serial_cons;
|
||||
|
||||
static void display_init(void)
|
||||
{
|
||||
@@ -65,6 +66,9 @@ static void display_init(void)
|
||||
}
|
||||
|
||||
serial_echo_print("\x1B[0m");
|
||||
+
|
||||
+ if (!serial_cons && SERIAL_CONSOLE_DEFAULT)
|
||||
+ cprint (23, 0, "Timout on serial console: disabled");
|
||||
}
|
||||
|
||||
/*
|
||||
Index: serial.h
|
||||
===================================================================
|
||||
--- serial.h.orig
|
||||
+++ serial.h
|
||||
@@ -140,10 +140,12 @@
|
||||
#define serial_echo_inb(a) inb((a)+0x3f8)
|
||||
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
|
||||
/* Wait for transmitter & holding register to empty */
|
||||
-#define WAIT_FOR_XMITR \
|
||||
- do { \
|
||||
- lsr = serial_echo_inb(UART_LSR); \
|
||||
- } while ((lsr & BOTH_EMPTY) != BOTH_EMPTY)
|
||||
+#define WAIT_FOR_XMITR \
|
||||
+ int _i = 1<<15; \
|
||||
+ do { \
|
||||
+ lsr = serial_echo_inb(UART_LSR); \
|
||||
+ } while ((lsr & BOTH_EMPTY) != BOTH_EMPTY && --_i); \
|
||||
+ if (!_i) serial_cons = 0
|
||||
|
||||
#if 0
|
||||
static inline void serial_echo(int ch)
|
147
memtest86+.changes
Normal file
147
memtest86+.changes
Normal file
@ -0,0 +1,147 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 16 19:35:12 CET 2006 - mrueckert@suse.de
|
||||
|
||||
- switch to memtest86+ (http://www.memtest.org)
|
||||
Compared to memtest86 3.2 it supports more hardware. and has
|
||||
additional fixes. see http://www.memtest.org/#change for all
|
||||
details. This upgrade fixes bug (#148481).
|
||||
- rediffed memtest86-3.2.diff to apply cleanly.
|
||||
new name: memtest86+-1.65.diff
|
||||
- rediffed memtest86-3.2-timeout-serialconsole.diff to apply cleanly.
|
||||
new name: memtest86+-1.65_timeout-serialconsole.diff
|
||||
- rediffed memtest86-include-linkonce to apply cleanly.
|
||||
new name: memtest86+-1.65_include-linkonce.patch
|
||||
- cleaned up build section and directly use install instead of the
|
||||
broken install target
|
||||
- added changelog and FAQ to the docs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:44:27 CET 2006 - mls@suse.de
|
||||
|
||||
- converted neededforbuild to BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 10 12:38:17 CEST 2005 - duwe@suse.de
|
||||
|
||||
- include *.gnu.linkonce.t.* sections in ld script,
|
||||
to build cleanly on amd64 with gcc4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 16:21:39 CET 2005 - duwe@suse.de
|
||||
|
||||
- update to current version 3.2:
|
||||
more support for current CPUs and chipsets
|
||||
fix Bugs #60303 (duped #72202), #71215
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 22 16:41:36 CET 2004 - stepan@suse.de
|
||||
|
||||
- update to 3.1a. This fixes compilation with gcc 3.x
|
||||
- drop precompiled binary completely
|
||||
- add ExclusiveArch for x86 and AMD64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 19 16:37:37 CET 2004 - stepan@suse.de
|
||||
|
||||
- update to v3.1
|
||||
- remove gcc 2.95 exceptions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 8 14:47:28 CEST 2002 - kukuk@suse.de
|
||||
|
||||
- Add splitt alias [Bug #19111]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 5 18:16:53 MEST 2002 - garloff@suse.de
|
||||
|
||||
- memtest86-3.0 seems to hang on some machines if the serial
|
||||
console support is enabled, but no serial console connected.
|
||||
Add a timeout waiting for the serial console. (Bug #18302)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 2 09:37:11 MEST 2002 - garloff@suse.de
|
||||
|
||||
- Supply complete image (compiled by gcc-2.95), as I don't succeed
|
||||
solving the gcc-3.2 problems at this moment. (#18302)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 31 13:09:52 MEST 2002 - garloff@suse.de
|
||||
|
||||
- Supply main.s compiled with gcc-2.95 to work around problem with
|
||||
gcc-3.2.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 16:20:14 MEST 2002 - garloff@suse.de
|
||||
|
||||
- Split off lilo package.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:57 CEST 2002 - sf@suse.de
|
||||
|
||||
- added -m32 to compiler and linker for x86_64
|
||||
- added --32 to as
|
||||
- added glibc-devel-32bit for x86_64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 7 13:26:36 MEST 2002 - garloff@suse.de
|
||||
|
||||
- Update to memtest86-3.0:
|
||||
* Testing more than 2GB should work now.
|
||||
* Use PIC instead of two copies
|
||||
* Serial code avoid redundant writes now
|
||||
* ^l/l gives screen refresh (after connecting serial console)
|
||||
* Netbooting operational again
|
||||
* LinuxBIOS support (memory sizing)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 22 20:55:47 MEST 2002 - garloff@suse.de
|
||||
|
||||
- Update to memtest86-2.9:
|
||||
* Provide three memory sizing modes; default is conservative one
|
||||
probably not testing all memory on some boards
|
||||
* Testing more than 2GB supported
|
||||
* Memory testing in segments. Minor bug fixes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 15 16:20:34 CET 2002 - mantel@suse.de
|
||||
|
||||
- remove x bit from memtest.bin since it's not a Linux executable
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 12 00:52:56 MET 2001 - garloff@suse.de
|
||||
|
||||
- Update to memtest86-2.8(a):
|
||||
* Reworked build process; a network bootable boot image can be
|
||||
produced
|
||||
* mem and cache speed detection code rewritten (should work now)
|
||||
* CPU detection for Pentium 4
|
||||
* Serial console disabled by default
|
||||
- Reenabled memtest86 serial console (9600 8n1) ;-)
|
||||
- Clean up .spec file a bit
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 16 17:17:14 CEST 2001 - uli@suse.de
|
||||
|
||||
- update memtest -> 2.7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 9 16:45:54 MEST 2001 - garloff@suse.de
|
||||
|
||||
- memtest86: Correct units (cosmetic)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 21 14:16:44 MET 2000 - garloff@suse.de
|
||||
|
||||
- Update memtest86 to v2.5 final.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 29 15:40:31 MET 2000 - garloff@suse.de
|
||||
|
||||
- Update memtest86 to v2.5-beta (Athlon/Duron support)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 28 15:49:45 CEST 2000 - garloff@suse.de
|
||||
|
||||
- Added memtest86-2.4.
|
||||
|
||||
-------------------------------------------------------------------
|
160
memtest86+.spec
Normal file
160
memtest86+.spec
Normal file
@ -0,0 +1,160 @@
|
||||
#
|
||||
# spec file for package memtest86+ (Version 1.65)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: memtest86+
|
||||
Version: 1.65
|
||||
Release: 1
|
||||
#
|
||||
License: BSD License and BSD-like, Other License(s), see package
|
||||
Group: System/Boot
|
||||
#
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: bin86 nasm
|
||||
%ifarch x86_64
|
||||
BuildRequires: glibc-devel-32bit
|
||||
%endif
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
Provides: lilo:/boot/memtest.bin
|
||||
Obsoletes: memtest86 <= 3.2
|
||||
Provides: memtest86 > 3.2
|
||||
#
|
||||
URL: http://www.memtest.org
|
||||
Source: http://www.memtest.org/download/1.65/memtest86+-%{version}.tar.gz
|
||||
Patch0: memtest86+-1.65.diff
|
||||
Patch1: memtest86+-1.65_timeout-serialconsole.diff
|
||||
Patch2: memtest86+-1.65_include-linkonce.patch
|
||||
#
|
||||
Summary: Memory Testing Image for x86 Architecture
|
||||
|
||||
%description
|
||||
Memtest86 is an image that can be booted instead of a real OS. Once
|
||||
booted, it can be used to test the computer's memory.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Samuel Demeulemeester <memtest@memtest.org>
|
||||
Original memtest86 package:
|
||||
John Coffman <JohnInSD@san.rr.com>
|
||||
Werner Almesberger <Werner.Almesberger@epfl.ch>
|
||||
PowerPC part:
|
||||
Paul Mackeras <paulus@samba.org>
|
||||
Cort Dougan <cort@fsmlabs.com>
|
||||
Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
||||
Memtest86:
|
||||
Chris Brady <crsbrady@earthlink.net>
|
||||
|
||||
%prep
|
||||
%setup
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
|
||||
%build
|
||||
%ifarch x86_64
|
||||
make CC="gcc -m32" AS="as --32"
|
||||
%else
|
||||
make
|
||||
%endif
|
||||
|
||||
%install
|
||||
install -D -m 0644 memtest.bin $RPM_BUILD_ROOT/boot/memtest.bin
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/boot/memtest.bin
|
||||
%doc README* changelog FAQ
|
||||
|
||||
%changelog -n memtest86+
|
||||
* Thu Nov 16 2006 - mrueckert@suse.de
|
||||
- switch to memtest86+ (http://www.memtest.org)
|
||||
Compared to memtest86 3.2 it supports more hardware. and has
|
||||
additional fixes. see http://www.memtest.org/#change for all
|
||||
details. This upgrade fixes bug (#148481).
|
||||
- rediffed memtest86-3.2.diff to apply cleanly.
|
||||
new name: memtest86+-1.65.diff
|
||||
- rediffed memtest86-3.2-timeout-serialconsole.diff to apply cleanly.
|
||||
new name: memtest86+-1.65_timeout-serialconsole.diff
|
||||
- rediffed memtest86-include-linkonce to apply cleanly.
|
||||
new name: memtest86+-1.65_include-linkonce.patch
|
||||
- cleaned up build section and directly use install instead of the
|
||||
broken install target
|
||||
- added changelog and FAQ to the docs
|
||||
* Wed Jan 25 2006 - mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Tue May 10 2005 - duwe@suse.de
|
||||
- include *.gnu.linkonce.t.* sections in ld script,
|
||||
to build cleanly on amd64 with gcc4
|
||||
* Mon Mar 14 2005 - duwe@suse.de
|
||||
- update to current version 3.2:
|
||||
more support for current CPUs and chipsets
|
||||
fix Bugs #60303 (duped #72202), #71215
|
||||
* Mon Mar 22 2004 - stepan@suse.de
|
||||
- update to 3.1a. This fixes compilation with gcc 3.x
|
||||
- drop precompiled binary completely
|
||||
- add ExclusiveArch for x86 and AMD64
|
||||
* Fri Mar 19 2004 - stepan@suse.de
|
||||
- update to v3.1
|
||||
- remove gcc 2.95 exceptions
|
||||
* Sun Sep 08 2002 - kukuk@suse.de
|
||||
- Add splitt alias [Bug #19111]
|
||||
* Thu Sep 05 2002 - garloff@suse.de
|
||||
- memtest86-3.0 seems to hang on some machines if the serial
|
||||
console support is enabled, but no serial console connected.
|
||||
Add a timeout waiting for the serial console. (Bug #18302)
|
||||
* Mon Sep 02 2002 - garloff@suse.de
|
||||
- Supply complete image (compiled by gcc-2.95), as I don't succeed
|
||||
solving the gcc-3.2 problems at this moment. (#18302)
|
||||
* Sat Aug 31 2002 - garloff@suse.de
|
||||
- Supply main.s compiled with gcc-2.95 to work around problem with
|
||||
gcc-3.2.
|
||||
* Tue Jul 30 2002 - garloff@suse.de
|
||||
- Split off lilo package.
|
||||
* Tue Jul 30 2002 - sf@suse.de
|
||||
- added -m32 to compiler and linker for x86_64
|
||||
- added --32 to as
|
||||
- added glibc-devel-32bit for x86_64
|
||||
* Fri Jun 07 2002 - garloff@suse.de
|
||||
- Update to memtest86-3.0:
|
||||
* Testing more than 2GB should work now.
|
||||
* Use PIC instead of two copies
|
||||
* Serial code avoid redundant writes now
|
||||
* ^l/l gives screen refresh (after connecting serial console)
|
||||
* Netbooting operational again
|
||||
* LinuxBIOS support (memory sizing)
|
||||
* Mon Apr 22 2002 - garloff@suse.de
|
||||
- Update to memtest86-2.9:
|
||||
* Provide three memory sizing modes; default is conservative one
|
||||
probably not testing all memory on some boards
|
||||
* Testing more than 2GB supported
|
||||
* Memory testing in segments. Minor bug fixes.
|
||||
* Fri Feb 15 2002 - mantel@suse.de
|
||||
- remove x bit from memtest.bin since it's not a Linux executable
|
||||
* Wed Dec 12 2001 - garloff@suse.de
|
||||
- Update to memtest86-2.8(a):
|
||||
* Reworked build process; a network bootable boot image can be
|
||||
produced
|
||||
* mem and cache speed detection code rewritten (should work now)
|
||||
* CPU detection for Pentium 4
|
||||
* Serial console disabled by default
|
||||
- Reenabled memtest86 serial console (9600 8n1) ;-)
|
||||
- Clean up .spec file a bit
|
||||
* Mon Jul 16 2001 - uli@suse.de
|
||||
- update memtest -> 2.7
|
||||
* Mon Apr 09 2001 - garloff@suse.de
|
||||
- memtest86: Correct units (cosmetic)
|
||||
* Thu Dec 21 2000 - garloff@suse.de
|
||||
- Update memtest86 to v2.5 final.
|
||||
* Wed Nov 29 2000 - garloff@suse.de
|
||||
- Update memtest86 to v2.5-beta (Athlon/Duron support)
|
||||
* Mon Aug 28 2000 - garloff@suse.de
|
||||
- Added memtest86-2.4.
|
Loading…
x
Reference in New Issue
Block a user