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

Merge branch 'master' of github.com:klever1988/nanopi-openwrt

Browse Source
This commit is contained in:
John Doe
2022-04-25 19:19:15 +08:00
parent fa4907c467 02b7bdf051
commit f7e6cc3ccb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,6 @@ jobs:
LOOP_DEVICE=$(losetup -f) && echo "LOOP_DEVICE=$LOOP_DEVICE" >> $GITHUB_ENV LOOP_DEVICE=$(losetup -f) && echo "LOOP_DEVICE=$LOOP_DEVICE" >> $GITHUB_ENV
sudo losetup -P --direct-io $LOOP_DEVICE lede.img sudo losetup -P --direct-io $LOOP_DEVICE lede.img
mkdir lede && sudo mount -o nossd,compress=zstd $LOOP_DEVICE lede mkdir lede && sudo mount -o nossd,compress=zstd $LOOP_DEVICE lede
[ $BRANCH != 'master' ] && BRANCH='openwrt-18.06-k5.4'
if [ -d 'lede/.git' ]; then if [ -d 'lede/.git' ]; then
cd lede && rm -f zerospace && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" cd lede && rm -f zerospace && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
git fetch && git reset --hard origin/$BRANCH && git clean -df git fetch && git reset --hard origin/$BRANCH && git clean -df

14
scripts/patches.sh
View File

@@ -83,10 +83,12 @@ sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"'
sed -i '/182.140.223.146/d;/\.cn\//d;/tencent/d' scripts/download.pl sed -i '/182.140.223.146/d;/\.cn\//d;/tencent/d' scripts/download.pl
# add r1s support to Lean's repo # add r1s support to Lean's repo
if [ $DEVICE == 'r1s' ]; then if [[ $DEVICE == 'r1s' ]]; then
cd ~ && git clone -b openwrt-21.02 https://github.com/immortalwrt/immortalwrt && cd immortalwrt cd ~ && git clone -b openwrt-21.02 https://github.com/immortalwrt/immortalwrt && cd immortalwrt
git log --grep r1s -i | grep '^commit ' | head -n -2 | cut -d' ' -f2 | tac | xargs git show | sed '0,/UENV/s//ATF/' > r1s.diff git log --grep r1s -i | grep '^commit ' | head -n -2 | cut -d' ' -f2 | tac | xargs git show | sed '0,/UENV/s//ATF/' > r1s.diff
git show 124116564e8a6081e79cb2e87b0d87b2af99c583 >> r1s.diff git show 124116564e8a6081e79cb2e87b0d87b2af99c583 >> r1s.diff
cd ~/lede && chmod +x target/linux/sunxi/base-files/etc/board.d/* && git apply ~/immortalwrt/r1s.diff cd ~/lede && chmod +x target/linux/sunxi/base-files/etc/board.d/* && git apply ~/immortalwrt/r1s.diff
wget https://github.com/immortalwrt/immortalwrt/raw/openwrt-21.02/target/linux/sunxi/cortexa53/config-5.4 -O target/linux/sunxi/cortexa53/config-5.4 echo "\nCONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=y\nCONFIG_ARM_SCPI_CPUFREQ=y" >> target/linux/sunxi/cortexa53/config-5.4
elif [[ $DEVICE == 'r2s' || $DEVICE == 'r2c' || $DEVICE == 'r1p' || $DEVICE == 'r1p-lts' ]]; then
sed -i 's/5.15/5.4/g' target/linux/rockchip/Makefile
fi fi