# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1679251886 0
# Node ID 1bbf846a10deb752d90f56c9342c6629e9fb6d3d
# Parent  694752fdbc0d3409ba67aba69ea2f0016b0df11b
memtest: update menu label

diff -r 694752fdbc0d -r 1bbf846a10de memtest/receipt
--- a/memtest/receipt	Wed Mar 15 16:15:09 2023 +0000
+++ b/memtest/receipt	Sun Mar 19 18:51:26 2023 +0000
@@ -74,7 +74,7 @@
 	objdump -t boot/startup.o | \
 	awk '/patch/ { print "sed -i \"s|" $5 "|0x" $1 "|\" ../boot/setup.S" }' | sh
 	make memtest.bin
-	tune_lzma memtest.bin 161,mf=bt2 LC 3 PB 2
+	tune_lzma memtest.bin 195,mf=bt2 LC 3 PB 2
 } 
 
 
@@ -90,9 +90,9 @@
 post_install()
 {
 	[ -s $1/boot/isolinux/isolinux.cfg ] &&
-	! grep -qs 'Check memory' $1/boot/isolinux/isolinux.cfg && sed -i \
+	! grep -qs 'Check 32 bits memory' $1/boot/isolinux/isolinux.cfg && sed -i \
 's|LABEL md5|LABEL memtest mem ram\
-	MENU LABEL Check memory\
+	MENU LABEL Check 32 bits memory\
 	KERNEL /boot/memtest.exe\
 \n&|' $1/boot/isolinux/isolinux.cfg
 	true
diff -r 694752fdbc0d -r 1bbf846a10de memtest/stuff/memtest86+-6-386.patch
--- a/memtest/stuff/memtest86+-6-386.patch	Wed Mar 15 16:15:09 2023 +0000
+++ b/memtest/stuff/memtest86+-6-386.patch	Sun Mar 19 18:51:26 2023 +0000
@@ -1,17 +1,6 @@
 --- system/cpuinfo.c
 +++ system/cpuinfo.c
-@@ -490,6 +490,10 @@
- 
- static void determine_cpu_model(void)
- {
-+    if (cpuid_info.version.family <= 4) {
-+        pause_at_start = false;
-+    }
-+
-     // If we can get a brand string use it, and we are done.
-     if (cpuid_info.max_xcpuid >= 0x80000004) {
-         cpu_model = cpuid_info.brand_id.str;
-@@ -848,6 +852,12 @@
+@@ -848,6 +848,12 @@
        default:
          // Unknown processor - make a guess at the family.
          switch (cpuid_info.version.family) {