diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 027977d85..8e3f7b095 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,20 +12,20 @@ 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 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; - - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libcore.a; done; - - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; - - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; - - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libnet80211.a; done; - - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libpp.a; done; - - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libsmartconfig.a; done; - - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID-remote $dir/libnet80211.a; done; - - for dir in esp32 esp32s2beta; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; - - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; - - for dir in esp32 esp32s2beta; do if [ -e $dir/libwps.a ]; then exit 1; fi; done; - - for dir in esp32 esp32s2beta; do if [ -e $dir/libwpa.a ]; then exit 1; fi; done; - - for dir in esp32 esp32s2beta; do if [ -e $dir/libwpa2.a ]; then exit 1; fi; done; + - for dir in esp32; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; + - for dir in esp32; do grep $GIT_COMMIT_ID $dir/libcore.a; done; + - for dir in esp32; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; + - for dir in esp32; do grep $GIT_COMMIT_ID $dir/libespnow.a; done; + - for dir in esp32; do grep $GIT_COMMIT_ID $dir/libnet80211.a; done; + - for dir in esp32; do grep $GIT_COMMIT_ID $dir/libpp.a; done; + - for dir in esp32; do grep $GIT_COMMIT_ID $dir/libsmartconfig.a; done; + - for dir in esp32; do grep $GIT_COMMIT_ID-remote $dir/libnet80211.a; done; + - for dir in esp32; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done; + - for dir in esp32; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; + - for dir in esp32; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; + - for dir in esp32; do if [ -e $dir/libwps.a ]; then exit 1; fi; done; + - for dir in esp32; do if [ -e $dir/libwpa.a ]; then exit 1; fi; done; + - for dir in esp32; do if [ -e $dir/libwpa2.a ]; then exit 1; fi; done; push_master_to_github: diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a index b6386158a..b4b922741 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32/libcore.a b/esp32/libcore.a index 0bdf6b85c..e4de9509e 100644 Binary files a/esp32/libcore.a and b/esp32/libcore.a differ diff --git a/esp32/libespnow.a b/esp32/libespnow.a index c66a66573..6b9a5bd19 100644 Binary files a/esp32/libespnow.a and b/esp32/libespnow.a differ diff --git a/esp32/libmesh.a b/esp32/libmesh.a index e67a01d4e..edde650c4 100644 Binary files a/esp32/libmesh.a and b/esp32/libmesh.a differ diff --git a/esp32/libnet80211.a b/esp32/libnet80211.a index 2d280ed10..bae344063 100644 Binary files a/esp32/libnet80211.a and b/esp32/libnet80211.a differ diff --git a/esp32/libpp.a b/esp32/libpp.a index ea621ed53..c67c690c6 100644 Binary files a/esp32/libpp.a and b/esp32/libpp.a differ diff --git a/esp32/libsmartconfig.a b/esp32/libsmartconfig.a index 70e1eb3c6..6c29ec8d6 100644 Binary files a/esp32/libsmartconfig.a and b/esp32/libsmartconfig.a differ diff --git a/esp32s2beta/libcoexist.a b/esp32s2beta/libcoexist.a deleted file mode 100644 index 70396f212..000000000 Binary files a/esp32s2beta/libcoexist.a and /dev/null differ diff --git a/esp32s2beta/libcore.a b/esp32s2beta/libcore.a deleted file mode 100644 index 50767eb0a..000000000 Binary files a/esp32s2beta/libcore.a and /dev/null differ diff --git a/esp32s2beta/libespnow.a b/esp32s2beta/libespnow.a deleted file mode 100644 index b2b5dd68f..000000000 Binary files a/esp32s2beta/libespnow.a and /dev/null differ diff --git a/esp32s2beta/libmesh.a b/esp32s2beta/libmesh.a deleted file mode 100644 index cd565cdf0..000000000 Binary files a/esp32s2beta/libmesh.a and /dev/null differ diff --git a/esp32s2beta/libnet80211.a b/esp32s2beta/libnet80211.a deleted file mode 100644 index b8f4ff13d..000000000 Binary files a/esp32s2beta/libnet80211.a and /dev/null differ diff --git a/esp32s2beta/libphyA.a b/esp32s2beta/libphyA.a deleted file mode 100755 index 77e7d1943..000000000 Binary files a/esp32s2beta/libphyA.a and /dev/null differ diff --git a/esp32s2beta/libphyB.a b/esp32s2beta/libphyB.a deleted file mode 100755 index 698411722..000000000 Binary files a/esp32s2beta/libphyB.a and /dev/null differ diff --git a/esp32s2beta/libphy_marlin3.a b/esp32s2beta/libphy_marlin3.a deleted file mode 100755 index e46b193f6..000000000 Binary files a/esp32s2beta/libphy_marlin3.a and /dev/null differ diff --git a/esp32s2beta/libpp.a b/esp32s2beta/libpp.a deleted file mode 100644 index 9bf29f2ad..000000000 Binary files a/esp32s2beta/libpp.a and /dev/null differ diff --git a/esp32s2beta/librtc.a b/esp32s2beta/librtc.a deleted file mode 100644 index f571485b8..000000000 Binary files a/esp32s2beta/librtc.a and /dev/null differ diff --git a/esp32s2beta/libsmartconfig.a b/esp32s2beta/libsmartconfig.a deleted file mode 100644 index 97a1813fa..000000000 Binary files a/esp32s2beta/libsmartconfig.a and /dev/null differ diff --git a/fix_printf.sh b/fix_printf.sh index af72fb82c..b32f5d1db 100755 --- a/fix_printf.sh +++ b/fix_printf.sh @@ -1,5 +1,5 @@ #!/bin/bash -for dir in esp32 esp32s2beta; do +for dir in esp32; do if [ -d "$dir" ]; then cd $dir if [ $dir == esp32 ]; then @@ -8,24 +8,6 @@ for dir in esp32 esp32s2beta; do echo $dir/libphy.a fixed xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy.a fi - elif [ $dir == esp32s2beta ]; then - git status libphyA.a | grep modified >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo $dir/libphyA.a fixed - xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphyA.a - fi - - git status libphyB.a | grep modified >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo $dir/libphyB.a fixed - xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphyB.a - fi - - git status libphy_marlin3.a | grep modified >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo $dir/libphy_marlin3.a fixed - xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy_marlin3.a - fi fi git status librtc.a | grep modified >/dev/null 2>&1 if [ $? -eq 0 ]; then