diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 60e8fba..d550b50 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -78,10 +78,9 @@ jobs: rm -rf sdk fi #ln -sf /usr/bin/upx-ucl staging_dir/host/bin/upx - rm staging_dir/host/bin/upx sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .config - find . -name Makefile | xargs -n1 grep -l '(STAGING_DIR_HOST)/bin/upx ' | xargs -n1 sed -i '/upx/d' + grep -l -r --include=\Makefile '(STAGING_DIR_HOST)/bin/upx ' | xargs -n1 sed -i '/upx/d' || true make defconfig diff --git a/merge_packages.sh b/merge_packages.sh index a2ff2c3..fc15cf8 100644 --- a/merge_packages.sh +++ b/merge_packages.sh @@ -3,3 +3,15 @@ git clone --depth=1 -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git & svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-cifsd && rm -r package/lean/luci-app-ksmbd && mv luci-app-cifsd package/lean/ svn co https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd && rm -r package/feeds/packages/ksmbd && mv ksmbd package/feeds/packages/ svn co https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools && rm -r package/feeds/packages/ksmbd-tools && mv ksmbd-tools package/feeds/packages/ + +mkdir -p target/linux/rockchip/armv8/base-files/usr/bin &&\ +wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/usr/bin/start-rk3328-pwm-fan.sh -P target/linux/rockchip/armv8/base-files/usr/bin &&\ +chmod +x target/linux/rockchip/armv8/base-files/usr/bin/start-rk3328-pwm-fan.sh + +mkdir -p target/linux/rockchip/armv8/base-files/etc/init.d &&\ +wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/etc/init.d/fa-rk3328-pwmfan -P target/linux/rockchip/armv8/base-files/etc/init.d &&\ +chmod +x target/linux/rockchip/armv8/base-files/etc/init.d/fa-rk3328-pwmfan + +mkdir -p target/linux/rockchip/armv8/base-files/etc/rc.d &&\ +ln -s ../init.d/fa-rk3328-pwmfan target/linux/rockchip/armv8/base-files/etc/rc.d/S96fa-rk3328-pwmfan +chmod +x target/linux/rockchip/armv8/base-files/etc/rc.d/S96fa-rk3328-pwmfan