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: diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index e2319a4a5f..05f0e1df69 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 @@ -118,10 +118,18 @@ jobs: run: | 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 [ ! -e ~/lede/bin/targets/*/*/*imagebuilder*xz ]; then make IGNORE_ERRORS=1 V=sc; fi + 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 + 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:" @@ -136,8 +144,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 .. @@ -162,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 diff --git a/common.seed b/common.seed index 097c95c8dc..1791c9d506 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 @@ -88,13 +87,13 @@ 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 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 diff --git a/scripts/patches.sh b/scripts/patches.sh index 71c359f9a5..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` @@ -96,9 +97,10 @@ 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-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 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