wifi: Change esp32s2beta dir to esp32s2 (5813c5b6)

.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:

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