From 46334fcad39f223bafef1e65cc41716c4d3ed07a2b68bcc9baa3ec58bb8d99e5 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 17 Jan 2021 13:50:52 +0000 Subject: [PATCH] - update to 5.31b: * Added support for up to 2 TB of RAM on X64 CPUs * Added experimental SMT support up to 32 cores (Press F2 to enable at startup) * Added complete detection for memory controllers * Added Motherboard Manufacturer & Model reporting * Added CPU temperature reporting * Added enhanced Fail Safe Mode (Press F1 at startup) * Added support for Intel "Sandy Bridge-E" CPUs * Added support for Intel "Ivy Bridge" CPUs * Added preliminary support for Intel "Haswell" CPUs (Core 4th Gen) * Added preliminary support for Intel "Haswell-ULT" CPUs * Added support for AMD "Kabini" (K16) CPUs * Added support for AMD "Bulldozer" CPUs * Added support for AMD "Trinity" CPUs * Added support for AMD E-/C-/G-/Z- "Bobcat" CPUs * Added support for Intel Atom "Pineview" CPUs * Added support for Intel Atom "Cedar Trail" CPUs * Added SPD detection on most AMD Chipsets * Enforced Coreboot support * Optimized run time for faster memory error detection * Rewriten lots of memory timings detection cod * Corrected bugs, bugs and more bugs (some could remain) - drop memtest86+-5.01-array-size-fix.patch, memtest86+-5.01-compile-fix.patch memtest86+-gcc5.patch: upstream OBS-URL: https://build.opensuse.org/package/show/Base:System/memtest86+?expand=0&rev=34 --- fix-destdir | 16 +++++---------- memtest86+-5.01-array-size-fix.patch | 20 ------------------- memtest86+-5.01-compile-fix.patch | 20 ------------------- memtest86+-5.01-no-optimization.patch | 18 +++++++++-------- memtest86+-5.01.tar.gz | 3 --- memtest86+-5.31b.tar.gz | 3 +++ memtest86+-gcc5.patch | 11 ----------- memtest86+.changes | 28 +++++++++++++++++++++++++++ memtest86+.spec | 14 ++++---------- 9 files changed, 50 insertions(+), 83 deletions(-) delete mode 100644 memtest86+-5.01-array-size-fix.patch delete mode 100644 memtest86+-5.01-compile-fix.patch delete mode 100644 memtest86+-5.01.tar.gz create mode 100644 memtest86+-5.31b.tar.gz delete mode 100644 memtest86+-gcc5.patch diff --git a/fix-destdir b/fix-destdir index ac4f3d5..834851c 100644 --- a/fix-destdir +++ b/fix-destdir @@ -1,5 +1,7 @@ ---- memtest86+-5.01/Makefile.old 2013-08-10 04:01:58.000000000 +0200 -+++ memtest86+-5.01/Makefile 2013-11-07 11:48:01.000000000 +0100 +Index: memtest86+-5.31b/Makefile +=================================================================== +--- memtest86+-5.31b.orig/Makefile ++++ memtest86+-5.31b/Makefile @@ -8,6 +8,7 @@ # Path for the floppy disk device # @@ -8,15 +10,7 @@ AS=as -32 CC=gcc -@@ -21,7 +22,6 @@ OBJS= head.o reloc.o main.o test.o init. - - - all: clean memtest.bin memtest -- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus - - # Link it statically once so I know I don't have undefined - # symbols and then link it dynamically so I have full -@@ -71,7 +71,10 @@ iso: +@@ -75,7 +76,10 @@ iso: make all ./makeiso.sh diff --git a/memtest86+-5.01-array-size-fix.patch b/memtest86+-5.01-array-size-fix.patch deleted file mode 100644 index cdfbb9f..0000000 --- a/memtest86+-5.01-array-size-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- memtest86+-5.01/controller.c~ 2013-08-10 02:01:58.000000000 +0000 -+++ memtest86+-5.01/controller.c 2013-12-12 20:58:12.873555378 +0000 -@@ -292,7 +292,7 @@ - - /* First, locate the PCI bus where the MCH is located */ - -- for(i = 0; i < sizeof(possible_nhm_bus); i++) { -+ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); - vid &= 0xFFFF; -@@ -327,7 +327,7 @@ - ctrl.mode = ECC_NONE; - - /* First, locate the PCI bus where the MCH is located */ -- for(i = 0; i < sizeof(possible_nhm_bus); i++) { -+ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); - vid &= 0xFFFF; diff --git a/memtest86+-5.01-compile-fix.patch b/memtest86+-5.01-compile-fix.patch deleted file mode 100644 index fee6c85..0000000 --- a/memtest86+-5.01-compile-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- memtest86+-5.01/io.h~ 2013-08-10 02:01:58.000000000 +0000 -+++ memtest86+-5.01/io.h 2014-01-08 01:29:12.404465515 +0000 -@@ -31,7 +31,7 @@ - */ - - #define __OUT1(s,x) \ --extern inline void __out##s(unsigned x value, unsigned short port) { -+static inline void __out##s(unsigned x value, unsigned short port) { - - #define __OUT2(s,s1,s2) \ - __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" -@@ -43,7 +43,7 @@ - __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } - - #define __IN1(s) \ --extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; -+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; - - #define __IN2(s,s1,s2) \ - __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" diff --git a/memtest86+-5.01-no-optimization.patch b/memtest86+-5.01-no-optimization.patch index 018ba80..fed92f6 100644 --- a/memtest86+-5.01-no-optimization.patch +++ b/memtest86+-5.01-no-optimization.patch @@ -1,11 +1,13 @@ ---- memtest86+-5.01/Makefile~ 2014-01-08 01:30:11.355900076 +0000 -+++ memtest86+-5.01/Makefile 2014-01-08 01:31:19.387555469 +0000 -@@ -12,7 +12,7 @@ +Index: memtest86+-5.31b/Makefile +=================================================================== +--- memtest86+-5.31b.orig/Makefile ++++ memtest86+-5.31b/Makefile +@@ -13,7 +13,7 @@ TARGETDIR=/boot AS=as -32 CC=gcc --CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ -+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ - -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector - - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ +-CFLAGS= -Wall -Werror -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ ++CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector + + SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g diff --git a/memtest86+-5.01.tar.gz b/memtest86+-5.01.tar.gz deleted file mode 100644 index 02269cc..0000000 --- a/memtest86+-5.01.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 -size 214877 diff --git a/memtest86+-5.31b.tar.gz b/memtest86+-5.31b.tar.gz new file mode 100644 index 0000000..06ca4bc --- /dev/null +++ b/memtest86+-5.31b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7146ffb182c0eb324e216ec5db284ef4bd8296122cf45e1695eabd8320cb1f09 +size 227779 diff --git a/memtest86+-gcc5.patch b/memtest86+-gcc5.patch deleted file mode 100644 index ee35f9f..0000000 --- a/memtest86+-gcc5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- memtest86+-5.01.orig/Makefile -+++ memtest86+-5.01/Makefile -@@ -14,7 +14,7 @@ AS=as -32 - CC=gcc - - CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ -- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -+ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline - - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ - config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \ diff --git a/memtest86+.changes b/memtest86+.changes index 3b26754..8781aee 100644 --- a/memtest86+.changes +++ b/memtest86+.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Sun Jan 17 13:48:44 UTC 2021 - Dirk Müller + +- update to 5.31b: + * Added support for up to 2 TB of RAM on X64 CPUs + * Added experimental SMT support up to 32 cores (Press F2 to enable at startup) + * Added complete detection for memory controllers + * Added Motherboard Manufacturer & Model reporting + * Added CPU temperature reporting + * Added enhanced Fail Safe Mode (Press F1 at startup) + * Added support for Intel "Sandy Bridge-E" CPUs + * Added support for Intel "Ivy Bridge" CPUs + * Added preliminary support for Intel "Haswell" CPUs (Core 4th Gen) + * Added preliminary support for Intel "Haswell-ULT" CPUs + * Added support for AMD "Kabini" (K16) CPUs + * Added support for AMD "Bulldozer" CPUs + * Added support for AMD "Trinity" CPUs + * Added support for AMD E-/C-/G-/Z- "Bobcat" CPUs + * Added support for Intel Atom "Pineview" CPUs + * Added support for Intel Atom "Cedar Trail" CPUs + * Added SPD detection on most AMD Chipsets + * Enforced Coreboot support + * Optimized run time for faster memory error detection + * Rewriten lots of memory timings detection cod + * Corrected bugs, bugs and more bugs (some could remain) +- drop memtest86+-5.01-array-size-fix.patch, memtest86+-5.01-compile-fix.patch + memtest86+-gcc5.patch: upstream + ------------------------------------------------------------------- Thu Apr 2 09:01:17 UTC 2020 - Martin Liška diff --git a/memtest86+.spec b/memtest86+.spec index fb3b927..205cf9c 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -1,7 +1,7 @@ # # spec file for package memtest86+ # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,15 @@ Name: memtest86+ -Version: 5.01 +Version: 5.31b Release: 0 Summary: Memory Testing Image for x86 Architecture License: BSD-3-Clause Group: System/Boot -URL: http://www.memtest.org -Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz +URL: https://www.memtest.org +Source: https://www.memtest.org/download/%{version}/memtest86+-%{version}.tar.gz Patch0: fix-destdir Patch1: memtest86+-5.01-no-optimization.patch -Patch2: memtest86+-5.01-compile-fix.patch -Patch3: memtest86+-5.01-array-size-fix.patch -Patch4: memtest86+-gcc5.patch #!BuildIgnore: gcc-PIE Requires(pre): /sbin/update-bootloader Requires(pre): perl @@ -48,9 +45,6 @@ it can be used to test the computer's memory. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build # dependencies are broken for the package and it should not be built in parallel