diff --git a/CHANGELOG.md b/CHANGELOG.md index f5e0d5f..79c707d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ # 更新日志 ###### (如果没有特别说明,更新内容就是上游Lean和Lienol两位大佬的代码更新) +## 2021-08-19 + +- 增加机型:NanoPi R2C 的支持(由@thomaswcy提供支持) + ## 2021-03-13 - autoupdate.sh脚本实验性功能:升级固件时自动扩容分区至sd卡最大值 diff --git a/README.md b/README.md index 74269a7..64d9ea8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Nanopi R1S R2S R4S Openwrt 固件 +# Nanopi R1S R2S R2C R4S Openwrt 固件 [刷机工具](https://www.balena.io/etcher/) [下载地址](#下载地址) @@ -37,7 +37,7 @@ wget -qO- https://github.com/klever1988/nanopi-openwrt/raw/master/scripts/autoup 因为本项目预编译了Image builder,生成固件仅需1-3分钟,如果有兴趣自定义固件可以Fork本项目,编辑设备对应的config.seed文件,例如r2s.config.seed, 去掉(整行删除)不需要的luci app软件包配置行,添加自己所需的软件,可用软件的列表可以在github actions构件输出处获取,例如 -完成之后进入Actions,点击左侧Build,点击右侧Run workflow输入设备名(r2s/r4s/r1s/r1s-h3/r1p) +完成之后进入Actions,点击左侧Build,点击右侧Run workflow输入设备名(r2s/r2c/r4s/r1s/r1s-h3/r1p) 再点击Run即可获取自己所需的固件 diff --git a/merge_files.sh b/merge_files.sh index 21289d9..27bf52d 100644 --- a/merge_files.sh +++ b/merge_files.sh @@ -1,5 +1,5 @@ mv $GITHUB_WORKSPACE/files ./ -if [ $DEVICE = 'r2s' ]; then +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 @@ -20,4 +20,4 @@ eval `cat .config | grep \" | head -n 10` . files/etc/opkg/distfeeds.conf | tee files/etc/opkg/distfeeds.conf echo "iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53" >> files/etc/firewall.user -echo "iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53" >> files/etc/firewall.user \ No newline at end of file +echo "iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53" >> files/etc/firewall.user diff --git a/patches.sh b/patches.sh index 7d00935..25faaf6 100644 --- a/patches.sh +++ b/patches.sh @@ -15,7 +15,7 @@ sed -i '/DEPENDS+/ s/$/ +wsdd2/' `find package/ -follow -type f -path '*/ksmbd-t sed -i 's/ +ntfs-3g/ +ntfs3-mount/' `find package/ -follow -type f -path '*/automount/Makefile'` sed -i '/skip\=/ a skip=`mount | grep -q /dev/$device; echo $?`' `find package/ -follow -type f -path */automount/files/15-automount` -if [ $DEVICE = 'r2s' ]; then +if [ $DEVICE = 'r2s' -o $DEVICE = 'r2c' ]; then sed -i 's/1400000/1450000/' target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch sed -i "s/enable '0'/enable '1'/" `find package/ -follow -type f -path '*/luci-app-oled/root/etc/config/oled'` config_file_cpufreq=`find package/ -follow -type f -path '*/luci-app-cpufreq/root/etc/config/cpufreq'` @@ -32,7 +32,7 @@ if [ $DEVICE = 'r4s' ]; then sed -i 's/r8169/r8168/' target/linux/rockchip/image/armv8.mk fi -if [[ $DEVICE =~ ('r2s'|'r4s'|'r1p') ]]; then +if [[ $DEVICE =~ ('r2s'|'r2c'|'r4s'|'r1p') ]]; then wget https://github.com/coolsnowwolf/lede/raw/757e42d70727fe6b937bb31794a9ad4f5ce98081/target/linux/rockchip/config-default -NP target/linux/rockchip/ wget https://github.com/coolsnowwolf/lede/commit/f341ef96fe4b509a728ba1281281da96bac23673.patch git apply f341ef96fe4b509a728ba1281281da96bac23673.patch