From 206fbbb0b2d6861643df72a62ff948606c1a4898 Mon Sep 17 00:00:00 2001 From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> Date: Sun, 14 Aug 2022 12:55:41 +0800 Subject: [PATCH] fixed --- .github/workflows/R2C-OpenWrt.yml | 4 ++-- .github/workflows/R2S-OpenWrt.yml | 4 ++-- .github/workflows/R4S-OpenWrt.yml | 4 ++-- .github/workflows/X86-OpenWrt.yml | 4 ++-- README.md | 2 +- SCRIPTS/02_prepare_package.sh | 29 ++++++++++++++++++----------- SWITCH | 2 +- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.github/workflows/R2C-OpenWrt.yml b/.github/workflows/R2C-OpenWrt.yml index 35d739f58..62fd3323d 100644 --- a/.github/workflows/R2C-OpenWrt.yml +++ b/.github/workflows/R2C-OpenWrt.yml @@ -70,7 +70,7 @@ jobs: latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][0-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')" echo "latest_release=${latest_release}" >>$GITHUB_ENV - name: Cache - uses: HiGarfield/cachewrtbuild@test + uses: HiGarfield/cachewrtbuild@main with: mixkey: ${{ env.TARGET_DEVICE_ARCH }} prefix: ${{ github.workspace }}/openwrt @@ -121,7 +121,7 @@ jobs: with: name: OpenWRT-${{ env.latest_release }} allowUpdates: true - prerelease: true + prerelease: false tag: ${{ env.latest_release }} commit: 22.03 replacesArtifacts: true diff --git a/.github/workflows/R2S-OpenWrt.yml b/.github/workflows/R2S-OpenWrt.yml index 60589a9e0..837517ada 100644 --- a/.github/workflows/R2S-OpenWrt.yml +++ b/.github/workflows/R2S-OpenWrt.yml @@ -70,7 +70,7 @@ jobs: latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][0-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')" echo "latest_release=${latest_release}" >>$GITHUB_ENV - name: Cache - uses: HiGarfield/cachewrtbuild@test + uses: HiGarfield/cachewrtbuild@main with: mixkey: ${{ env.TARGET_DEVICE_ARCH }} prefix: ${{ github.workspace }}/openwrt @@ -121,7 +121,7 @@ jobs: with: name: OpenWRT-${{ env.latest_release }} allowUpdates: true - prerelease: true + prerelease: false tag: ${{ env.latest_release }} commit: 22.03 replacesArtifacts: true diff --git a/.github/workflows/R4S-OpenWrt.yml b/.github/workflows/R4S-OpenWrt.yml index a07759960..09c83249b 100644 --- a/.github/workflows/R4S-OpenWrt.yml +++ b/.github/workflows/R4S-OpenWrt.yml @@ -70,7 +70,7 @@ jobs: latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][0-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')" echo "latest_release=${latest_release}" >>$GITHUB_ENV - name: Cache - uses: HiGarfield/cachewrtbuild@test + uses: HiGarfield/cachewrtbuild@main with: mixkey: ${{ env.TARGET_DEVICE_ARCH }} prefix: ${{ github.workspace }}/openwrt @@ -121,7 +121,7 @@ jobs: with: name: OpenWRT-${{ env.latest_release }} allowUpdates: true - prerelease: true + prerelease: false tag: ${{ env.latest_release }} commit: 22.03 replacesArtifacts: true diff --git a/.github/workflows/X86-OpenWrt.yml b/.github/workflows/X86-OpenWrt.yml index a690a9ed1..216bf19d0 100644 --- a/.github/workflows/X86-OpenWrt.yml +++ b/.github/workflows/X86-OpenWrt.yml @@ -70,7 +70,7 @@ jobs: latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][0-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')" echo "latest_release=${latest_release}" >>$GITHUB_ENV - name: Cache - uses: HiGarfield/cachewrtbuild@test + uses: HiGarfield/cachewrtbuild@main with: mixkey: ${{ env.TARGET_DEVICE_ARCH }} prefix: ${{ github.workspace }}/openwrt @@ -121,7 +121,7 @@ jobs: with: name: OpenWRT-${{ env.latest_release }} allowUpdates: true - prerelease: true + prerelease: false tag: ${{ env.latest_release }} commit: 22.03 replacesArtifacts: true diff --git a/README.md b/README.md index 87f1bd2fd..61d6aac14 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@

- +

请勿用于商业用途!!!

diff --git a/SCRIPTS/02_prepare_package.sh b/SCRIPTS/02_prepare_package.sh index befd0b5d8..09269414e 100644 --- a/SCRIPTS/02_prepare_package.sh +++ b/SCRIPTS/02_prepare_package.sh @@ -25,8 +25,6 @@ echo "net.netfilter.nf_conntrack_helper = 1" >>./package/kernel/linux/files/sysc ### 必要的 Patches ### -# offload bugfix （this should be removed after upstream merged -wget -qO - https://github.com/openwrt/openwrt/pull/10422.patch | patch -p1 # introduce "le9" Linux kernel patches cp -f ../PATCH/backport/995-le9i.patch ./target/linux/generic/hack-5.10/995-le9i.patch cp -f ../PATCH/backport/290-remove-kconfig-CONFIG_I8K.patch ./target/linux/generic/hack-5.10/290-remove-kconfig-CONFIG_I8K.patch @@ -104,23 +102,29 @@ svn export https://github.com/Lienol/openwrt/trunk/package/network/fullconenat p ### 获取额外的基础软件包 ### # 更换为 ImmortalWrt Uboot 以及 Target rm -rf ./target/linux/rockchip -svn export https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip target/linux/rockchip -rm -rf ./target/linux/rockchip/image/armv8.mk -wget -P target/linux/rockchip/image/ https://github.com/coolsnowwolf/lede/raw/3211a97/target/linux/rockchip/image/armv8.mk +svn export -r 5010 https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip target/linux/rockchip +#rm -rf ./target/linux/rockchip/image/armv8.mk +#wget -P target/linux/rockchip/image/ https://github.com/coolsnowwolf/lede/raw/3211a97/target/linux/rockchip/image/armv8.mk rm -rf ./target/linux/rockchip/Makefile wget -P target/linux/rockchip/ https://github.com/openwrt/openwrt/raw/openwrt-22.03/target/linux/rockchip/Makefile rm -rf ./target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch rm -rf ./target/linux/rockchip/patches-5.10/003-dt-bindings-net-add-RTL8152-binding-documentation.patch rm -rf ./package/boot/uboot-rockchip -svn export https://github.com/coolsnowwolf/lede/trunk/package/boot/uboot-rockchip package/boot/uboot-rockchip +svn export -r 5010 https://github.com/coolsnowwolf/lede/trunk/package/boot/uboot-rockchip package/boot/uboot-rockchip sed -i '/r2c-rk3328:arm-trusted/d' package/boot/uboot-rockchip/Makefile -svn export https://github.com/coolsnowwolf/lede/trunk/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor +svn export -r 5010 https://github.com/coolsnowwolf/lede/trunk/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor rm -rf ./package/kernel/linux/modules/video.mk wget -P package/kernel/linux/modules/ https://github.com/immortalwrt/immortalwrt/raw/master/package/kernel/linux/modules/video.mk +echo ' +# CONFIG_SHORTCUT_FE is not set +# CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set +# CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set +' >>./target/linux/rockchip/armv8/config-5.10 + # LRNG cp -rf ../PATCH/LRNG/* ./target/linux/generic/hack-5.10/ # R4S超频到 2.2/1.8 GHz @@ -132,7 +136,7 @@ sed -i 's,noinitrd,noinitrd mitigations=off,g' target/linux/x86/image/grub-efi.c sed -i 's,noinitrd,noinitrd mitigations=off,g' target/linux/x86/image/grub-iso.cfg sed -i 's,noinitrd,noinitrd mitigations=off,g' target/linux/x86/image/grub-pc.cfg # AutoCore -svn export https://github.com/immortalwrt/immortalwrt/branches/master/package/emortal/autocore package/lean/autocore +svn export -r 219750 https://github.com/immortalwrt/immortalwrt/branches/master/package/emortal/autocore package/lean/autocore sed -i 's/"getTempInfo" /"getTempInfo", "getCPUBench", "getCPUUsage" /g' package/lean/autocore/files/generic/luci-mod-status-autocore.json rm -rf ./feeds/packages/utils/coremark svn export https://github.com/immortalwrt/packages/trunk/utils/coremark feeds/packages/utils/coremark @@ -222,7 +226,7 @@ git clone -b main --depth 1 https://github.com/msylgj/luci-app-upnp feeds/luci/a git clone -b luci --depth 1 https://github.com/QiuSimons/openwrt-chinadns-ng.git package/new/luci-app-chinadns-ng svn export https://github.com/xiaorouji/openwrt-passwall/trunk/chinadns-ng package/new/chinadns-ng # CPU 控制相关 -svn export https://github.com/immortalwrt/luci/trunk/applications/luci-app-cpufreq feeds/luci/applications/luci-app-cpufreq +svn export -r 19495 https://github.com/immortalwrt/luci/trunk/applications/luci-app-cpufreq feeds/luci/applications/luci-app-cpufreq ln -sf ../../../feeds/luci/applications/luci-app-cpufreq ./package/feeds/luci/luci-app-cpufreq sed -i 's,1608,1800,g' feeds/luci/applications/luci-app-cpufreq/root/etc/uci-defaults/10-cpufreq sed -i 's,2016,2208,g' feeds/luci/applications/luci-app-cpufreq/root/etc/uci-defaults/10-cpufreq @@ -243,6 +247,7 @@ svn export https://github.com/lisaac/luci-app-dockerman/trunk/applications/luci- sed -i '/auto_start/d' feeds/luci/applications/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman pushd feeds/packages wget -qO- https://github.com/openwrt/packages/commit/ed7396a.patch | patch -p1 +wget -qO- https://github.com/openwrt/packages/commit/a27e8df.patch | patch -p1 popd rm -rf ./feeds/luci/collections/luci-lib-docker svn export https://github.com/lisaac/luci-lib-docker/trunk/collections/luci-lib-docker feeds/luci/collections/luci-lib-docker @@ -301,7 +306,8 @@ popd git clone -b master --depth 1 https://github.com/NateLol/luci-app-oled.git package/new/luci-app-oled # OpenClash #wget -qO - https://github.com/openwrt/openwrt/commit/efc8aff.patch | patch -p1 -git clone --single-branch --depth 1 -b dev https://github.com/vernesong/OpenClash.git package/new/luci-app-openclash +#git clone --single-branch --depth 1 -b dev https://github.com/vernesong/OpenClash.git package/new/luci-app-openclash +svn export https://github.com/vernesong/OpenClash/branches/dev/luci-app-openclash package/new/luci-app-openclash # 花生壳内网穿透 svn export https://github.com/teasiu/dragino2/trunk/devices/common/diy/package/teasiu/luci-app-phtunnel package/new/luci-app-phtunnel svn export https://github.com/teasiu/dragino2/trunk/devices/common/diy/package/teasiu/phtunnel package/new/phtunnel @@ -470,6 +476,8 @@ ln -sf ../../../feeds/luci/applications/luci-app-zerotier ./package/feeds/luci/l rm -rf ./feeds/packages/net/zerotier svn export https://github.com/immortalwrt/packages/branches/master/net/zerotier feeds/packages/net/zerotier #sed -i '/Default,one/a\\t$(STAGING_DIR_HOST)/bin/upx --lzma --best $(PKG_BUILD_DIR)/zerotier-one' feeds/packages/net/zerotier/Makefile +#jq +sed -i 's,9625784cf2e4fd9842f1d407681ce4878b5b0dcddbcd31c6135114a30c71e6a8,skip,g' feeds/packages/utils/jq/Makefile # 翻译及部分功能优化 svn export https://github.com/QiuSimons/OpenWrt-Add/trunk/addition-trans-zh package/lean/lean-translate sed -i 's,iptables-mod-fullconenat,iptables-nft +kmod-nft-fullcone,g' package/lean/lean-translate/Makefile @@ -531,7 +539,6 @@ CONFIG_LRNG_DFLT_DRNG_CHACHA20=y CONFIG_NFSD=y ' >>./target/linux/generic/config-5.10 - ### Shortcut-FE 部分 ### # Patch Kernel 以支持 Shortcut-FE wget -P target/linux/generic/hack-5.10/ https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch diff --git a/SWITCH b/SWITCH index 2930e4083..1e9b84728 100644 --- a/SWITCH +++ b/SWITCH @@ -1 +1 @@ -2022年4月26日 +2022年9月4日