2021-05-07 Always get latest version of vpn-policy-routing package

           Remove watchdog (does not work)

Author: anaelorlinski

.github/workflows/NanoPi-r2s-21.02.yml

@@ -128,7 +128,8 @@ jobs:
         run: |
           echo "TZ=Europe/Paris" >>$GITHUB_ENV
           echo "Build_Date=$(date +%Y-%m-%d %H:%M)" >> $GITHUB_ENV
-          echo "RELTAG=v$(date +'%Y%m%d.%H%M')" >> $GITHUB_ENV
+          echo "RELTAG=$(date +'%Y%m%d.%H%M')" >> $GITHUB_ENV
+          echo "RELDATE=$(date +'%Y.%m.%d')" >> $GITHUB_ENV
       
       - name: Organize files
         id: organize
@@ -138,15 +139,17 @@ jobs:
           mv build/openwrt/bin/targets/rockchip/armv8/*sysupgrade.img* ./artifact/
           cd ./artifact/
           ls -Ahl
+          mv openwrt-rockchip-armv8-friendlyarm_nanopi-r2s-ext4-sysupgrade.img.gz OpenWrt-AO-21.02-$RELTAG-NanoPi-r2s-ext4.img.gz
+          mv openwrt-rockchip-armv8-friendlyarm_nanopi-r2s-squashfs-sysupgrade.img.gz OpenWrt-AO-21.02-$RELTAG-NanoPi-r2s-squashfs.img.gz
+          mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-ext4-sysupgrade.img.gz OpenWrt-AO-21.02-$RELTAG-NanoPi-r4s-ext4.img.gz
+          mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-squashfs-sysupgrade.img.gz OpenWrt-AO-21.02-$RELTAG-NanoPi-r4s-squashfs.img.gz
           gzip -d *.gz && exit 0
           gzip --best *.img
           ls -Ahl
-          sha256sum openwrt*r2s* | tee NanoPI-R2S-AO-$RELTAG-21.02.sha256sum
-          sha256sum openwrt*r4s* | tee NanoPI-R4S-AO-$RELTAG-21.02.sha256sum
-          zip NanoPI-R2S-AO-$RELTAG-21.02-ext4.zip *r2s*ext4*
-          zip NanoPI-R2S-AO-$RELTAG-21.02-sfs.zip *r2s*squashfs*
-          zip NanoPI-R4S-AO-$RELTAG-21.02-ext4.zip *r4s*ext4*
-          zip NanoPI-R4S-AO-$RELTAG-21.02-sfs.zip *r4s*squashfs* 
+          zip OpenWrt-AO-21.02-$RELTAG-NanoPi-r2s-ext4.zip *r2s*ext4*
+          zip OpenWrt-AO-21.02-$RELTAG-NanoPi-r2s-squashfs.zip *r2s*squashfs*
+          zip OpenWrt-AO-21.02-$RELTAG-NanoPi-r4s-ext4.zip *r4s*ext4*
+          zip OpenWrt-AO-21.02-$RELTAG-NanoPi-r4s-squashfs.zip *r4s*squashfs* 
           cp ../build/openwrt/*.config ./
           ls -Ahl
       - name: Upload artifact
@@ -161,11 +164,11 @@ jobs:
         uses: ncipollo/release-action@v1.8.4
         if: env.UPLOAD_RELEASE == 'true' && !cancelled()
         with:
-          name: OpenWrt 21.02
+          name: OpenWrt 21.02 ${{ env.RELDATE }} 
           allowUpdates: true
-          tag: r2s-21.02
+          tag: r2s-21.02-${{ env.RELDATE }}
           commit: main
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
           bodyFile: "release-info-r2s-21.02.md"
-          artifacts: ./artifact/*.zip,./artifact/*.config,./artifact/*.sha256sum
+          artifacts: ./artifact/*.zip

CHANGELOG.md

@@ -0,0 +1,5 @@
+
+
+2021-05-07 Always get latest version of vpn-policy-routing package
+           Remove watchdog (does not work) 
+2021-04-29 Add more packages, add snd-usb-caiaq module

README.md

@@ -4,13 +4,19 @@
 
 ##### Download: [Releases](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases) or [Actions](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/actions) \(Login Needed\)
 - - -
-## Introduction
-- ### Config
-OpenWRT 21.02 / Kernel 5.4 / NanoPi r2s/r4s patches / r8168 ethernet driver<br/>
+### Introduction
+Those are my customized builds of OpenWrt for FriendlyARM NanoPi R2S / R4S
+
+### Config
+- OpenWRT 21.02 Vanilla / Kernel 5.4
+- Some ImmortalWRT patches for Rockchip target NanoPi R2S (rk3328) / NanoPi R4S support (rk3399) (avoiding the ones creating kernel oopses)
+- NanoPi R2S : r8152 driver v1.11.11 backport from kernel 5.10 + realtek r8169 firmwares package
+- NanoPi R4S : r8168 driver for R4S (realtek) instead of kernel r8169 + r8169 firmwares package
+
+### Applications
+- A useful set of applications from official OpenWrt package feed
+- vpn-routing-policy latest version from https://github.com/stangri/source.openwrt.melmac.net
 
-- ### Applications
-  Only applications from official OpenWrt package feed
-- - -
 
 ### Thanks to Original Project:
 - [quintus-lab](https://github.com/quintus-lab/OpenWRT-Rockchip)

local-scripts/build_r2s.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+#!/bin/bash
+ROOTDIR=$(pwd)
+echo $ROOTDIR
+if [ ! -e "$ROOTDIR/build" ]; then
+    echo "Please run from root / no build dir"
+    exit 1
+fi
+
+BUILDDIR="$ROOTDIR/build"
+cd $BUILDDIR
+
+# update instead of cloning
+cd $BUILDDIR/openwrt-fresh-2102
+git pull
+cd $BUILDDIR/immortal-fresh-2102
+git pull
+
+cd $ROOTDIR
+echo -n "Step 02...\n------------------------------"
+./steps/02_prepare_openwrt_folder_2102.sh
+echo -n "Step 03...\n------------------------------"
+./steps/r2s/03_patch_openwrt_2102.sh
+echo -n "Step 04...\n------------------------------"
+./steps/04-prepare_package.sh
+echo -n "Step 05...\n------------------------------"
+./steps/05-create_luci_acl.sh
+echo -n "Step 06...\n------------------------------"
+./steps/06-create_config_from_seed.sh
+
+cd $BUILDDIR/openwrt
+make -j 12
+
+

patches/kernel-5.4/995-watchdog-rk3328.patch

@@ -26,5 +26,22 @@ index bbdb19a3e..1e3e1086e 100644
  		reg = <0x0 0xff1a0000 0x0 0x100>;
  		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru PCLK_WDT>;
++		status = "disabled";
+ 	};
 -- 
-2.11.0
+2.11.0
+
+--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+@@ -416,6 +416,10 @@
+ 	status = "okay";
+ };
+ 
++&wdt {
++	status = "okay";
++};
++
+ &usbdrd3 {
+ 	status = "okay";
+ };
+-- 

seed/ao.seed

@@ -389,6 +389,7 @@ CONFIG_PACKAGE_tinyproxy=y
 CONFIG_PACKAGE_uclibcxx=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
+CONFIG_PACKAGE_vpn-policy-routing=y
 CONFIG_PACKAGE_wget-ssl=y
 CONFIG_PACKAGE_wireguard-tools=y
 CONFIG_PACKAGE_wireless-regdb=y

steps/04-prepare_package.sh

@@ -10,7 +10,24 @@ cd "$ROOTDIR/build"
 
 # install feeds
 cd openwrt
-./scripts/feeds update -a && ./scripts/feeds install -a
+
+# add stangri repo source from github
+sed -i '/stangri_repo/d' feeds.conf.default
+! grep -q 'stangri_repo' feeds.conf.default && sed -i '5 i\src-git stangri_repo https://github.com/stangri/source.openwrt.melmac.net' feeds.conf.default
+
+./scripts/feeds update -a
+./scripts/feeds install -a -p packages
+./scripts/feeds install -a -p luci
+./scripts/feeds install -a -p routing
+./scripts/feeds install -a -p telephony
+
+# replace vpn routing packages
+./scripts/feeds uninstall vpn-policy-routing
+./scripts/feeds install -p stangri_repo vpn-policy-routing
+
+# this does not work
+#./scripts/feeds uninstall luci-app-vpn-policy-routing
+#./scripts/feeds install -p stangri_repo luci-app-vpn-policy-routing
 
 # Time stamp with $Build_Date=$(date +%Y.%m.%d)
 echo -e '\nAO Build@'$(date "+%Y.%m.%d")'\n'  >> package/base-files/files/etc/banner

steps/r2s/03_patch_openwrt_2102.sh

@@ -94,10 +94,11 @@ cp $BUILDDIR/immortal-fresh-$IMMORTAL_SUFFIX/package/libs/mbedtls/patches/100-Im
    package/libs/mbedtls/patches/
 
 # enable watchdog
-sed -i 's/# CONFIG_WATCHDOG is not set/CONFIG_WATCHDOG=y/' target/linux/rockchip/armv8/config-5.4
-sed -i '/CONFIG_WATCHDOG=y/a CONFIG_DW_WATCHDOG=y' target/linux/rockchip/armv8/config-5.4
-cp $ROOTDIR/patches/kernel-5.4/995-watchdog-rk3328.patch target/linux/rockchip/patches-5.4/
-cp $ROOTDIR/patches/kernel-5.4/996-watchdog-rk3399.patch target/linux/rockchip/patches-5.4/
+#sed -i 's/# CONFIG_WATCHDOG is not set/CONFIG_WATCHDOG=y/' target/linux/rockchip/armv8/config-5.4
+#sed -i '/CONFIG_WATCHDOG=y/a CONFIG_DW_WATCHDOG=y' target/linux/rockchip/armv8/config-5.4
+#cp $ROOTDIR/patches/kernel-5.4/995-watchdog-rk3328.patch target/linux/rockchip/patches-5.4/
+#cp $ROOTDIR/patches/kernel-5.4/996-watchdog-rk3399.patch target/linux/rockchip/patches-5.4/
+#cp $ROOTDIR/patches/kernel-5.4/997-clk-rk3328.patch target/linux/rockchip/patches-5.4/
 
 # enable crypto
 if ! grep -q "0002-kernel-crypto.addon" target/linux/rockchip/armv8/config-5.4; then