From d6178bc791cceeb8b5dcf445290f573ede74ada5 Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 25 Jan 2024 08:45:47 +0800 Subject: [PATCH 01/19] fix --- .github/workflows/lo-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index e2319a4a5f..4778115b5a 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -63,7 +63,7 @@ jobs: mkdir lede && sudo mount -o nossd,compress=zstd $LOOP_DEVICE lede if [ -d 'lede/.git' ]; then cd lede && rm -f zerospace && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" - git fetch && git reset --hard origin/$BRANCH && git clean -df + git fetch && git reset --hard origin/HEAD && git clean -df else sudo chown $USER:$(id -gn) lede && git clone -b $BRANCH --single-branch https://github.com/coolsnowwolf/lede lede fi From 5dc7700b933dd5388114eac7f8ba958993942d17 Mon Sep 17 00:00:00 2001 From: John Doe Date: Sun, 28 Jan 2024 08:20:53 +0800 Subject: [PATCH 02/19] fix --- x86.config.seed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x86.config.seed b/x86.config.seed index 41d79c11b4..6684011404 100644 --- a/x86.config.seed +++ b/x86.config.seed @@ -35,7 +35,7 @@ CONFIG_PACKAGE_kmod-sound-core=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-wolfssl=y + CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y CONFIG_DRIVER_11W_SUPPORT=y From 3de488622785da40852229e6cf67d1f801ff1b97 Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 6 Feb 2024 04:49:57 +0800 Subject: [PATCH 03/19] fix --- common.seed | 1 - 1 file changed, 1 deletion(-) diff --git a/common.seed b/common.seed index 097c95c8dc..c6004009c0 100644 --- a/common.seed +++ b/common.seed @@ -74,7 +74,6 @@ CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_fuse3-utils=y CONFIG_PACKAGE_htop=y -CONFIG_PACKAGE_iperf3=y CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y CONFIG_PACKAGE_iptables-mod-tproxy=y From 14714c2390196cc1a5aa345d63cc96e942740b28 Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 12 Feb 2024 13:26:05 +0800 Subject: [PATCH 04/19] fix --- .github/workflows/lo-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 4778115b5a..cc5adb891b 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -119,7 +119,8 @@ jobs: ulimit -SHn 65000 cd ~/lede while true; do make download -j && break || true; done - make -j$[`nproc`+1] IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install + if [ `nproc` -lt 8 ] && con = `nproc`/2+3 || con = `nproc` + make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install if [ ! -e ~/lede/bin/targets/*/*/*imagebuilder*xz ]; then make IGNORE_ERRORS=1 V=sc; fi mv `ls ~/lede/bin/targets/*/*/*imagebuilder*xz` ~/ib-$DEVICE.tar.xz From be65297cddc9caa69b41dc51a7044f1fe44b5dd3 Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 12 Feb 2024 13:30:27 +0800 Subject: [PATCH 05/19] update --- .github/workflows/lo-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index cc5adb891b..fc8cf56b35 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -121,7 +121,10 @@ jobs: while true; do make download -j && break || true; done if [ `nproc` -lt 8 ] && con = `nproc`/2+3 || con = `nproc` make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install - if [ ! -e ~/lede/bin/targets/*/*/*imagebuilder*xz ]; then make IGNORE_ERRORS=1 V=sc; fi + if [ ! -e ~/lede/bin/targets/*/*/*imagebuilder*xz ]; then + df -h + make IGNORE_ERRORS=1 V=sc + fi mv `ls ~/lede/bin/targets/*/*/*imagebuilder*xz` ~/ib-$DEVICE.tar.xz echo "=======================" From 53eccfb34b691a95ec3ac59afa301284c3fcbe0b Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 12 Feb 2024 13:31:58 +0800 Subject: [PATCH 06/19] update --- .github/workflows/lo-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index fc8cf56b35..eb4f69830c 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -123,7 +123,7 @@ jobs: make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install if [ ! -e ~/lede/bin/targets/*/*/*imagebuilder*xz ]; then df -h - make IGNORE_ERRORS=1 V=sc + make V=sc fi mv `ls ~/lede/bin/targets/*/*/*imagebuilder*xz` ~/ib-$DEVICE.tar.xz From e7888ceaad99608b4e3adafb932ec334e66c6b4c Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 12 Feb 2024 14:18:14 +0800 Subject: [PATCH 07/19] fix # Conflicts: # .github/workflows/lo-test.yml --- .github/workflows/lo-test.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index eb4f69830c..eaa05baccd 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -119,13 +119,16 @@ jobs: ulimit -SHn 65000 cd ~/lede while true; do make download -j && break || true; done - if [ `nproc` -lt 8 ] && con = `nproc`/2+3 || con = `nproc` - make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install - if [ ! -e ~/lede/bin/targets/*/*/*imagebuilder*xz ]; then - df -h - make V=sc - fi + if [ -d build_dir ]; then + make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install + if [ ! -e ~/lede/bin/targets/*/*/*imagebuilder*xz ]; then + df -h + make V=sc + fi mv `ls ~/lede/bin/targets/*/*/*imagebuilder*xz` ~/ib-$DEVICE.tar.xz + else + make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile + fi echo "=======================" echo "Space usage:" @@ -140,8 +143,7 @@ jobs: cd mkdir -p ./artifact/buildinfo cd lede - cp -rf $(find ./bin/targets/ -type f -name "*.buildinfo" -o -name "*.manifest") ../artifact/buildinfo/ - cp -rf .config ../artifact/buildinfo/ + cp -rf .config $(find ./bin/targets/ -type f -name "*.buildinfo" -o -name "*.manifest") ../artifact/buildinfo/ echo "strDate=$(TZ=UTC-8 date +%Y-%m-%d)" >> $GITHUB_ENV echo "strDevice=$(echo $DEVICE | awk '{print toupper($0)}')" >> $GITHUB_ENV cd .. From 5eb9243fb0f0f65b87130e79ee619d3b9e80f100 Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 12 Feb 2024 14:22:24 +0800 Subject: [PATCH 08/19] fix --- .github/workflows/lo-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index eaa05baccd..e2029bd5b4 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -119,6 +119,7 @@ jobs: ulimit -SHn 65000 cd ~/lede while true; do make download -j && break || true; done + [ `nproc` -gt 8 ] && con=$[`nproc`/2+3] || con=`nproc` if [ -d build_dir ]; then make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install if [ ! -e ~/lede/bin/targets/*/*/*imagebuilder*xz ]; then From b0cd7dc3dc16ef1bc33b9660c0a5f0848d3b8ffa Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 13 Feb 2024 02:35:53 +0800 Subject: [PATCH 09/19] update --- .github/workflows/lo-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index e2029bd5b4..eb3284c922 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -169,7 +169,8 @@ jobs: run: | cd sleep 60 - sudo mount -o remount,compress=no,nodatacow,nodatasum lede + sudo umount lede + sudo mount -o compress=no,nodatacow,nodatasum $LOOP_DEVICE lede cd lede/; pv /dev/zero > zerospace || true; sync; rm -f zerospace; cd - sleep 60 sudo umount lede From 217801f2e16c22f2c197462432a4a3c170e42139 Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 15 Feb 2024 10:20:09 +0800 Subject: [PATCH 10/19] update --- scripts/patches.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/patches.sh b/scripts/patches.sh index 71c359f9a5..8d47f9d128 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -97,6 +97,7 @@ esac if [[ $DEVICE == 'r6s' || $DEVICE == 'r6c' ]]; then pip3 install pylibfdt cd ~ && rm -rf immortalwrt/ && git clone -b master --depth=1 https://github.com/immortalwrt/immortalwrt && cd immortalwrt + git revert --no-edit 3bc7cfe0923ea23626a4e8c666c4a4b64a78f195 #cpufreq mv include/kernel-6.1 ~/lede/include/ rsync -a --delete target/linux/rockchip/. ~/lede/target/linux/rockchip/. && rsync -a --delete target/linux/generic/. ~/lede/target/linux/generic/. && rsync -a --delete package/boot/. ~/lede/package/boot/. cd ~/lede From 78cadbbd36380a7663ca900798159d791300b53f Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 15 Feb 2024 10:28:21 +0800 Subject: [PATCH 11/19] fix --- scripts/patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/patches.sh b/scripts/patches.sh index 8d47f9d128..5a7ea8c244 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -96,7 +96,7 @@ esac # add r6s support to Lean's repo if [[ $DEVICE == 'r6s' || $DEVICE == 'r6c' ]]; then pip3 install pylibfdt - cd ~ && rm -rf immortalwrt/ && git clone -b master --depth=1 https://github.com/immortalwrt/immortalwrt && cd immortalwrt + cd ~ && rm -rf immortalwrt/ && git clone -b master https://github.com/immortalwrt/immortalwrt && cd immortalwrt git revert --no-edit 3bc7cfe0923ea23626a4e8c666c4a4b64a78f195 #cpufreq mv include/kernel-6.1 ~/lede/include/ rsync -a --delete target/linux/rockchip/. ~/lede/target/linux/rockchip/. && rsync -a --delete target/linux/generic/. ~/lede/target/linux/generic/. && rsync -a --delete package/boot/. ~/lede/package/boot/. From c80a02f385b600eb043e44918581b0727bd39235 Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 15 Feb 2024 19:07:00 +0800 Subject: [PATCH 12/19] fix --- scripts/patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/patches.sh b/scripts/patches.sh index 5a7ea8c244..dc6ef90e0c 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -97,7 +97,7 @@ esac if [[ $DEVICE == 'r6s' || $DEVICE == 'r6c' ]]; then pip3 install pylibfdt cd ~ && rm -rf immortalwrt/ && git clone -b master https://github.com/immortalwrt/immortalwrt && cd immortalwrt - git revert --no-edit 3bc7cfe0923ea23626a4e8c666c4a4b64a78f195 #cpufreq + git revert --no-commit 3bc7cfe0923ea23626a4e8c666c4a4b64a78f195 #cpufreq mv include/kernel-6.1 ~/lede/include/ rsync -a --delete target/linux/rockchip/. ~/lede/target/linux/rockchip/. && rsync -a --delete target/linux/generic/. ~/lede/target/linux/generic/. && rsync -a --delete package/boot/. ~/lede/package/boot/. cd ~/lede From 9d25e7d0a905a0004f8ed4b49bc40ba2fa289a8e Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 16 Feb 2024 09:51:39 +0800 Subject: [PATCH 13/19] update --- .github/workflows/dispatch.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml index f0baee3709..9b4bb71cb7 100644 --- a/.github/workflows/dispatch.yml +++ b/.github/workflows/dispatch.yml @@ -2,21 +2,21 @@ name: Repo Dispatcher on: workflow_dispatch: inputs: - package_clean: + debug: type: choice - description: 'check to make clean package' + description: 'debug?' options: - true - false - default: 'true' + default: 'false' required: true - debug: + package_clean: type: choice - description: 'debug?' + description: 'check to make clean package' options: - true - false - default: 'false' + default: 'true' required: true jobs: From 51dd71264701fe03336740ad806d6f748c2a4e2c Mon Sep 17 00:00:00 2001 From: John Doe Date: Sun, 25 Feb 2024 00:53:15 +0800 Subject: [PATCH 14/19] update --- common.seed | 1 + 1 file changed, 1 insertion(+) diff --git a/common.seed b/common.seed index c6004009c0..b91f6e2aa7 100644 --- a/common.seed +++ b/common.seed @@ -87,6 +87,7 @@ CONFIG_PACKAGE_kmod-usb2=y CONFIG_PACKAGE_kmod-usb3=y # CONFIG_PACKAGE_kmod-usb-net-rtl8152 is not set CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y +CONFIG_PACKAGE_kmod-usb-net-ipheth=y CONFIG_PACKAGE_losetup=y CONFIG_PACKAGE_openssh-sftp-server=y CONFIG_PACKAGE_pv=y From 92d10ae8ee05d39b0974efbc529ead88216bbc26 Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 7 Mar 2024 23:58:18 +0800 Subject: [PATCH 15/19] fix --- scripts/patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/patches.sh b/scripts/patches.sh index dc6ef90e0c..a0bd402fe6 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -99,7 +99,7 @@ if [[ $DEVICE == 'r6s' || $DEVICE == 'r6c' ]]; then cd ~ && rm -rf immortalwrt/ && git clone -b master https://github.com/immortalwrt/immortalwrt && cd immortalwrt git revert --no-commit 3bc7cfe0923ea23626a4e8c666c4a4b64a78f195 #cpufreq mv include/kernel-6.1 ~/lede/include/ - rsync -a --delete target/linux/rockchip/. ~/lede/target/linux/rockchip/. && rsync -a --delete target/linux/generic/. ~/lede/target/linux/generic/. && rsync -a --delete package/boot/. ~/lede/package/boot/. + rsync -a --delete target/linux/rockchip/. ~/lede/target/linux/rockchip/. && rsync -a --delete target/linux/generic/. ~/lede/target/linux/generic/. && rsync -a --delete package/boot/. ~/lede/package/boot/. && cp -a include/u-boot.mk ~/lede/include/u-boot.mk cd ~/lede wget https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-6.1/952-add-net-conntrack-events-support-multiple-registrant.patch wget https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-6.1/953-net-patch-linux-kernel-to-support-shortcut-fe.patch From d6c3cbb00521042a15f2a9c8c3d4edcb62960e93 Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 18 Mar 2024 15:12:07 +0800 Subject: [PATCH 16/19] fix --- scripts/patches.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/patches.sh b/scripts/patches.sh index a0bd402fe6..10e5efd977 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -38,6 +38,7 @@ line_number_INCLUDE_V2ray=$[`grep -m1 -n 'Include V2ray' package/custom/openwrt- sed -i $line_number_INCLUDE_V2ray'd' package/custom/openwrt-passwall/luci-app-passwall/Makefile sed -i $line_number_INCLUDE_V2ray'd' package/custom/openwrt-passwall/luci-app-passwall/Makefile sed -i $line_number_INCLUDE_V2ray'd' package/custom/openwrt-passwall/luci-app-passwall/Makefile +sed -i 's/LUCI_DEPENDS:=/LUCI_DEPENDS:=+iptables-mod-iprange +iptables-mod-socket /' package/custom/openwrt-passwall/luci-app-passwall/Makefile # inject the firmware version strDate=`TZ=UTC-8 date +%Y-%m-%d` From 4c492d2e2e7c0a040047547432f7cc1098ae8969 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 29 Mar 2024 07:34:35 +0800 Subject: [PATCH 17/19] update --- .github/workflows/lo-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index eb3284c922..a7eaa2580d 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -118,7 +118,7 @@ jobs: run: | ulimit -SHn 65000 cd ~/lede - while true; do make download -j && break || true; done + rm -r dl;while true; do make download -j && break || true; done [ `nproc` -gt 8 ] && con=$[`nproc`/2+3] || con=`nproc` if [ -d build_dir ]; then make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install From 663a6ae97f1b2b0658f8a3f16de8e6e17f4a13ff Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 29 Mar 2024 11:18:49 +0800 Subject: [PATCH 18/19] fix --- common.seed | 1 - 1 file changed, 1 deletion(-) diff --git a/common.seed b/common.seed index b91f6e2aa7..1791c9d506 100644 --- a/common.seed +++ b/common.seed @@ -94,7 +94,6 @@ CONFIG_PACKAGE_pv=y CONFIG_PACKAGE_resize2fs=y CONFIG_PACKAGE_sfdisk=y CONFIG_PACKAGE_snmpd=y -CONFIG_PACKAGE_tailscale=y CONFIG_PACKAGE_upx=y CONFIG_PACKAGE_usb-modeswitch=y CONFIG_PACKAGE_wget=y From d67699cf381853a7d29b60daa44c8e4c38ef1540 Mon Sep 17 00:00:00 2001 From: John Doe Date: Wed, 17 Apr 2024 02:45:04 +0800 Subject: [PATCH 19/19] fix --- .github/workflows/lo-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index a7eaa2580d..05f0e1df69 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -118,7 +118,7 @@ jobs: run: | ulimit -SHn 65000 cd ~/lede - rm -r dl;while true; do make download -j && break || true; done + rm -rf dl;while true; do make download -j && break || true; done [ `nproc` -gt 8 ] && con=$[`nproc`/2+3] || con=`nproc` if [ -d build_dir ]; then make -j$con IGNORE_ERRORS=1 tools/compile toolchain/compile buildinfo target/compile package/compile package/install target/install