head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.58 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.56 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.54 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.52 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.50 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.48 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.46 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.44 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.42 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.40 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.38 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.36 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.34 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.32 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.30 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.28 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.26 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.24 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.22 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.20 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.18 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.16 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.14 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.12 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.8 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.10 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.6 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.4 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.2 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.7.0.8 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.6 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.4 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.2 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.6.0.26 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.24 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.20 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.18 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.16 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.14 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.12 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.10 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.8 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.6 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.4 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.2 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.5.0.10 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.8 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.6 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.4 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.2 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.4.0.32 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.30 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.28 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.26 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.24 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.22 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.20 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.18 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.16 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.14 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.12 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.10 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.8 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.6 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.4 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.3.0.8 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.6 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.4 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.2.0.18 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.16 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.14 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.12 pkgsrc-2008Q1:1.2.0.10 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.8 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.8 date 2019.02.09.09.13.24; author maya; state Exp; branches; next 1.7; commitid quKqsNsBhnTCw4bB; 1.7 date 2018.01.29.14.23.26; author maya; state Exp; branches; next 1.6; commitid 0DKm4l2FaJZBkMoA; 1.6 date 2015.03.21.02.18.39; author tnn; state Exp; branches 1.6.26.1; next 1.5; commitid LWQbKf6d38DwUpey; 1.5 date 2013.12.08.00.35.28; author jakllsch; state Exp; branches; next 1.4; commitid v90ZiqtTn54unggx; 1.4 date 2009.11.24.17.20.40; author jakllsch; state Exp; branches; next 1.3; 1.3 date 2008.11.24.04.06.00; author smb; state Exp; branches; next 1.2; 1.2 date 2007.01.06.22.26.55; author smb; state Exp; branches; next 1.1; 1.1 date 2006.10.24.18.00.06; author smb; state Exp; branches; next ; 1.6.26.1 date 2018.02.08.22.00.59; author spz; state Exp; branches; next ; commitid c7dKOpvHpblVx6qA; desc @@ 1.8 log @memtestplus: make room for headers (Fixes linker issue, ld: memtest_shared: not enough room for program headers) Don't create multiple definitions. Remove workarounds for old GCC/NetBSD. boots in QEMU, but reboots (crashes) very quickly. Bump PKGREVISION @ text @$NetBSD: patch-aa,v 1.7 2018/01/29 14:23:26 maya Exp $ --- Makefile.orig 2013-08-10 02:01:58.000000000 +0000 +++ Makefile @@@@ -7,12 +7,12 @@@@ # # Path for the floppy disk device # -FDISK=/dev/fd0 +FDISK=/dev/fd0a 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 \ @@@@ -20,8 +20,7 @@@@ OBJS= head.o reloc.o main.o test.o init. smp.o vmem.o random.o -all: clean memtest.bin memtest - scp memtest.bin root@@192.168.0.12:/srv/tftp/mt86plus +all: memtest.bin memtest # Link it statically once so I know I don't have undefined # symbols and then link it dynamically so I have full @@@@ -34,8 +33,11 @@@@ memtest_shared: $(OBJS) memtest_shared.l memtest_shared.bin: memtest_shared objcopy -O binary $< memtest_shared.bin -memtest: memtest_shared.bin memtest.lds - $(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@@ +nbstart.s: nbstart.S config.h defs.h + $(CC) -E -traditional $< -o $@@ + +memtest: memtest_shared.bin memtest.lds nbstart.o + $(LD) -T memtest.lds -z max-page-size=0x1000 nbstart.o -b binary memtest_shared.bin -o $@@ head.s: head.S config.h defs.h test.h $(CC) -E -traditional $< -o $@@ @ 1.7 log @memtestplus: revert previous, disable optimization. Hack to fix PR pkg/52962. Now memtestplus functions correctly for sure. Inspired by opensuse package. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2015/03/21 02:18:39 tnn Exp $ d20 1 a20 1 @@@@ -20,22 +20,24 @@@@ OBJS= head.o reloc.o main.o test.o init. d30 1 a30 8 # relocation information memtest_shared: $(OBJS) memtest_shared.lds Makefile - $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \ + $(LD) --allow-multiple-definition --warn-constructors --warn-common -static -T memtest_shared.lds \ -o $@@ $(OBJS) && \ - $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@@ $(OBJS) + $(LD) --allow-multiple-definition -shared -Bsymbolic -T memtest_shared.lds -o $@@ $(OBJS) @ 1.6 log @fix build with clang ... but mark the package as BROKEN because even though it builds now, the resulting binary does not boot in qemu. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -7,7 +7,7 @@@@ d14 6 @ 1.6.26.1 log @Pullup ticket #5698 - requested by maya sysutils/memtestplus: build fix Revisions pulled up: - sysutils/memtestplus/Makefile 1.25,1.23 - sysutils/memtestplus/distinfo 1.15,1.13 - sysutils/memtestplus/patches/patch-aa 1.7 - sysutils/memtestplus/patches/patch-controller.c 1.1 - sysutils/memtestplus/patches/patch-main.c 1.3 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: maya Date: Mon Jan 29 14:23:26 UTC 2018 Modified Files: pkgsrc/sysutils/memtestplus: Makefile distinfo pkgsrc/sysutils/memtestplus/patches: patch-aa patch-main.c Log Message: memtestplus: revert previous, disable optimization. Hack to fix PR pkg/52962. Now memtestplus functions correctly for sure. Inspired by opensuse package. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/memtestplus/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/memtestplus/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/memtestplus/patches/patch-aa cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/memtestplus/patches/patch-main.c ------------------------------------------------------------------- Module Name: pkgsrc Committed By: maya Date: Mon Jan 29 11:52:11 UTC 2018 Modified Files: pkgsrc/sysutils/memtestplus: Makefile distinfo Added Files: pkgsrc/sysutils/memtestplus/patches: patch-controller.c Log Message: memtestplus: spell arraycount correctly and avoid UB. might help PR pkg/52962: memtestplus doesn't work if built with recent compilers. PKGREVISION++ To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/memtestplus/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/memtestplus/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/memtestplus/patches/patch-controller.c @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2015/03/21 02:18:39 tnn Exp $ d5 1 a5 1 @@@@ -7,12 +7,12 @@@@ a13 6 -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 \ @ 1.5 log @Update memtest86+ to 5.01. upstream changes: Enhancements in v5.01: New Features 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 Bug Fixes 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) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2009/11/24 17:20:40 jakllsch Exp $ d14 1 a14 1 @@@@ -20,8 +20,7 @@@@ OBJS= head.o reloc.o main.o test.o init. d24 8 a31 1 @@@@ -34,8 +33,11 @@@@ memtest_shared: $(OBJS) memtest_shared.l @ 1.4 log @Update memtestplus to 4.00. (With permission from smb@@.) Changes since 2.10: Enhancements in v4.00: * New Features - Major Architectural changes - First pass twice faster (reduced iterations) - Detect DDR2/3 brands and part numbers on Intel DDR2/3 chipsets - Added detection for Intel "Clarkdale" CPU - Added detection for Intel "Gulftown" CPU - Added detection for AMD "Magny-Cours" CPU - Added detection for Intel XMP Memory - Added for CPU w/ 0.5/1.5/3/6/12/16/18/24MB L3 - Added "clean" DMI detection for DDR3/FBDIMM2 - Better detection of Integrated Memory Controllers * Bug Fixes - Corrected detection for Intel "Lynnfield" CPU - Corrected detection for AMD 45nm K10 CPU - Solved crash with AMD Geode LX - Complies with SMBIOS 2.6.1 specs - Fixed compilation issues with gcc 4.2+ - Many others bug fixes Memtest86+ "3.00" was skipped and renamed 4.00 in order to avoid confusion with the original Memtest. Enhancements in v2.11 : - Added support for Intel Core i5 (Lynnfield) CPU - Added support for Intel P55 Southbridge - Added support for Intel PM45/GM45/GM47 Mobile chipset - Added support for Intel GL40/GS45 Mobile chipset - Corrected DDR2/DDR3 detection on Intel x35/x45 - Corrected detection on some Core i7 CPU - Fixed a bug with some AMI BIOS (freeze at startup) - Various bug fixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2008/11/24 04:06:00 smb Exp $ d3 1 a3 1 --- Makefile.orig 2009-09-22 00:35:46.000000000 +0000 d5 1 a5 1 @@@@ -6,7 +6,7 @@@@ d14 3 a16 5 @@@@ -61,7 +61,6 @@@@ asm: iso: make all ./makeiso.sh - rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin d18 20 a37 2 install: all dd $(FDISK) bs=8192 @ 1.3 log @Upgrade to 2.10: *** Enhancements in v2.10 : *** * New Features o Added support for Intel Core i7 (Nehalem) CPU o Added support for Intel Atom Processors o Added support for Intel G41/G43/G45 Chipsets o Added support for Intel P43/P45 Chipsets o Added support for Intel US15W (Poulsbo) Chipset o Added support for Intel EP80579 (Tolapai) SoC CPU o Added support for ICH10 Southbridge (SPD/DMI) o Added detection for Intel 5000X o Now fully aware of CPU w/ L3 cache (Core i7 & K10) * Bug Fixes o Added workaround for DDR3 DMI detection o Fixed Intel 5000Z chipset detection o Fixed Memory Frequency on AMD K10 o Fixed cache detection on C7/Isaiah CPU o Fix Memtest86+ not recognized as Linux Kernel Enhancements in v2.01 : * Added support for i945GM/PM/GME & i946PL/GZ * Added support for iGM965/iGL960/iPM965/iGME965/iGLE960 * Added detection for SiS 649/656/671/672 * Added detection for i430MX/i430TX * Added an optional beep mode (pass completed w/o error) * Pass duration 20% reduced * Removed the blinking cursor * Reverted Test #0 to cached * Solved a major bug in Memory Address Errors Reporting * Patched for Intel-Powered Mac * Corrected Intel 3-Series (P35/X38) chipset init * Corrected a bug with SPD Display and ESB6300 * Correct a detection bug on P965/G965 C-Stepping * Solved a incoherency with pass progress indicator * Patched Makefile to compile on x86_64 * Bootable Memtest86+ ISO more compatible Enhancements in v2.00 : * Major Architectures changes * Modulo test now use random pattern for better accuracy * Added Advanced DMI Errors Reporting Mode * Added support for bus ratio changes on Intel Core CPU * Added support for non-integer bus ratio on latest Intel CPU * Added SPD Data Display for all Intel Chipsets (more to come) * Added serial support as a linux boot parameter (Thanks to Michal S.) * Added preliminary support for VIA CN Isaiah CPU * Added preliminary support for Intel Nehalem * Added support for VIA C7/C7-D/C7-M/Eden on Esther Core * Added support for AMD K10 (Phenom) CPU w/ timings detection * Added support for Intel Pentium E w/ 1 MB L2 Cache * Added support for Intel Core 2 45nm (Penryn) * Added support for FSB1333/FSB1600 Intel CPU * Added support for Intel 5400A/5400B w/ timings detection * Added support for Intel Q35/P35/G33/Q33 w/ timings detection * Added support for Intel X38/X48 w/ timings detection * Added preliminary support for Intel 5000P/V/Z * Removed on-fly memory timings change (unstable) * Numerous (really) bug fixes @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Makefile.orig 2008-10-24 22:43:43.000000000 -0400 +++ Makefile 2008-11-23 21:31:38.000000000 -0500 d14 1 a14 1 @@@@ -58,7 +58,6 @@@@ @ 1.2 log @Several fixes: a) 'make install' was broken if option memtestplus-iso was specified b) patch-ac wouldn't pass pkglint c) correct document for the BadRAM link d) add compilation support for 64-bit i386 ports @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2006/10/24 18:00:06 smb Exp $ d3 2 a4 2 --- Makefile.orig 2005-09-11 14:17:15.000000000 -0400 +++ Makefile 2006-10-21 15:38:58.000000000 -0400 d12 1 d14 5 a18 2 # @@@@ -119,3 +119,8 @@@@ d20 2 a21 7 install-bin: dd $(FDISK) bs=8192 + +iso: memtest.iso + +memtest.iso: memtest.bin memtest + ./makeiso.sh @ 1.1 log @Add memtest+ 1.65 to pkgsrc, with options for serial console and .iso generation @ text @d1 1 a1 1 $NetBSD$ d21 1 a21 1 +memtest.iso: memtest.bin @