build: fix

This commit is contained in:
John Doe
2021-03-16 23:22:29 +08:00
parent deaf97de22
commit ace6e18747
2 changed files with 3 additions and 3 deletions

View File

@@ -198,7 +198,7 @@ jobs:
make defconfig make defconfig
make download -j make download -j
make target/linux/compile -j$(($(nproc) + 1)) 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 make package/index
n_kernel_digest=$(cat bin/targets/*/*/*.manifest | grep kernel | tail -c 33 | tr -d "\n") 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 sed -i "s/$n_kernel_digest/$p_kernel_digest/" bin/targets/*/*/packages/Packages bin/targets/*/*/packages/Packages.manifest

View File

@@ -14,7 +14,7 @@ function merge_package(){
mv $pn package/ mv $pn package/
} }
mkdir files rm -rf files && mkdir files
mkdir -p files/etc/dropbear mkdir -p files/etc/dropbear
mv $GITHUB_WORKSPACE/host_keys/* files/etc/dropbear/ mv $GITHUB_WORKSPACE/host_keys/* files/etc/dropbear/
chmod 600 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 sed -i "s/enable '0'/enable '1'/" package/ctcgfw/luci-app-oled/root/etc/config/oled
fi 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 "/\/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 sed -i 's/192.168.1.1/192.168.2.1/' package/base-files/files/bin/config_generate