From ace6e18747a518309215e7ed5f6b67f29a3f6e10 Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 16 Mar 2021 23:22:29 +0800 Subject: [PATCH] build: fix --- .github/workflows/lo-test.yml | 2 +- merge_packages.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index e98ecaf..80e63e9 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -198,7 +198,7 @@ jobs: make defconfig make download -j make target/linux/compile -j$(($(nproc) + 1)) - make package/compile -j$(($(nproc) + 1)) IGNORE_ERRORS=m + make package/compile -j$(($(nproc) + 1)) IGNORE_ERRORS=y make package/index n_kernel_digest=$(cat bin/targets/*/*/*.manifest | grep kernel | tail -c 33 | tr -d "\n") sed -i "s/$n_kernel_digest/$p_kernel_digest/" bin/targets/*/*/packages/Packages bin/targets/*/*/packages/Packages.manifest diff --git a/merge_packages.sh b/merge_packages.sh index 0e08dfb..576023f 100644 --- a/merge_packages.sh +++ b/merge_packages.sh @@ -14,7 +14,7 @@ function merge_package(){ mv $pn package/ } -mkdir files +rm -rf files && mkdir files mkdir -p files/etc/dropbear mv $GITHUB_WORKSPACE/host_keys/* files/etc/dropbear/ chmod 600 files/etc/dropbear/* @@ -35,6 +35,6 @@ ln -sf ../init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan sed -i "s/enable '0'/enable '1'/" package/ctcgfw/luci-app-oled/root/etc/config/oled fi +find . -type f -name nft-qos.config | xargs sed -i "s/option limit_enable '1'/option limit_enable '0'/" sed -i "/\/etc\/coremark\.sh/d" package/feeds/packages/coremark/Makefile -sed -i "s/option limit_enable '1'/option limit_enable '0'/" package/lean/nft-qos/files/nft-qos.config sed -i 's/192.168.1.1/192.168.2.1/' package/base-files/files/bin/config_generate