yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
John Doe
2021-11-05 21:19:07 +08:00
parent a275db0cfe
commit b689d773e8
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/lo-test.yml vendored
View File

@@ -99,6 +99,7 @@ jobs:
df -h .
- name: Build and deploy packages
run: |
ulimit -SHn 65000
cd ~/lede
while true; do make download -j && break || true; done
make -j$[`nproc`+1] IGNORE_ERRORS=1
@@ -254,7 +255,9 @@ jobs:
run: |
sudo apt update && sudo apt install qemu-utils
sudo sysctl vm.swappiness=0
ulimit -SHn 65000
curl -L https://github.com/klever1988/sshactions/releases/download/cache/ib-$DEVICE.tar.xz | tar -Jxvf -
set -x
mv *imagebuilder* ib && cd ib
. $GITHUB_WORKSPACE/scripts/merge_files.sh
sed -i '/local/d;s/#//' files/etc/opkg/distfeeds.conf

16
scripts/merge_files.sh
View File

@@ -1,20 +1,4 @@
mv $GITHUB_WORKSPACE/files ./
if [ $DEVICE = 'r2s' -o $DEVICE = 'r2c' ]; then
mkdir -p files/usr/bin files/etc/init.d files/etc/rc.d
wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/usr/bin/start-rk3328-pwm-fan.sh -qNP files/usr/bin
chmod +x files/usr/bin/start-rk3328-pwm-fan.sh
wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/etc/init.d/fa-rk3328-pwmfan -qNP files/etc/init.d
chmod +x files/etc/init.d/fa-rk3328-pwmfan
ln -sf ../init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan
fi
if [ $DEVICE = 'r4s' ]; then
mkdir -p files/usr/bin files/etc/init.d files/etc/rc.d
wget https://raw.githubusercontent.com/btyh17mxy/friendlywrt/fix/rk3399-fan-ctl/target/linux/rockchip-rk3399/base-files/usr/bin/start-rk3399-pwm-fan.sh -qNP files/usr/bin
chmod +x files/usr/bin/start-rk3399-pwm-fan.sh
wget https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v19.07.1/target/linux/rockchip-rk3399/base-files/etc/init.d/fa-rk3399-pwmfan -qNP files/etc/init.d
chmod +x files/etc/init.d/fa-rk3399-pwmfan
ln -sf ../init.d/fa-rk3399-pwmfan files/etc/rc.d/S96fa-rk3399-pwmfan
fi
chmod 600 files/etc/dropbear/*
eval `cat .config | grep \" | head -n 10`
. files/etc/opkg/distfeeds.conf | tee files/etc/opkg/distfeeds.conf

1
scripts/merge_packages.sh
View File

@@ -32,7 +32,6 @@ merge_package https://github.com/klever1988/helloworld/branches/tmp/luci-app-ssr
merge_package https://github.com/klever1988/helloworld/branches/tmp/mosdns
#merge_package https://github.com/klever1988/openwrt-mos/trunk/luci-app-mosdns
merge_package https://github.com/project-lede/luci-app-godproxy
merge_package https://github.com/Beginner-Go/luci-app-tencentddns
merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-services-wolplus
merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3-mount
merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3

5
scripts/patches.sh
View File

@@ -56,6 +56,11 @@ if [ $BRANCH == 'master' ]; then
git apply f341ef96fe4b509a728ba1281281da96bac23673.patch
rm f341ef96fe4b509a728ba1281281da96bac23673.patch
# enable fan control
wget https://github.com/friendlyarm/friendlywrt/commit/cebdc1f94dcd6363da3a5d7e1e69fd741b8b718e.patch
git apply cebdc1f94dcd6363da3a5d7e1e69fd741b8b718e.patch
rm cebdc1f94dcd6363da3a5d7e1e69fd741b8b718e.patch
#this is a ugly fix
sed -i '/procd-ujail/d' include/target.mk
echo 'CONFIG_PACKAGE_procd-seccomp=y' >> $GITHUB_WORKSPACE/common.seed