diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 027977d85..5ca57bbe1 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 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; push_master_to_github: diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a index 57e835461..5fc4a1e06 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32/libcore.a b/esp32/libcore.a index 8a5942d39..fd0d924a4 100644 Binary files a/esp32/libcore.a and b/esp32/libcore.a differ diff --git a/esp32/libespnow.a b/esp32/libespnow.a index 590d662ff..6157edf01 100644 Binary files a/esp32/libespnow.a and b/esp32/libespnow.a differ diff --git a/esp32/libmesh.a b/esp32/libmesh.a index d25cd1c2f..be78eb324 100644 Binary files a/esp32/libmesh.a and b/esp32/libmesh.a differ diff --git a/esp32/libnet80211.a b/esp32/libnet80211.a index b192ce326..389e8f205 100644 Binary files a/esp32/libnet80211.a and b/esp32/libnet80211.a differ diff --git a/esp32/libphy.a b/esp32/libphy.a index 5d862c5ed..423bc6c35 100644 Binary files a/esp32/libphy.a and b/esp32/libphy.a differ diff --git a/esp32/libpp.a b/esp32/libpp.a index 63d05c05f..ca24f7170 100644 Binary files a/esp32/libpp.a and b/esp32/libpp.a differ diff --git a/esp32/librtc.a b/esp32/librtc.a index f571485b8..b39d0b339 100644 Binary files a/esp32/librtc.a and b/esp32/librtc.a differ diff --git a/esp32/libsmartconfig.a b/esp32/libsmartconfig.a index 28422bb4f..a845e40ec 100644 Binary files a/esp32/libsmartconfig.a and b/esp32/libsmartconfig.a differ diff --git a/esp32s2beta/libcoexist.a b/esp32s2/libcoexist.a old mode 100644 new mode 100755 similarity index 71% rename from esp32s2beta/libcoexist.a rename to esp32s2/libcoexist.a index d82ebc0c2..a5510a983 Binary files a/esp32s2beta/libcoexist.a and b/esp32s2/libcoexist.a differ diff --git a/esp32s2/libcore.a b/esp32s2/libcore.a new file mode 100755 index 000000000..ba83dbf7f Binary files /dev/null and b/esp32s2/libcore.a differ diff --git a/esp32s2beta/libespnow.a b/esp32s2/libespnow.a old mode 100644 new mode 100755 similarity index 99% rename from esp32s2beta/libespnow.a rename to esp32s2/libespnow.a index 78c966899..b1976742d Binary files a/esp32s2beta/libespnow.a and b/esp32s2/libespnow.a differ diff --git a/esp32s2beta/libmesh.a b/esp32s2/libmesh.a old mode 100644 new mode 100755 similarity index 99% rename from esp32s2beta/libmesh.a rename to esp32s2/libmesh.a index bb9e34038..62f90a9f7 Binary files a/esp32s2beta/libmesh.a and b/esp32s2/libmesh.a differ diff --git a/esp32s2beta/libnet80211.a b/esp32s2/libnet80211.a old mode 100644 new mode 100755 similarity index 82% rename from esp32s2beta/libnet80211.a rename to esp32s2/libnet80211.a index 8c8418d65..0bea49aae Binary files a/esp32s2beta/libnet80211.a and b/esp32s2/libnet80211.a differ diff --git a/esp32s2beta/libphy.a b/esp32s2/libphy.a similarity index 99% rename from esp32s2beta/libphy.a rename to esp32s2/libphy.a index b15eb1dc3..a51018568 100755 Binary files a/esp32s2beta/libphy.a and b/esp32s2/libphy.a differ diff --git a/esp32s2beta/libpp.a b/esp32s2/libpp.a old mode 100644 new mode 100755 similarity index 81% rename from esp32s2beta/libpp.a rename to esp32s2/libpp.a index 6d58abbca..52a218496 Binary files a/esp32s2beta/libpp.a and b/esp32s2/libpp.a differ diff --git a/esp32s2beta/librtc.a b/esp32s2/librtc.a similarity index 99% rename from esp32s2beta/librtc.a rename to esp32s2/librtc.a index f571485b8..b39d0b339 100644 Binary files a/esp32s2beta/librtc.a and b/esp32s2/librtc.a differ diff --git a/esp32s2beta/libsmartconfig.a b/esp32s2/libsmartconfig.a old mode 100644 new mode 100755 similarity index 84% rename from esp32s2beta/libsmartconfig.a rename to esp32s2/libsmartconfig.a index 60cf531c7..ab557e6bd Binary files a/esp32s2beta/libsmartconfig.a and b/esp32s2/libsmartconfig.a differ diff --git a/esp32s2beta/libcore.a b/esp32s2beta/libcore.a deleted file mode 100644 index 626612ddc..000000000 Binary files a/esp32s2beta/libcore.a and /dev/null differ diff --git a/fix_printf.sh b/fix_printf.sh index 39754abc6..a7b46e41d 100755 --- a/fix_printf.sh +++ b/fix_printf.sh @@ -1,46 +1,46 @@ #!/bin/bash -for dir in esp32 esp32s2beta; do +for dir in esp32 esp32s2; do if [ -d "$dir" ]; then cd $dir - git status libphy.a | grep modified >/dev/null 2>&1 + git status libphy.a | grep "[modified renamed]" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/libphy.a fixed xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy.a fi - git status librtc.a | grep modified >/dev/null 2>&1 + git status librtc.a | grep "[modified renamed]" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/librtc.a fixed xtensa-esp32-elf-objcopy --redefine-sym ets_printf=rtc_printf librtc.a fi - git status libsmartconfig.a | grep modified >/dev/null 2>&1 + git status libsmartconfig.a | grep "[modified renamed]" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/libsmartconfig.a fixed xtensa-esp32-elf-objcopy --redefine-sym printf=sc_printf libsmartconfig.a fi - git status libpp.a | grep modified >/dev/null 2>&1 + git status libpp.a | grep "[modified renamed]" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/libpp.a fixed xtensa-esp32-elf-objcopy --redefine-sym printf=pp_printf libpp.a fi - git status libnet80211.a | grep modified >/dev/null 2>&1 + git status libnet80211.a | grep "[modified renamed]" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/libnet80211.a fixed xtensa-esp32-elf-objcopy --redefine-sym printf=net80211_printf libnet80211.a fi - git status libcore.a | grep modified >/dev/null 2>&1 + git status libcore.a | grep "[modified renamed]" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/libcore.a fixed xtensa-esp32-elf-objcopy --redefine-sym printf=core_printf libcore.a xtensa-esp32-elf-objcopy --redefine-sym ets_printf=core_printf libcore.a fi - git status libcoexist.a | grep modified >/dev/null 2>&1 + git status libcoexist.a | grep "[modified renamed]" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/libcoexist.a fixed xtensa-esp32-elf-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a