From 78d6d49552415a92d092bac25eb90645b487aeb7 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 14 Jun 2024 05:16:56 +0800
Subject: [PATCH 01/27] Update custom.sh

---
 devices/common/custom.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/common/custom.sh b/devices/common/custom.sh
index 8913afce..8b26d7f6 100644
--- a/devices/common/custom.sh
+++ b/devices/common/custom.sh
@@ -51,7 +51,7 @@ cp -f devices/common/.config .config
 mv -f feeds/base feeds/base.bak
 mv -f feeds/packages feeds/packages.bak
 make defconfig
-rm -Rf tmp feeds/base
+rm -Rf feeds/base
 mv -f feeds/base.bak feeds/base
 mv -f feeds/packages.bak feeds/packages
 sed -i 's/CONFIG_ALL=y/CONFIG_ALL=n/' .config

From ea2b45a506119380e71cb087cef236ffde231456 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Thu, 11 Jul 2024 01:54:32 +0800
Subject: [PATCH 02/27] Update custom.sh

---
 devices/common/custom.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/devices/common/custom.sh b/devices/common/custom.sh
index 8b26d7f6..9503353f 100644
--- a/devices/common/custom.sh
+++ b/devices/common/custom.sh
@@ -3,8 +3,7 @@
 shopt -s extglob
 rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files,firewall,dnsmasq}
 
-rm -rf feeds/packages/lang/golang
-mv -f feeds/kiddin9/golang feeds/packages/lang/
+curl -sfL https://raw.githubusercontent.com/sbwml/packages_lang_golang/22.x/golang/Makefile -o feeds/packages/lang/Makefile
 
 for ipk in $(find feeds/kiddin9/* -maxdepth 0 -type d);
 do

From c6cc3e9d4b3d5e50ca751af91e6755dca9c88ba2 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Thu, 11 Jul 2024 01:58:44 +0800
Subject: [PATCH 03/27] Update custom.sh

---
 devices/common/custom.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/common/custom.sh b/devices/common/custom.sh
index 9503353f..b685f902 100644
--- a/devices/common/custom.sh
+++ b/devices/common/custom.sh
@@ -3,7 +3,7 @@
 shopt -s extglob
 rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files,firewall,dnsmasq}
 
-curl -sfL https://raw.githubusercontent.com/sbwml/packages_lang_golang/22.x/golang/Makefile -o feeds/packages/lang/Makefile
+curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/golang/Makefile -o feeds/packages/lang/golang/golang/Makefile
 
 for ipk in $(find feeds/kiddin9/* -maxdepth 0 -type d);
 do

From 78c759c1a3ca1d9e099f994c0f5be6d95f2b62ed Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Thu, 11 Jul 2024 16:40:01 +0800
Subject: [PATCH 04/27] Update custom.sh

---
 devices/common/custom.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/common/custom.sh b/devices/common/custom.sh
index b685f902..786468da 100644
--- a/devices/common/custom.sh
+++ b/devices/common/custom.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 shopt -s extglob
-rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files,firewall,dnsmasq}
+rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files,dnsmasq}
 
 curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/golang/Makefile -o feeds/packages/lang/golang/golang/Makefile
 

From e6f43057d115bd55c61375e30222f91d249e4abc Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Sat, 13 Jul 2024 14:18:01 +0800
Subject: [PATCH 05/27] Update Packages-AutoBuild.yml

---
 .github/workflows/Packages-AutoBuild.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/Packages-AutoBuild.yml b/.github/workflows/Packages-AutoBuild.yml
index 038f452f..9420dc3f 100644
--- a/.github/workflows/Packages-AutoBuild.yml
+++ b/.github/workflows/Packages-AutoBuild.yml
@@ -176,9 +176,12 @@ jobs:
           echo >> .config
           cat devices/${{matrix.target}}/.config >> .config
         fi
-        #if [[ ${{github.actor}} == "kiddin9" ]]; then
-          #sed -i "s/index()/index()\nif luci.sys.exec(\"cat \/etc\/openwrt_release | grep -o -E ^DISTRIB_DESCRIPTION='.*(GaryPang|Kiddin)'\") == \"\" then return end/g" package/feeds/kiddin9/luci-app*/luasrc/controller/*.lua
-        #fi
+        status=$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
+        while [ "$status" == "in_progress" ];do
+          sleep 5
+          status=$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
+        done
+        make defconfig
 
     - name: SSH connection to Actions
       uses: kiddin9/debugger-action@master
@@ -186,13 +189,7 @@ jobs:
 
     - name: Prepare
       run: |
-        status=$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
-        while [ "$status" == "in_progress" ];do
-          sleep 5
-          status=$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
-        done
         cd openwrt
-        make defconfig
         mv -f package/feeds/kiddin9 kiddin9.b
         mv -f feeds/packages/lang feeds/packages/lang.b
         mv -f feeds/packages feeds/packages.b

From 56b7970aab0de689694c0a25513595df99761e00 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Sat, 13 Jul 2024 14:38:25 +0800
Subject: [PATCH 06/27] Update .config

---
 devices/common/.config | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/devices/common/.config b/devices/common/.config
index 7d839ed0..beb648fa 100644
--- a/devices/common/.config
+++ b/devices/common/.config
@@ -25,17 +25,6 @@ CONFIG_PACKAGE_luci-app-passwall_INCLUDE_v2ray-plugin=n
 
 CONFIG_NGINX_DAV=y
 
-# daed
-CONFIG_DEVEL=y
-CONFIG_BPF_TOOLCHAIN_HOST=y
-# CONFIG_BPF_TOOLCHAIN_NONE is not set
-CONFIG_KERNEL_BPF_EVENTS=y
-CONFIG_KERNEL_CGROUP_BPF=y
-CONFIG_KERNEL_DEBUG_INFO=y
-CONFIG_KERNEL_DEBUG_INFO_BTF=y
-# CONFIG_KERNEL_DEBUG_INFO_REDUCED is not set
-CONFIG_KERNEL_XDP_SOCKETS=y
-
 CONFIG_PACKAGE_containerd=n
 
 CONFIG_OPENSSL_OPTIMIZE_SPEED=y

From a3ebaaa6cbdb8127fbcb7381d237907a5e3f8887 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Wed, 17 Jul 2024 20:34:25 +0800
Subject: [PATCH 07/27] Create feeds.conf

---
 devices/aarch64_cortex-a76/feeds.conf | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 devices/aarch64_cortex-a76/feeds.conf

diff --git a/devices/aarch64_cortex-a76/feeds.conf b/devices/aarch64_cortex-a76/feeds.conf
new file mode 100644
index 00000000..c9a51ee0
--- /dev/null
+++ b/devices/aarch64_cortex-a76/feeds.conf
@@ -0,0 +1,4 @@
+src-git base https://git.openwrt.org/openwrt/openwrt.git;main
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
+src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
+src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

From 1bf5f0a43e4ffa5bf3ac7327dd10c53d39590bc5 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Wed, 17 Jul 2024 23:12:29 +0800
Subject: [PATCH 08/27] Update custom.sh

---
 devices/common/custom.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/common/custom.sh b/devices/common/custom.sh
index 786468da..937fb07e 100644
--- a/devices/common/custom.sh
+++ b/devices/common/custom.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 shopt -s extglob
-rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files,dnsmasq}
+rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files}
 
 curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/golang/Makefile -o feeds/packages/lang/golang/golang/Makefile
 

From 1921885716c040608711ee9d82bf17a73186bfac Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Wed, 17 Jul 2024 23:14:16 +0800
Subject: [PATCH 09/27] Update .config

---
 devices/common/.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devices/common/.config b/devices/common/.config
index beb648fa..1d6f4bf0 100644
--- a/devices/common/.config
+++ b/devices/common/.config
@@ -9,6 +9,7 @@ CONFIG_SIGNED_PACKAGES=n
 CONFIG_SIGNATURE_CHECK=n
 CONFIG_XRAY_PROVIDE_V2RAY=y
 CONFIG_PACKAGE_dnsmasq=n
+CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_v2ray-plugin_INCLUDE_GOPROXY=n
 CONFIG_V2RAY_CORE_COMPRESS_UPX=n
 CONFIG_XRAY_CORE_COMPRESS_UPX=n

From 3fd7fcb86e801b96383be51bc2ca2ec37fb13be1 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 19 Jul 2024 07:18:42 +0800
Subject: [PATCH 10/27] Update custom.sh

---
 devices/common/custom.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/common/custom.sh b/devices/common/custom.sh
index 937fb07e..786468da 100644
--- a/devices/common/custom.sh
+++ b/devices/common/custom.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 shopt -s extglob
-rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files}
+rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files,dnsmasq}
 
 curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/golang/Makefile -o feeds/packages/lang/golang/golang/Makefile
 

From 7ecc1d7fdc8f6fdf590cc8ca0b5df9fac1137c0b Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Wed, 24 Jul 2024 00:08:53 +0800
Subject: [PATCH 11/27] Update Packages-AutoBuild.yml

---
 .github/workflows/Packages-AutoBuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Packages-AutoBuild.yml b/.github/workflows/Packages-AutoBuild.yml
index 9420dc3f..5544085e 100644
--- a/.github/workflows/Packages-AutoBuild.yml
+++ b/.github/workflows/Packages-AutoBuild.yml
@@ -194,7 +194,7 @@ jobs:
         mv -f feeds/packages/lang feeds/packages/lang.b
         mv -f feeds/packages feeds/packages.b
         mkdir package/feeds/kiddin9
-        cp -rf kiddin9.b/{wxbase,lib*,rapidjson,jpcre2,toml11,gn,curl,quickjspp,qt*,libtorrent*,openssl,mbedtls,ppp,cups,nftables} package/feeds/kiddin9/ || true
+        cp -rf kiddin9.b/{wxbase,lib*,rapidjson,nftables,jpcre2,toml11,gn,curl,quickjspp,qt*,libtorrent*,openssl,mbedtls,ppp,cups,nftables} package/feeds/kiddin9/ || true
 
     - name: Compile the firmware
       run: |

From 10ce78a7bfa9b10b4da2d12473ce95125e58913c Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Mon, 29 Jul 2024 18:36:46 +0800
Subject: [PATCH 12/27] Update custom.sh

---
 devices/common/custom.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/common/custom.sh b/devices/common/custom.sh
index 786468da..937fb07e 100644
--- a/devices/common/custom.sh
+++ b/devices/common/custom.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 shopt -s extglob
-rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files,dnsmasq}
+rm -rf feeds/kiddin9/{diy,mt-drivers,shortcut-fe,luci-app-mtwifi,base-files}
 
 curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/lang/golang/golang/Makefile -o feeds/packages/lang/golang/golang/Makefile
 

From 5709bfd6cf2727f1093cfda17567962640f0e49a Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 2 Aug 2024 03:58:23 +0800
Subject: [PATCH 13/27] Update Packages-AutoBuild.yml

---
 .github/workflows/Packages-AutoBuild.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/Packages-AutoBuild.yml b/.github/workflows/Packages-AutoBuild.yml
index 5544085e..279cd036 100644
--- a/.github/workflows/Packages-AutoBuild.yml
+++ b/.github/workflows/Packages-AutoBuild.yml
@@ -150,8 +150,6 @@ jobs:
         rm -Rf sdk.tar.xz
         cd openwrt
         cp -rf ./openwrt-sdk*/. ./ || true
-        cp -rf ./openwrt-sdk*/build_dir/. ./build_dir/ || true
-        cp -rf ./openwrt-sdk*/staging_dir/. ./staging_dir/ || true
         cp -rf ../devices ./
         cp -rf devices/common/. ./
         cp -rf devices/${{matrix.target}}/. ./

From d8c7974f1afbee4af6dce4dbee22ab67128db69b Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:31:32 +0800
Subject: [PATCH 14/27] Update Packages-AutoBuild.yml

---
 .github/workflows/Packages-AutoBuild.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/Packages-AutoBuild.yml b/.github/workflows/Packages-AutoBuild.yml
index 279cd036..5544085e 100644
--- a/.github/workflows/Packages-AutoBuild.yml
+++ b/.github/workflows/Packages-AutoBuild.yml
@@ -150,6 +150,8 @@ jobs:
         rm -Rf sdk.tar.xz
         cd openwrt
         cp -rf ./openwrt-sdk*/. ./ || true
+        cp -rf ./openwrt-sdk*/build_dir/. ./build_dir/ || true
+        cp -rf ./openwrt-sdk*/staging_dir/. ./staging_dir/ || true
         cp -rf ../devices ./
         cp -rf devices/common/. ./
         cp -rf devices/${{matrix.target}}/. ./

From df0da758920cc7e759b67b6343d5ba3717946ac6 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:34:45 +0800
Subject: [PATCH 15/27] Update Packages-AutoBuild.yml

---
 .github/workflows/Packages-AutoBuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Packages-AutoBuild.yml b/.github/workflows/Packages-AutoBuild.yml
index 5544085e..7004ad7f 100644
--- a/.github/workflows/Packages-AutoBuild.yml
+++ b/.github/workflows/Packages-AutoBuild.yml
@@ -149,7 +149,7 @@ jobs:
         tar -xJf sdk.tar.xz -C openwrt || tar -xf sdk.tar.zst -C openwrt
         rm -Rf sdk.tar.xz
         cd openwrt
-        cp -rf ./openwrt-sdk*/. ./ || true
+        cp -rf ./openwrt-sdk*/. ./ 2>/dev/null || true
         cp -rf ./openwrt-sdk*/build_dir/. ./build_dir/ || true
         cp -rf ./openwrt-sdk*/staging_dir/. ./staging_dir/ || true
         cp -rf ../devices ./

From 437d6e98ff7c3fdac50ad7f91013ed3a26cf713c Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Wed, 7 Aug 2024 14:14:14 +0800
Subject: [PATCH 16/27] Update Packages-AutoBuild.yml

---
 .github/workflows/Packages-AutoBuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Packages-AutoBuild.yml b/.github/workflows/Packages-AutoBuild.yml
index 7004ad7f..801f1ce2 100644
--- a/.github/workflows/Packages-AutoBuild.yml
+++ b/.github/workflows/Packages-AutoBuild.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Trigger Packages Update
       run: |
-        gitdate="$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].created_at')" || true
+        gitdate="$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/commits?path=$ipk&per_page=1" | jq -r '.[0].commit.committer.date')" || gitdate="$(curl -H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/commits?path=$ipk&per_page=1" | jq -r '.[0].commit.committer.date')" || true
         gitdate="$(date -d "$gitdate" +%s)" || true
         now="$(date -d "$(date)" +%s)"
         if [[ $(expr $gitdate + 120) < $now ]]; then

From fccfe77027ab61a19338a43e2806ec4a9317822a Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Wed, 28 Aug 2024 02:28:28 +0800
Subject: [PATCH 17/27] Update feeds.conf

---
 devices/aarch64_cortex-a76/feeds.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/aarch64_cortex-a76/feeds.conf b/devices/aarch64_cortex-a76/feeds.conf
index c9a51ee0..6b409c25 100644
--- a/devices/aarch64_cortex-a76/feeds.conf
+++ b/devices/aarch64_cortex-a76/feeds.conf
@@ -1,4 +1,4 @@
 src-git base https://git.openwrt.org/openwrt/openwrt.git;main
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
+src-git packages https://git.openwrt.org/feed/packages.git;main
 src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

From 70eb42bf85a87e147c5b007df3a8a7c7764aa3ef Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Wed, 28 Aug 2024 02:58:18 +0800
Subject: [PATCH 18/27] Update feeds.conf

---
 devices/aarch64_cortex-a76/feeds.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/aarch64_cortex-a76/feeds.conf b/devices/aarch64_cortex-a76/feeds.conf
index 6b409c25..2ec8a574 100644
--- a/devices/aarch64_cortex-a76/feeds.conf
+++ b/devices/aarch64_cortex-a76/feeds.conf
@@ -1,4 +1,4 @@
 src-git base https://git.openwrt.org/openwrt/openwrt.git;main
-src-git packages https://git.openwrt.org/feed/packages.git;main
+src-git packages https://git.openwrt.org/feed/packages.git
 src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

From 230b54eb1359dd032cb89d3cda59f95bdf21189d Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 30 Aug 2024 18:21:29 +0800
Subject: [PATCH 19/27] Update feeds.conf

---
 devices/aarch64_cortex-a76/feeds.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/aarch64_cortex-a76/feeds.conf b/devices/aarch64_cortex-a76/feeds.conf
index 2ec8a574..c9a51ee0 100644
--- a/devices/aarch64_cortex-a76/feeds.conf
+++ b/devices/aarch64_cortex-a76/feeds.conf
@@ -1,4 +1,4 @@
 src-git base https://git.openwrt.org/openwrt/openwrt.git;main
-src-git packages https://git.openwrt.org/feed/packages.git
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
 src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

From fc74980ff821922124e6ca12cdb08cfea66e1a94 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:58:59 +0800
Subject: [PATCH 20/27] Update repo-dispatcher.yml

---
 .github/workflows/repo-dispatcher.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml
index d1270c22..19518c78 100644
--- a/.github/workflows/repo-dispatcher.yml
+++ b/.github/workflows/repo-dispatcher.yml
@@ -144,6 +144,7 @@ jobs:
       uses: GitRML/delete-workflow-runs@main
       continue-on-error: true
       with:
+        token: ${{ secrets.TOKEN_KIDDIN9 }}
         retain_days: 20
         keep_minimum_runs: 1
 
@@ -155,5 +156,5 @@ jobs:
         keep_latest: 100
         delete_tags: true
       env:
-        GITHUB_TOKEN: ${{ secrets.REPO_TOKEN_kiddin9 }}
+        GITHUB_TOKEN: ${{ secrets.TOKEN_KIDDIN9 }}
        

From 850a5128823f70e5f268f4777c4f8fecda9c619a Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:00:37 +0800
Subject: [PATCH 21/27] Update repo-dispatcher.yml

---
 .github/workflows/repo-dispatcher.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml
index 19518c78..07e18417 100644
--- a/.github/workflows/repo-dispatcher.yml
+++ b/.github/workflows/repo-dispatcher.yml
@@ -37,7 +37,7 @@ jobs:
       if: contains(github.event.inputs.packages, ' cw')
       with:
         workflow_id: all
-        access_token: ${{ github.token }}
+        access_token: ${{ secrets.TOKEN_KIDDIN9 }}
     
     - name: Trigger matrix Update
       run: |

From 588c9f83cdaf9635d9ef12ad4835f67e91932308 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:01:04 +0800
Subject: [PATCH 22/27] Update repo-dispatcher.yml

---
 .github/workflows/repo-dispatcher.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml
index 07e18417..d37b8cb0 100644
--- a/.github/workflows/repo-dispatcher.yml
+++ b/.github/workflows/repo-dispatcher.yml
@@ -30,7 +30,7 @@ env:
 jobs:
   build:
     if: github.event.repository.owner.id == github.event.sender.id || ! github.event.sender.id
-    runs-on: Ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - name: cancel running workflows
       uses: styfle/cancel-workflow-action@main

From a7889e8397b47d6a5f819834a58cf249306a42d2 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:06:47 +0800
Subject: [PATCH 23/27] Update Packages-AutoBuild.yml

---
 .github/workflows/Packages-AutoBuild.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/Packages-AutoBuild.yml b/.github/workflows/Packages-AutoBuild.yml
index 801f1ce2..a4a9c308 100644
--- a/.github/workflows/Packages-AutoBuild.yml
+++ b/.github/workflows/Packages-AutoBuild.yml
@@ -75,17 +75,28 @@ jobs:
         --data '{"event_type": "update"}'
         fi
 
+    - name: Free disk space
+      uses: jlumbroso/free-disk-space@main
+      with:
+        tool-cache: false
+        android: true
+        dotnet: true
+        haskell: true
+        large-packages: true
+        docker-images: true
+        swap-storage: true
+
     - name: Initialization environment
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
         sudo -E apt-get -qq update
-        ( sudo -E apt-get -qq install build-essential clang flex g++ gawk gcc-multilib gettext \
-        git libncurses5-dev libssl-dev python3-distutils rsync unzip zlib1g-dev swig libpython3-dev aria2 jq rename bc libfuse-dev libelf-dev
+        sudo -E apt-get -qq install build-essential clang flex g++ gawk gcc-multilib gettext \
+        git libncurses5-dev libssl-dev python3-distutils rsync unzip zlib1g-dev swig libpython3-dev jq rename bc libfuse-dev libelf-dev
         sudo -E apt-get -qq purge azure-cli ghc* zulu* firefox powershell openjdk* dotnet* google* mysql* php* android*
         sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
         sudo -E apt-get -qq autoremove --purge
-        sudo -E apt-get -qq clean ) &
+        sudo -E apt-get -qq clean
         sudo timedatectl set-timezone "$TZ"
 
     - name: Get current date

From 3d627d820c4503127ae54a083a98edad84f9f3b5 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Thu, 19 Sep 2024 03:47:57 +0800
Subject: [PATCH 24/27] Update Packages-AutoBuild.yml

---
 .github/workflows/Packages-AutoBuild.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/Packages-AutoBuild.yml b/.github/workflows/Packages-AutoBuild.yml
index a4a9c308..48e73332 100644
--- a/.github/workflows/Packages-AutoBuild.yml
+++ b/.github/workflows/Packages-AutoBuild.yml
@@ -234,7 +234,8 @@ jobs:
             if [[ "$fpkg" && ! "$during" ]]; then
               comp
             else
-              gitdate="$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/commits?path=$ipk&per_page=1" | jq -r '.[0].commit.committer.date')" || true
+              REPO_TOKEN="${{ env.REPO_TOKEN }}"
+              gitdate=$(curl -H "Authorization: token $REPO_TOKEN" -s "https://api.github.com/repos/kiddin9/openwrt-packages/commits?path=$ipk&per_page=1" | jq -r '.[0].commit.committer.date') || (REPO_TOKEN="${{ secrets.TOKEN_KIDDIN9 }}" && gitdate=$(curl -H "Authorization: token $REPO_TOKEN" -s "https://api.github.com/repos/kiddin9/openwrt-packages/commits?path=$ipk&per_page=1" | jq -r '.[0].commit.committer.date'))
               if [[ "$gitdate" && "$gitdate" != null ]]; then
                 gitdate="$(date -d "$gitdate" +%s)"
                 now="$(date -d "$(date)" +%s)"

From 1d14ca1ec274f4b7dc19a7979b4fd07711d7318c Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Sat, 5 Oct 2024 02:57:52 +0800
Subject: [PATCH 25/27] Update feeds.conf

---
 devices/common/feeds.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/common/feeds.conf b/devices/common/feeds.conf
index ee3ec073..27b444da 100644
--- a/devices/common/feeds.conf
+++ b/devices/common/feeds.conf
@@ -1,4 +1,4 @@
 src-git base https://git.openwrt.org/openwrt/openwrt.git;openwrt-23.05
 src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
 src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
-src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
+src-git kiddin9 https://github.com/kiddin9/my-packages.git;master

From f80ebb79f1dd9992e9eda3d9bb38ee7a6a85ac0c Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Sat, 5 Oct 2024 03:00:02 +0800
Subject: [PATCH 26/27] Update repo-dispatcher.yml

---
 .github/workflows/repo-dispatcher.yml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml
index d37b8cb0..22a4b52f 100644
--- a/.github/workflows/repo-dispatcher.yml
+++ b/.github/workflows/repo-dispatcher.yml
@@ -41,29 +41,6 @@ jobs:
     
     - name: Trigger matrix Update
       run: |
-        gitdate=$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/commits?&per_page=1" | jq -r '.[0].commit.committer.date') || true
-        fpkg="$(echo "${{github.event.action}}" | sed -e 's/\(aarch64_generic\|x86_64\|i386_pentium4\|arm_arm1176jzf-s_vfp\|aarch64_cortex-a72\|aarch64_cortex-a76\|arm_cortex-a7\|arm_cortex-a7_neon-vfpv4\|arm_cortex-a9\|arm_cortex-a15_neon-vfpv4\|arm_cortex-a5_vfpv4\|mipsel_24kc\|mips_24kc\|aarch64_cortex-a53\|arm_xscale\|arm_cortex-a9_vfpv3-d16\| [0-9][0-9.]*\| ssh\| noser\| cw\)//g' | sed -e 's/ //g')"
-        during="$(echo "${{github.event.inputs.packages}}" | grep -o -E ' [0-9][0-9.]*' | sed -e 's/ //')"
-        [[ "$fpkg" && ! "$during" ]] || {
-          [ "$during" ] || during="1.05"
-          durings=`echo "$during*60*60*24" | bc`
-          gitdate=$(date -d "$gitdate" +%s)
-          now=$(date -d "$(date)" +%s)
-          [ "$during" ] || during="1.05"
-          durings=`echo "$during*60*60*24" | bc`
-          if [[ $(expr $gitdate + ${durings%.*}) -lt $now ]]; then
-            exit;
-          fi
-        gitdate=$(curl -H "Authorization: token ${{ env.REPO_TOKEN }}" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].created_at') || true
-        gitdate=$(date -d "$gitdate" +%s)
-        now=$(date -d "$(date)" +%s)
-        if [[ $(expr $gitdate + 180) < $now ]]; then
-        curl -X POST https://api.github.com/repos/kiddin9/openwrt-packages/dispatches \
-        -H "Accept: application/vnd.github.everest-preview+json" \
-        -H "Authorization: token ${{ env.REPO_TOKEN }}" \
-        --data '{"event_type": "update"}'
-        fi
-        }
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \

From 0e261f728faa83e778c15ee0125a69fa21a3d83d Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Sat, 5 Oct 2024 03:26:19 +0800
Subject: [PATCH 27/27] Update feeds.conf

---
 devices/aarch64_cortex-a76/feeds.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/aarch64_cortex-a76/feeds.conf b/devices/aarch64_cortex-a76/feeds.conf
index c9a51ee0..0f78c668 100644
--- a/devices/aarch64_cortex-a76/feeds.conf
+++ b/devices/aarch64_cortex-a76/feeds.conf
@@ -1,4 +1,4 @@
 src-git base https://git.openwrt.org/openwrt/openwrt.git;main
 src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
 src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
-src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
+src-git kiddin9 https://github.com/kiddin9/my-packages.git;master