* [PR PATCH] [WIP] memtest86+: update to 5.31b
@ 2020-04-20 9:54 yopito
2021-01-29 1:05 ` ericonr
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: yopito @ 2020-04-20 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
There is a new pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages memtest.5.31b
https://github.com/void-linux/void-packages/pull/21179
[WIP] memtest86+: update to 5.31b
* not a stable release
* build fine from x86_64/musl
* run fine on my i5-5300U CPU @ 2.30GHz, 8GB RAM, both fail-safe and SMP modes
* glitches on % calculations (test #8 advancement, overall is 100% on hitting test 8/11)
A patch file from https://github.com/void-linux/void-packages/pull/21179.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-memtest.5.31b-21179.patch --]
[-- Type: text/x-diff, Size: 9938 bytes --]
From af34be607c576b4eab1e8d99f25e993e28642a4b Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sun, 19 Apr 2020 13:45:01 +0200
Subject: [PATCH] memtest86+: update to 5.31b
---
.../patches/00.memtest86+-5.01-no-scp.patch | 10 --
.../01.memtest86+-5.01-no-optimization.patch | 18 ----
.../02.memtest86+-5.01-compile-fix.patch | 27 -----
.../03.memtest86+-5.01-crash-fix.patch | 100 ------------------
.../04.memtest86+-5.01-fgnu89-inline.patch | 15 ---
....memtest86+-5.01-fno-stack-protector.patch | 11 --
srcpkgs/memtest86+/template | 8 +-
7 files changed, 4 insertions(+), 185 deletions(-)
delete mode 100644 srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
delete mode 100644 srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
delete mode 100644 srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
delete mode 100644 srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
delete mode 100644 srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
delete mode 100644 srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
diff --git a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch b/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
deleted file mode 100644
index e261d7b4b0e..00000000000
--- a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-
-
- 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
diff --git a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch b/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
deleted file mode 100644
index fe76ad57611..00000000000
--- a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- Makefile~ 2014-01-08 01:30:11.355900076 +0000
-+++ Makefile 2014-01-08 01:31:19.387555469 +0000
-@@ -12,7 +12,7 @@
- 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 \
diff --git a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch b/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
deleted file mode 100644
index aa1e2d7c101..00000000000
--- a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- io.h~ 2013-08-10 02:01:58.000000000 +0000
-+++ 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/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch b/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
deleted file mode 100644
index ed0a10c0de5..00000000000
--- a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- controller.c.orig
-+++ controller.c
-@@ -2,6 +2,8 @@
- * MemTest86+ V5 Specific code (GPL V2.0)
- * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
- * http://www.canardpc.com - http://www.memtest.org
-+ *
-+ * Edited by David McInnis Oct 4, 2014
- */
-
- //#include "defs.h"
-@@ -292,7 +294,7 @@ static void setup_nhm(void)
-
- /* 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 +329,7 @@ static void setup_nhm32(void)
- 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;
-@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) {
- unsigned long dramchr;
- float clockratio;
- double dramclock;
-- unsigned int dummy[3];
-+ unsigned int dummy[4];
- int ram_type;
-
- float coef = 10;
-@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) {
-
- static void poll_timings_i875(void) {
-
-- ulong dev6, dev62;
-+ ulong dev6;
- ulong temp;
- float cas;
- int rcd, rp, ras, chan;
- long *ptr, *ptr2;
-
-- pci_conf_read( 0, 6, 0, 0x40, 4, &dev62);
-+ pci_conf_read( 0, 6, 0, 0x40, 4, &dev6);
- ptr2=(long*)(dev6+0x68);
-
- /* Read the MMR Base Address & Define the pointer */
---- init.c.orig
-+++ init.c
-@@ -7,6 +7,8 @@
- *
- * Released under version 2 of the Gnu Public License.
- * By Chris Brady
-+ *
-+ * Edited by David McInnis October 4, 2014
- */
-
-
-@@ -914,7 +916,6 @@ void cpu_type(void)
- default:
- cprint(0, COL_MID, "Unknown Intel");
- break;
-- break;
- }
-
- }
---- main.c.orig
-+++ main.c
-@@ -422,7 +422,7 @@ void test_start(void)
- //initialise_cpus();
- btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);
- /* Draw the screen and get system information */
-- init();
-+ init();
-
- /* Set defaults and initialize variables */
- set_defaults();
-@@ -737,7 +737,7 @@ void test_start(void)
- /* Do the same test for each CPU */
- if (++cpu_sel >= act_cpus)
- {
-- cpu_sel = 0;
-+ cpu_sel = 0;
- next_test();
- } else {
- continue;
diff --git a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch b/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
deleted file mode 100644
index d91d8d72940..00000000000
--- a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-"Fix compilation of inline assembly with new gcc"
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- Makefile.orig
-+++ Makefile
-@@ -13,7 +13,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/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
deleted file mode 100644
index acd46c0a464..00000000000
--- a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig 2019-03-29 16:41:29.629879497 +0100
-+++ Makefile 2019-03-29 16:41:55.351031244 +0100
-@@ -53,7 +53,7 @@
- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-
- test.o: test.c
-- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+ $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector test.c
-
- random.o: random.c
- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index c4850769d62..9d5a8d969d7 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,14 +1,14 @@
# Template file for 'memtest86+'
pkgname=memtest86+
-version=5.01
-revision=5
-archs="i686 x86_64"
+version=5.31b
+revision=1
+archs="i686* x86_64"*
short_desc="Advanced Memory Diagnostic Tool"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.memtest.org"
distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
+checksum=7146ffb182c0eb324e216ec5db284ef4bd8296122cf45e1695eabd8320cb1f09
nostrip=yes
noverifyrdeps=yes
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [WIP] memtest86+: update to 5.31b
2020-04-20 9:54 [PR PATCH] [WIP] memtest86+: update to 5.31b yopito
@ 2021-01-29 1:05 ` ericonr
2021-01-29 20:57 ` yopito
2021-01-29 20:57 ` [PR PATCH] [Closed]: " yopito
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-01-29 1:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/21179#issuecomment-769502071
Comment:
@yopito ping?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [WIP] memtest86+: update to 5.31b
2020-04-20 9:54 [PR PATCH] [WIP] memtest86+: update to 5.31b yopito
2021-01-29 1:05 ` ericonr
@ 2021-01-29 20:57 ` yopito
2021-01-29 20:57 ` [PR PATCH] [Closed]: " yopito
2 siblings, 0 replies; 4+ messages in thread
From: yopito @ 2021-01-29 20:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/21179#issuecomment-770045985
Comment:
still not ready for merge.
IMHO this is a beta release and no changes since 2020-04 (see http://www.memtest.org/#change).
So let's close this PR, will see later.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: [WIP] memtest86+: update to 5.31b
2020-04-20 9:54 [PR PATCH] [WIP] memtest86+: update to 5.31b yopito
2021-01-29 1:05 ` ericonr
2021-01-29 20:57 ` yopito
@ 2021-01-29 20:57 ` yopito
2 siblings, 0 replies; 4+ messages in thread
From: yopito @ 2021-01-29 20:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
There's a closed pull request on the void-packages repository
[WIP] memtest86+: update to 5.31b
https://github.com/void-linux/void-packages/pull/21179
Description:
* work in progress upstream, definitively not a stable release
* build fine from x86_64/musl
* run fine on my i5-5300U CPU @ 2.30GHz, 8GB RAM, both fail-safe and SMP modes
* glitches on % calculations (test #8 advancement, overall is 100% on hitting test 8/11)
* 32bit / glibc: pentium M 1.5 GHz: build and run fine, same glitches
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-29 20:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-20 9:54 [PR PATCH] [WIP] memtest86+: update to 5.31b yopito
2021-01-29 1:05 ` ericonr
2021-01-29 20:57 ` yopito
2021-01-29 20:57 ` [PR PATCH] [Closed]: " yopito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).