wok rev 25546

memtest: update menu label
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Mar 19 18:51:26 2023 +0000 (20 months ago)
parents 694752fdbc0d
children e4cc6a0d37f0
files memtest/receipt memtest/stuff/memtest86+-6-386.patch
line diff
     1.1 --- a/memtest/receipt	Wed Mar 15 16:15:09 2023 +0000
     1.2 +++ b/memtest/receipt	Sun Mar 19 18:51:26 2023 +0000
     1.3 @@ -74,7 +74,7 @@
     1.4  	objdump -t boot/startup.o | \
     1.5  	awk '/patch/ { print "sed -i \"s|" $5 "|0x" $1 "|\" ../boot/setup.S" }' | sh
     1.6  	make memtest.bin
     1.7 -	tune_lzma memtest.bin 161,mf=bt2 LC 3 PB 2
     1.8 +	tune_lzma memtest.bin 195,mf=bt2 LC 3 PB 2
     1.9  } 
    1.10  
    1.11  
    1.12 @@ -90,9 +90,9 @@
    1.13  post_install()
    1.14  {
    1.15  	[ -s $1/boot/isolinux/isolinux.cfg ] &&
    1.16 -	! grep -qs 'Check memory' $1/boot/isolinux/isolinux.cfg && sed -i \
    1.17 +	! grep -qs 'Check 32 bits memory' $1/boot/isolinux/isolinux.cfg && sed -i \
    1.18  's|LABEL md5|LABEL memtest mem ram\
    1.19 -	MENU LABEL Check memory\
    1.20 +	MENU LABEL Check 32 bits memory\
    1.21  	KERNEL /boot/memtest.exe\
    1.22  \n&|' $1/boot/isolinux/isolinux.cfg
    1.23  	true
     2.1 --- a/memtest/stuff/memtest86+-6-386.patch	Wed Mar 15 16:15:09 2023 +0000
     2.2 +++ b/memtest/stuff/memtest86+-6-386.patch	Sun Mar 19 18:51:26 2023 +0000
     2.3 @@ -1,17 +1,6 @@
     2.4  --- system/cpuinfo.c
     2.5  +++ system/cpuinfo.c
     2.6 -@@ -490,6 +490,10 @@
     2.7 - 
     2.8 - static void determine_cpu_model(void)
     2.9 - {
    2.10 -+    if (cpuid_info.version.family <= 4) {
    2.11 -+        pause_at_start = false;
    2.12 -+    }
    2.13 -+
    2.14 -     // If we can get a brand string use it, and we are done.
    2.15 -     if (cpuid_info.max_xcpuid >= 0x80000004) {
    2.16 -         cpu_model = cpuid_info.brand_id.str;
    2.17 -@@ -848,6 +852,12 @@
    2.18 +@@ -848,6 +848,12 @@
    2.19         default:
    2.20           // Unknown processor - make a guess at the family.
    2.21           switch (cpuid_info.version.family) {