From 8a94a37502e4fe127175830929d666cf66646b70 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sat, 27 Sep 2025 13:32:52 -0400 Subject: [PATCH] checkwps: Exclude targets that only exist as a bootloader from buildall Change-Id: I95cb65a204b4e509d48c9a8fb009d438f382a9f6 --- tools/checkwps/buildall.sh | 20 +++++++++++--------- tools/checkwps/parse_configure.awk | 7 ++++++- tools/configure | 8 ++++++-- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/tools/checkwps/buildall.sh b/tools/checkwps/buildall.sh index 086d81bf48..a897d4a608 100755 --- a/tools/checkwps/buildall.sh +++ b/tools/checkwps/buildall.sh @@ -43,15 +43,17 @@ fi echo > checkwps.failures awk -f $rootdir/parse_configure.awk $rootdir/../configure | ( - while read target model + while read target model blonly do - make -j $jobs clean - $toolsdir/configure --target=$model --type=C --ram=32 --lcdwidth=100 --lcdheight=100 # 32 should always give default RAM, assume 100x100 for RaaA for now - make -j $jobs - if [ -f checkwps.$model ] ; then - mv checkwps.$model $outdir - else - echo "checkwps.$model" >> checkwps.failures - fi + if [ "$blonly" == "no" ] ; then + make -j $jobs clean + $toolsdir/configure --target=$model --type=C --ram=32 --lcdwidth=100 --lcdheight=100 # 32 should always give default RAM, assume 100x100 for RaaA for now + make -j $jobs + if [ -f checkwps.$model ] ; then + mv checkwps.$model $outdir + else + echo "checkwps.$model" >> checkwps.failures + fi + fi done ) diff --git a/tools/checkwps/parse_configure.awk b/tools/checkwps/parse_configure.awk index 19dce810ab..ae4789ae9f 100644 --- a/tools/checkwps/parse_configure.awk +++ b/tools/checkwps/parse_configure.awk @@ -2,10 +2,15 @@ BEGIN { FS="[|)]" } /^[ \t]*([0-9]+)\|([^)]+)\)$/ { model=$2 + blonly="no" +} + +/^[ \t]*blonly="[^"]+"$/ { + blonly="yes" } /^[ \t]*target="[^"]+"$/ { match($0, "=\".+\"") target=substr($0, RSTART+2, RLENGTH-3) - print target, model + print target, model, blonly } diff --git a/tools/configure b/tools/configure index 7ce341c094..3571d80f82 100755 --- a/tools/configure +++ b/tools/configure @@ -2698,6 +2698,7 @@ fi 80|ipodnano3g) target_id=117 modelname="ipodnano3g" + blonly="yes" target="IPOD_NANO3G" memory=32 # always arm926ejscc @@ -2707,7 +2708,6 @@ fi output="rockbox.ipod" appextra="recorder:gui:radio" plugins="yes" - swcodec="yes" bootoutput="bootloader-$modelname.ipod" # toolset is the tools within the tools directory that we build for # this particular target. @@ -2721,6 +2721,7 @@ fi 81|ipodnano4g) target_id=118 modelname="ipodnano4g" + blonly="yes" target="IPOD_NANO4G" memory=32 # always arm1176jzscc @@ -2730,7 +2731,6 @@ fi output="rockbox.ipod" appextra="recorder:gui:radio" plugins="yes" - swcodec="yes" bootoutput="bootloader-$modelname.ipod" # toolset is the tools within the tools directory that we build for # this particular target. @@ -3015,6 +3015,7 @@ fi 110|meizum6sl) target_id=49 modelname="meizum6sl" + blonly="yes" target="MEIZU_M6SL" memory=16 # always arm940tbecc @@ -3036,6 +3037,7 @@ fi 111|meizum6sp) target_id=46 modelname="meizum6sp" + blonly="yes" target="MEIZU_M6SP" memory=16 # always arm940tbecc @@ -4285,6 +4287,7 @@ fi 248|erosqnative_v3) target_id=116 modelname="erosqnative_v3" + blonly="yes" target="EROS_QN" memory=32 mipsr2elcc @@ -4312,6 +4315,7 @@ fi 249|erosqnative_v4) target_id=116 modelname="erosqnative_v4" + blonly="yes" target="EROS_QN" memory=32 mipsr2elcc