update

.github/workflows/repo-dispatcher.yml

@@ -56,7 +56,7 @@ jobs:
           -d '{"event_type": "nanopi-r4s ${{ env.SSH }}", "client_payload": {"target": "nanopi-r4s"}}'
         else
           kernel_r=$(curl -s https://op.supes.top/firmware/x86_64/version.txt | tr "\r\n" "," | cut -f 3 -d ,)
-          kernel_l=$(curl -s https://raw.githubusercontent.com/rsalvaterra/openwrt/5.10-bump/include/kernel-version.mk | grep LINUX_KERNEL_HASH-5.10* | cut -f 3 -d ' ')
+          kernel_l=$(curl -s https://raw.githubusercontent.com/openwrt/openwrt/master/include/kernel-version.mk | grep LINUX_KERNEL_HASH-5.10* | cut -f 3 -d ' ')
             if [ $kernel_r != $kernel_l ]; then
               curl \
               -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \

devices/common/diy.sh

@@ -6,8 +6,8 @@ rm -Rf feeds/custom/diy
 ./scripts/feeds install -a
 sed -i 's/Os/O2/g' include/target.mk
 rm -rf target/linux package/kernel include/{kernel-version.mk,kernel-defaults.mk}
-svn export https://github.com/rsalvaterra/openwrt/branches/5.10-bump/target/linux target/linux
-wget -O include/kernel-version.mk https://raw.githubusercontent.com/rsalvaterra/openwrt/5.10-bump/include/kernel-version.mk
+svn export https://github.com/openwrt/openwrt/trunk/target/linux target/linux
+wget -O include/kernel-version.mk https://raw.githubusercontent.com/openwrt/openwrt/master/include/kernel-version.mk
 svn export https://github.com/openwrt/openwrt/trunk/package/kernel package/kernel
 wget -O include/kernel-defaults.mk https://raw.githubusercontent.com/openwrt/openwrt/master/include/kernel-defaults.mk
 rm -Rf tools/upx && svn export https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx

devices/common/patches/opkginstall.patch

@@ -153,7 +153,7 @@
  
  	if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
  		echo "${INSTALLED_PACKAGES}" >> "$CONFFILES"
-+		echo "/etc/backup/user_installed.opkg" >> "$CONFFILES"
++		echo "${ETCBACKUP_DIR}/user_installed.opkg" >> "$CONFFILES"
  		mkdir -p "$ETCBACKUP_DIR"
  		# Avoid touching filesystem on each backup
  		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"

devices/nanopi-r4s/files/etc/board.d/99-default_network

@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013-2015 OpenWrt.org
-#
-
-. /lib/functions/uci-defaults.sh
-
-board_config_update
-
-json_is_a network object && exit 0
-
-ucidef_set_interface_wan 'eth0'
-[ -d /sys/class/net/eth1 ] && ucidef_set_interface_lan 'eth1'
-
-board_config_flush
-
-exit 0

devices/nanopi-r4s/patches/lan_wan.txt

@@ -0,0 +1,12 @@
+--- a/package/base-files/files/etc/board.d/99-default_network
++++ b/package/base-files/files/etc/board.d/99-default_network
+@@ -8,8 +8,8 @@ board_config_update
+ 
+ json_is_a network object && exit 0
+ 
+-ucidef_set_interface_lan 'eth0'
+-[ -d /sys/class/net/eth1 ] && ucidef_set_interface_wan 'eth1'
++ucidef_set_interface_wan 'eth0'
++[ -d /sys/class/net/eth1 ] && ucidef_set_interface_lan 'eth1'
+ 
+ board_config_flush