update

.github/workflows/Openwrt-AutoBuild.yml

@@ -141,10 +141,10 @@ jobs:
           /bin/bash "devices/${{matrix.target}}/$DIY_SH"
         fi
         cp -Rf ./diy/* ./
-        cp -f devices/common/default-settings package/*/*/default-settings/files/uci.defaults
+        cp -f devices/common/default-settings package/*/*/my-default-settings/files/uci.defaults
         if [ -f "devices/${{matrix.target}}/default-settings" ]; then
-          echo >> package/*/*/default-settings/files/uci.defaults
-          cat devices/${{matrix.target}}/default-settings >> package/*/*/default-settings/files/uci.defaults
+          echo >> package/*/*/my-default-settings/files/uci.defaults
+          cat devices/${{matrix.target}}/default-settings >> package/*/*/my-default-settings/files/uci.defaults
         fi
         cp -f devices/common/$CONFIG_FILE .config
         if [ -f "devices/${{matrix.target}}/$CONFIG_FILE" ]; then
@@ -163,9 +163,9 @@ jobs:
     - name: Default PPPOE Setting
       if: env.PPPOE_USERNAME && env.PPPOE_PASSWD
       run: |
-        sed -i '$i uci set network.wan.username=${{ env.PPPOE_USERNAME }}' openwrt/package/*/*/default-settings/files/uci.defaults
-        sed -i '$i uci set network.wan.password=${{ env.PPPOE_PASSWD }}' openwrt/package/*/*/default-settings/files/uci.defaults
-        sed -i '$i uci commit network' openwrt/package/*/*/default-settings/files/uci.defaults
+        sed -i '$i uci set network.wan.username=${{ env.PPPOE_USERNAME }}' openwrt/package/*/*/my-default-settings/files/uci.defaults
+        sed -i '$i uci set network.wan.password=${{ env.PPPOE_PASSWD }}' openwrt/package/*/*/my-default-settings/files/uci.defaults
+        sed -i '$i uci commit network' openwrt/package/*/*/my-default-settings/files/uci.defaults
               
     - name: SSH connection to Actions
       uses: kiddin9/debugger-action@master

devices/Rpi-4B/.config

@@ -9,4 +9,4 @@ CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
 CONFIG_PACKAGE_luci-app-cpufreq=y
 CONFIG_PACKAGE_luci-app-zerotier=n
 
-CONFIG_PACKAGE_autocore-arm=y
+CONFIG_PACKAGE_my-autocore-arm=y

devices/common/.config

@@ -59,7 +59,7 @@ CONFIG_COREMARK_OPTIMIZE_O3=y
 CONFIG_COREMARK_ENABLE_MULTITHREADING=y
 CONFIG_COREMARK_NUMBER_OF_THREADS=16
 CONFIG_PACKAGE_zoneinfo-asia=y
-CONFIG_PACKAGE_default-settings=y
+CONFIG_PACKAGE_my-default-settings=y
 CONFIG_PACKAGE_wget-ssl=y
 CONFIG_PACKAGE_curl=y
 CONFIG_PACKAGE_htop=y

devices/nanopi-r2c/.config

@@ -11,4 +11,4 @@ CONFIG_PACKAGE_luci-app-cpufreq=y
 CONFIG_PACKAGE_luci-app-zerotier=n
 
 # 其他需要安装的软件包:
-CONFIG_PACKAGE_autocore-arm=y
+CONFIG_PACKAGE_my-autocore-arm=y

devices/nanopi-r2s/.config

@@ -11,4 +11,4 @@ CONFIG_PACKAGE_luci-app-cpufreq=y
 CONFIG_PACKAGE_luci-app-zerotier=n
 
 # 其他需要安装的软件包:
-CONFIG_PACKAGE_autocore-arm=y
+CONFIG_PACKAGE_my-autocore-arm=y

devices/nanopi-r4s/.config

@@ -10,4 +10,4 @@ CONFIG_TARGET_ROOTFS_EXT4FS=n
 CONFIG_PACKAGE_luci-app-cpufreq=y
 CONFIG_PACKAGE_luci-app-zerotier=n
 
-CONFIG_PACKAGE_autocore-arm=y
+CONFIG_PACKAGE_my-autocore-arm=y

devices/x86_64/.config

@@ -11,7 +11,7 @@ CONFIG_VMDK_IMAGES=n
 
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_luci-proto-bonding=y
-CONFIG_PACKAGE_autocore-x86=y
+CONFIG_PACKAGE_my-autocore-x86=y
 CONFIG_PACKAGE_luci-app-samba4=y
 
 # Wireless

onekey/build.sh

@@ -112,11 +112,11 @@ fi
 cp -Rf ./diy/* ./
 if [ -f "devices/common/default-settings" ]; then
 	sed -i "s/10.0.0.1/$ip/" devices/common/default-settings
-	cp -f devices/common/default-settings package/*/*/default-settings/files/uci.defaults
+	cp -f devices/common/default-settings package/*/*/my-default-settings/files/uci.defaults
 fi
 if [ -f "devices/$firmware/default-settings" ]; then
 	sed -i "s/10.0.0.1/$ip/" devices/$firmware/default-settings
-	cat devices/$firmware/default-settings >> package/*/*/default-settings/files/uci.defaults
+	cat devices/$firmware/default-settings >> package/*/*/my-default-settings/files/uci.defaults
 fi
 if [ -n "$(ls -A "devices/common/patches" 2>/dev/null)" ]; then
           find "devices/common/patches" -type f -name '*.patch' ! -name '*.revert.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 --forward"

onekey/rebuild.sh

@@ -66,11 +66,11 @@ fi
 cp -Rf ./diy/* ./
 if [ -f "devices/common/default-settings" ]; then
 	sed -i 's/10.0.0.1/$ip/' devices/common/default-settings
-	cp -f devices/common/default-settings package/*/*/default-settings/files/uci.defaults
+	cp -f devices/common/default-settings package/*/*/my-default-settings/files/uci.defaults
 fi
 if [ -f "devices/$firmware/default-settings" ]; then
 	sed -i 's/10.0.0.1/$ip/' devices/$firmware/default-settings
-	cat devices/$firmware/default-settings >> package/*/*/default-settings/files/uci.defaults
+	cat devices/$firmware/default-settings >> package/*/*/my-default-settings/files/uci.defaults
 fi
 if [ -n "$(ls -A "devices/common/patches" 2>/dev/null)" ]; then
           find "devices/common/patches" -type f -name '*.patch' ! -name '*.revert.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 --forward"