diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6133cb42d..dae7be9ca 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,6 @@ 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 esp32s3 esp32c3 esp32c2 esp32c6; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6; do grep $GIT_COMMIT_ID $dir/libcore.a; done; - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c6; do grep $GIT_COMMIT_ID $dir/libmesh.a; done; diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a deleted file mode 100644 index 3a0b63a23..000000000 Binary files a/esp32/libcoexist.a and /dev/null differ diff --git a/esp32/libcore.a b/esp32/libcore.a index 14080f1b9..33a5c2207 100644 Binary files a/esp32/libcore.a and b/esp32/libcore.a differ diff --git a/esp32/libespnow.a b/esp32/libespnow.a index 80dae35cf..18ac63b5b 100644 Binary files a/esp32/libespnow.a and b/esp32/libespnow.a differ diff --git a/esp32/libmesh.a b/esp32/libmesh.a index f5ab25d2f..31e551b74 100644 Binary files a/esp32/libmesh.a and b/esp32/libmesh.a differ diff --git a/esp32/libnet80211.a b/esp32/libnet80211.a index 7da764322..5ed97cde0 100644 Binary files a/esp32/libnet80211.a and b/esp32/libnet80211.a differ diff --git a/esp32/libpp.a b/esp32/libpp.a index 7bf4d8134..abe226305 100644 Binary files a/esp32/libpp.a and b/esp32/libpp.a differ diff --git a/esp32/libsmartconfig.a b/esp32/libsmartconfig.a index 5ac600735..2681dd385 100644 Binary files a/esp32/libsmartconfig.a and b/esp32/libsmartconfig.a differ diff --git a/esp32/libwapi.a b/esp32/libwapi.a index 3fa3d8114..7d72eda41 100644 Binary files a/esp32/libwapi.a and b/esp32/libwapi.a differ diff --git a/esp32c2/libcoexist.a b/esp32c2/libcoexist.a deleted file mode 100644 index a1fe3f264..000000000 Binary files a/esp32c2/libcoexist.a and /dev/null differ diff --git a/esp32c2/libcore.a b/esp32c2/libcore.a index 58a1cb599..5ccf7c6ea 100644 Binary files a/esp32c2/libcore.a and b/esp32c2/libcore.a differ diff --git a/esp32c2/libespnow.a b/esp32c2/libespnow.a index 24aa66233..5e610fc85 100644 Binary files a/esp32c2/libespnow.a and b/esp32c2/libespnow.a differ diff --git a/esp32c2/libnet80211.a b/esp32c2/libnet80211.a index 0f81bf276..09e3bc84a 100644 Binary files a/esp32c2/libnet80211.a and b/esp32c2/libnet80211.a differ diff --git a/esp32c2/libpp.a b/esp32c2/libpp.a index 84a0303f4..beaa028f9 100644 Binary files a/esp32c2/libpp.a and b/esp32c2/libpp.a differ diff --git a/esp32c2/libsmartconfig.a b/esp32c2/libsmartconfig.a index 5e9535ed8..2dfcaaa49 100644 Binary files a/esp32c2/libsmartconfig.a and b/esp32c2/libsmartconfig.a differ diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a deleted file mode 100644 index 8f2054d7d..000000000 Binary files a/esp32c3/libcoexist.a and /dev/null differ diff --git a/esp32c3/libcore.a b/esp32c3/libcore.a index 869475064..62848fbde 100644 Binary files a/esp32c3/libcore.a and b/esp32c3/libcore.a differ diff --git a/esp32c3/libespnow.a b/esp32c3/libespnow.a index 33012efb0..9a383a62f 100644 Binary files a/esp32c3/libespnow.a and b/esp32c3/libespnow.a differ diff --git a/esp32c3/libmesh.a b/esp32c3/libmesh.a index 2bd10b074..ea00489dc 100644 Binary files a/esp32c3/libmesh.a and b/esp32c3/libmesh.a differ diff --git a/esp32c3/libnet80211.a b/esp32c3/libnet80211.a index d2e9c9089..4e997b90b 100644 Binary files a/esp32c3/libnet80211.a and b/esp32c3/libnet80211.a differ diff --git a/esp32c3/libpp.a b/esp32c3/libpp.a index d8032949f..5d9bc2e01 100644 Binary files a/esp32c3/libpp.a and b/esp32c3/libpp.a differ diff --git a/esp32c3/libsmartconfig.a b/esp32c3/libsmartconfig.a index 9d140c645..dd2f8a44b 100644 Binary files a/esp32c3/libsmartconfig.a and b/esp32c3/libsmartconfig.a differ diff --git a/esp32c3/libwapi.a b/esp32c3/libwapi.a index 0c8c27a61..8a0331d27 100644 Binary files a/esp32c3/libwapi.a and b/esp32c3/libwapi.a differ diff --git a/esp32c6/libcoexist.a b/esp32c6/libcoexist.a deleted file mode 100644 index b865ad197..000000000 Binary files a/esp32c6/libcoexist.a and /dev/null differ diff --git a/esp32c6/libcore.a b/esp32c6/libcore.a index 869475064..62848fbde 100644 Binary files a/esp32c6/libcore.a and b/esp32c6/libcore.a differ diff --git a/esp32c6/libespnow.a b/esp32c6/libespnow.a index 3d1916f7f..9821d84f7 100644 Binary files a/esp32c6/libespnow.a and b/esp32c6/libespnow.a differ diff --git a/esp32c6/libmesh.a b/esp32c6/libmesh.a index 768b48a96..58d4455a5 100644 Binary files a/esp32c6/libmesh.a and b/esp32c6/libmesh.a differ diff --git a/esp32c6/libnet80211.a b/esp32c6/libnet80211.a index e5dcb0b67..a65779a38 100644 Binary files a/esp32c6/libnet80211.a and b/esp32c6/libnet80211.a differ diff --git a/esp32c6/libpp.a b/esp32c6/libpp.a index 4baaf0ae3..0028ba5c8 100644 Binary files a/esp32c6/libpp.a and b/esp32c6/libpp.a differ diff --git a/esp32c6/libsmartconfig.a b/esp32c6/libsmartconfig.a index 8a246dbb6..6fe39c138 100644 Binary files a/esp32c6/libsmartconfig.a and b/esp32c6/libsmartconfig.a differ diff --git a/esp32c6/libwapi.a b/esp32c6/libwapi.a index 5df8cc4cc..9dc8e2009 100644 Binary files a/esp32c6/libwapi.a and b/esp32c6/libwapi.a differ diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a deleted file mode 100644 index 3a61eb90a..000000000 Binary files a/esp32s2/libcoexist.a and /dev/null differ diff --git a/esp32s2/libcore.a b/esp32s2/libcore.a index 6dfea734b..9f6c19927 100644 Binary files a/esp32s2/libcore.a and b/esp32s2/libcore.a differ diff --git a/esp32s2/libespnow.a b/esp32s2/libespnow.a index 3912d8dc3..1b1d44ebf 100644 Binary files a/esp32s2/libespnow.a and b/esp32s2/libespnow.a differ diff --git a/esp32s2/libmesh.a b/esp32s2/libmesh.a index f2d6279ce..4faae9491 100644 Binary files a/esp32s2/libmesh.a and b/esp32s2/libmesh.a differ diff --git a/esp32s2/libnet80211.a b/esp32s2/libnet80211.a index 702cd960c..3b98ebeb9 100644 Binary files a/esp32s2/libnet80211.a and b/esp32s2/libnet80211.a differ diff --git a/esp32s2/libpp.a b/esp32s2/libpp.a index dd2730171..88f9a26bc 100644 Binary files a/esp32s2/libpp.a and b/esp32s2/libpp.a differ diff --git a/esp32s2/libsmartconfig.a b/esp32s2/libsmartconfig.a index b7c82ddf2..1113ead3f 100644 Binary files a/esp32s2/libsmartconfig.a and b/esp32s2/libsmartconfig.a differ diff --git a/esp32s2/libwapi.a b/esp32s2/libwapi.a index dbf06f60a..c897c6754 100644 Binary files a/esp32s2/libwapi.a and b/esp32s2/libwapi.a differ diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a deleted file mode 100644 index b20019bc5..000000000 Binary files a/esp32s3/libcoexist.a and /dev/null differ diff --git a/esp32s3/libcore.a b/esp32s3/libcore.a index 74513a928..ec7635ed2 100644 Binary files a/esp32s3/libcore.a and b/esp32s3/libcore.a differ diff --git a/esp32s3/libespnow.a b/esp32s3/libespnow.a index 0ea2a0d50..544da7791 100644 Binary files a/esp32s3/libespnow.a and b/esp32s3/libespnow.a differ diff --git a/esp32s3/libmesh.a b/esp32s3/libmesh.a index 1becac394..c7733e30d 100644 Binary files a/esp32s3/libmesh.a and b/esp32s3/libmesh.a differ diff --git a/esp32s3/libnet80211.a b/esp32s3/libnet80211.a index bc135104d..2a576f4a2 100644 Binary files a/esp32s3/libnet80211.a and b/esp32s3/libnet80211.a differ diff --git a/esp32s3/libpp.a b/esp32s3/libpp.a index b1b413a50..5d05a7a5e 100644 Binary files a/esp32s3/libpp.a and b/esp32s3/libpp.a differ diff --git a/esp32s3/libsmartconfig.a b/esp32s3/libsmartconfig.a index dab9f7706..a26fcc0c7 100644 Binary files a/esp32s3/libsmartconfig.a and b/esp32s3/libsmartconfig.a differ diff --git a/esp32s3/libwapi.a b/esp32s3/libwapi.a index eca2e2fd3..0df61f197 100644 Binary files a/esp32s3/libwapi.a and b/esp32s3/libwapi.a differ diff --git a/fix_printf.sh b/fix_printf.sh index 41b86c9f5..3df1c4762 100755 --- a/fix_printf.sh +++ b/fix_printf.sh @@ -48,13 +48,6 @@ for dir in esp32 esp32s2 esp32c3 esp32s3 esp32c2 esp32c6; do $TOOLCHAIN-objcopy --redefine-sym ets_printf=core_printf libcore.a fi - git status libcoexist.a | grep "modified" >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo $dir/libcoexist.a fixed - $TOOLCHAIN-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a - $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