diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2274d683f..de421faba 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,10 @@ check_lib_reversion: stage: check only: changes: - - esp32/lib{coexist,core,espnow,net80211,pp,smartconfig}.a - - esp32s2/lib{coexist,core,espnow,net80211,pp,smartconfig}.a + - esp32/lib{coexist,core,espnow,net80211,pp,smartconfig,mesh,wapi}.a + - esp32s2/lib{coexist,core,espnow,net80211,pp,smartconfig,mesh,wapi}.a + - esp32s3/lib{coexist,core,espnow,net80211,pp,smartconfig,mesh,wapi}.a + - esp32c3/lib{coexist,core,espnow,net80211,pp,smartconfig,mesh,wapi}.a except: - master - /^release\/v/ @@ -34,20 +36,21 @@ check_lib_reversion: - GIT_COMMIT_ID=`git log --pretty="%s" -1 | grep -o '([0-9a-f]*)' | tail -1 | cut -c 2-8` - echo "GIT_COMMIT_ID is "$GIT_COMMIT_ID - test $(echo -n $GIT_COMMIT_ID | wc -c) -eq 7 - - for dir in esp32 esp32s2; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; - - for dir in esp32 esp32s2; do grep $GIT_COMMIT_ID $dir/libcore.a; done; - - for dir in esp32 esp32s2; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; - - for dir in esp32 esp32s2; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; - - for dir in esp32 esp32s2; do grep $GIT_COMMIT_ID $dir/libnet80211.a; done; - - for dir in esp32 esp32s2; do grep $GIT_COMMIT_ID $dir/libpp.a; done; - - for dir in esp32 esp32s2; do grep $GIT_COMMIT_ID $dir/libsmartconfig.a; done; - - for dir in esp32 esp32s2; do grep $GIT_COMMIT_ID-remote $dir/libnet80211.a; done; - - for dir in esp32 esp32s2; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; - - for dir in esp32 esp32s2; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - - for dir in esp32 esp32s2; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; - - for dir in esp32 esp32s2; do if [ -e $dir/libwps.a ]; then exit 1; fi; done; - - for dir in esp32 esp32s2; do if [ -e $dir/libwpa.a ]; then exit 1; fi; done; - - for dir in esp32 esp32s2; do if [ -e $dir/libwpa2.a ]; then exit 1; fi; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libcore.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libmesh.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libnet80211.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libpp.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libsmartconfig.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID $dir/libwapi.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do grep $GIT_COMMIT_ID-remote $dir/libnet80211.a; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; + - for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; + - for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do if [ -e $dir/libwps.a ]; then exit 1; fi; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do if [ -e $dir/libwpa.a ]; then exit 1; fi; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3; do if [ -e $dir/libwpa2.a ]; then exit 1; fi; done; push_master_to_github: stage: deploy diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a index ef81a58fc..c17e1b069 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32/libcore.a b/esp32/libcore.a index c5765e779..29c86c511 100644 Binary files a/esp32/libcore.a and b/esp32/libcore.a differ diff --git a/esp32/libespnow.a b/esp32/libespnow.a index 24fa45c23..b4968b582 100644 Binary files a/esp32/libespnow.a and b/esp32/libespnow.a differ diff --git a/esp32/libmesh.a b/esp32/libmesh.a index aa6fa353e..c3f61badd 100644 Binary files a/esp32/libmesh.a and b/esp32/libmesh.a differ diff --git a/esp32/libnet80211.a b/esp32/libnet80211.a index 8d30b5079..36bee50a5 100644 Binary files a/esp32/libnet80211.a and b/esp32/libnet80211.a differ diff --git a/esp32/libpp.a b/esp32/libpp.a index c71dac29a..c9d02e9c6 100644 Binary files a/esp32/libpp.a and b/esp32/libpp.a differ diff --git a/esp32/libsmartconfig.a b/esp32/libsmartconfig.a index cfa7220bc..ed9bbbbda 100644 Binary files a/esp32/libsmartconfig.a and b/esp32/libsmartconfig.a differ diff --git a/esp32/libwapi.a b/esp32/libwapi.a index 219ce099c..f23764756 100644 Binary files a/esp32/libwapi.a and b/esp32/libwapi.a differ diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a index 9c32996df..179fd5d62 100644 Binary files a/esp32c3/libcoexist.a and b/esp32c3/libcoexist.a differ diff --git a/esp32c3/libcore.a b/esp32c3/libcore.a index 6ad3ae244..dc0a64514 100644 Binary files a/esp32c3/libcore.a and b/esp32c3/libcore.a differ diff --git a/esp32c3/libespnow.a b/esp32c3/libespnow.a index 8ce5bad55..dce976087 100644 Binary files a/esp32c3/libespnow.a and b/esp32c3/libespnow.a differ diff --git a/esp32c3/libmesh.a b/esp32c3/libmesh.a index d399b45fa..c9ec312cf 100644 Binary files a/esp32c3/libmesh.a and b/esp32c3/libmesh.a differ diff --git a/esp32c3/libnet80211.a b/esp32c3/libnet80211.a index fb7249170..fb8c00d63 100644 Binary files a/esp32c3/libnet80211.a and b/esp32c3/libnet80211.a differ diff --git a/esp32c3/libpp.a b/esp32c3/libpp.a index 595bcdbf2..7a51c1437 100644 Binary files a/esp32c3/libpp.a and b/esp32c3/libpp.a differ diff --git a/esp32c3/libsmartconfig.a b/esp32c3/libsmartconfig.a index 727d1fc49..ca8493182 100644 Binary files a/esp32c3/libsmartconfig.a and b/esp32c3/libsmartconfig.a differ diff --git a/esp32c3/libwapi.a b/esp32c3/libwapi.a index 0d4de5df3..bd8afa781 100644 Binary files a/esp32c3/libwapi.a and b/esp32c3/libwapi.a differ diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a index beadb30d0..75c20580e 100644 Binary files a/esp32s2/libcoexist.a and b/esp32s2/libcoexist.a differ diff --git a/esp32s2/libcore.a b/esp32s2/libcore.a index 4f01b632c..6b286fa98 100644 Binary files a/esp32s2/libcore.a and b/esp32s2/libcore.a differ diff --git a/esp32s2/libespnow.a b/esp32s2/libespnow.a index e9efa28f2..30ad2dfbd 100644 Binary files a/esp32s2/libespnow.a and b/esp32s2/libespnow.a differ diff --git a/esp32s2/libmesh.a b/esp32s2/libmesh.a index 7b9a760e5..ebf95dfee 100644 Binary files a/esp32s2/libmesh.a and b/esp32s2/libmesh.a differ diff --git a/esp32s2/libnet80211.a b/esp32s2/libnet80211.a index 9920c373b..344a4eb00 100644 Binary files a/esp32s2/libnet80211.a and b/esp32s2/libnet80211.a differ diff --git a/esp32s2/libpp.a b/esp32s2/libpp.a index 243c40847..50aaea16e 100644 Binary files a/esp32s2/libpp.a and b/esp32s2/libpp.a differ diff --git a/esp32s2/libsmartconfig.a b/esp32s2/libsmartconfig.a index 68eb208c5..f71863870 100644 Binary files a/esp32s2/libsmartconfig.a and b/esp32s2/libsmartconfig.a differ diff --git a/esp32s2/libwapi.a b/esp32s2/libwapi.a index 80b11b4c5..be6cfffdd 100644 Binary files a/esp32s2/libwapi.a and b/esp32s2/libwapi.a differ diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a index c09aca2c3..5cdeb86b5 100644 Binary files a/esp32s3/libcoexist.a and b/esp32s3/libcoexist.a differ diff --git a/esp32s3/libcore.a b/esp32s3/libcore.a index ad9c71d6f..b258b4442 100644 Binary files a/esp32s3/libcore.a and b/esp32s3/libcore.a differ diff --git a/esp32s3/libespnow.a b/esp32s3/libespnow.a index 7dda17695..1afe9a00d 100644 Binary files a/esp32s3/libespnow.a and b/esp32s3/libespnow.a differ diff --git a/esp32s3/libmesh.a b/esp32s3/libmesh.a index adb9f3056..e06bc25db 100644 Binary files a/esp32s3/libmesh.a and b/esp32s3/libmesh.a differ diff --git a/esp32s3/libnet80211.a b/esp32s3/libnet80211.a index ddcbc5168..1d214c57f 100644 Binary files a/esp32s3/libnet80211.a and b/esp32s3/libnet80211.a differ diff --git a/esp32s3/libpp.a b/esp32s3/libpp.a index 3ddb2154e..c618b267e 100644 Binary files a/esp32s3/libpp.a and b/esp32s3/libpp.a differ diff --git a/esp32s3/libsmartconfig.a b/esp32s3/libsmartconfig.a index 10b53eaef..e54bdb8ce 100644 Binary files a/esp32s3/libsmartconfig.a and b/esp32s3/libsmartconfig.a differ diff --git a/esp32s3/libwapi.a b/esp32s3/libwapi.a index 1eaf24007..a6c6139c0 100644 Binary files a/esp32s3/libwapi.a and b/esp32s3/libwapi.a differ diff --git a/fix_printf.sh b/fix_printf.sh index d219d27a2..5e6d97cc4 100755 --- a/fix_printf.sh +++ b/fix_printf.sh @@ -66,12 +66,20 @@ for dir in esp32 esp32s2 esp32c3 esp32s3; do $TOOLCHAIN-objcopy --redefine-sym printf=coexist_printf libcoexist.a fi + git status libespnow.a | grep "modified" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo $dir/libespnow.a fixed + $TOOLCHAIN-objcopy --redefine-sym ets_printf=espnow_printf libespnow.a + $TOOLCHAIN-objcopy --redefine-sym printf=espnow_printf libespnow.a + fi + git status libwapi.a | grep "modified" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/libwapi.a fixed $TOOLCHAIN-objcopy --redefine-sym ets_printf=wapi_printf libwapi.a $TOOLCHAIN-objcopy --redefine-sym printf=wapi_printf libwapi.a fi + cd .. else echo "$dir does not exist"