rm esp32s2beta lib(61a08767)

.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; 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; 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; 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; 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; 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; 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; 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; 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; 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; 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; 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; 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; 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 if [ -e $dir/libwpa2.a ]; then exit 1; fi; done;
 
 
 push_master_to_github:

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