update

kiddin9 · May 31, 2023 · 04756cd · 04756cd
1 parent 7d7f735
commit 04756cd
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 24 deletions.
diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
@@ -103,10 +103,8 @@ jobs:
     - name: Trigger Packages Update
       continue-on-error: true
       run: |
-        gitdate=$(curl -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].created_at')
-        gitdate=$(date -d "$gitdate" +%s)
-        now=$(date -d "$(date)" +%s)
-        if [[ $(expr $gitdate + 300) < $now ]]; then
+        status=$(curl -H "Authorization: token ${{ secrets.REPO_TOKEN }} -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
+        if [[ "$status" == "completed" ]]; then
           curl -X POST https://api.github.com/repos/kiddin9/openwrt-packages/dispatches \
             -H "Accept: application/vnd.github.everest-preview+json" \
             -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \

diff --git a/devices/ipq50xx_arm/diy.sh b/devices/ipq50xx_arm/diy.sh
@@ -4,7 +4,7 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-rm -rf package/feeds/kiddin9/rtl* feeds/kiddin9/{shortcut-fe,fullconenat-nft} package/kernel/mt76 package/kernel/exfat package/feeds/packages/fuse*
+rm -rf package/feeds/kiddin9/rtl* feeds/kiddin9/{shortcut-fe,fullconenat-nft} package/kernel/mt76 package/kernel/exfat package/feeds/packages/fuse* package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci
 
 rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
@@ -13,4 +13,5 @@ rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/fe
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
-ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
+#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
diff --git a/devices/ipq50xx_arm/feeds.conf b/devices/ipq50xx_arm/feeds.conf
@@ -1,4 +1,4 @@
 src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
-src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
+src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
diff --git a/devices/ipq807x_ipq60xx/diy.sh b/devices/ipq807x_ipq60xx/diy.sh
@@ -35,9 +35,10 @@ rm -rf package/kernel/exfat
 
 rm -rf devices/common/patches/{glinet,fix.patch,iptables.patch,targets.patch,kernel-defaults.patch,disable_flock.patch}
 
-rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
+rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl  package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci
 
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
-ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
+#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
diff --git a/devices/ipq807x_ipq60xx/feeds.conf b/devices/ipq807x_ipq60xx/feeds.conf
@@ -1,5 +1,5 @@
 src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
-src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
+src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
 src-git gl_feeds_common https://github.com/gl-inet/gl-feeds.git;common

diff --git a/devices/mediatek_mt7981/diy.sh b/devices/mediatek_mt7981/diy.sh
@@ -10,9 +10,10 @@ rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,ta
 
 sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2024-12-06/" package/network/config/netifd/Makefile
 
-rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
+rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci
 
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
-ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
+#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
diff --git a/devices/mediatek_mt7981/feeds.conf b/devices/mediatek_mt7981/feeds.conf
@@ -1,4 +1,4 @@
 src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
-src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
+src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
diff --git a/devices/mediatek_mt7986/diy.sh b/devices/mediatek_mt7986/diy.sh
@@ -10,9 +10,10 @@ sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2024-12-06/" package/network/conf
 
 rm -rf devices/common/patches/{glinet,fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
-rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
+rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci
 
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
-ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
+#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
diff --git a/devices/mediatek_mt7986/feeds.conf b/devices/mediatek_mt7986/feeds.conf
@@ -1,4 +1,4 @@
 src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
-src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
+src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
diff --git a/devices/rockchip_armv8/patches/r6s.patch b/devices/rockchip_armv8/patches/r6s.patch
@@ -35,12 +35,13 @@
 
 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
 +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-@@ -19,9 +19,13 @@ rockchip_setup_interfaces()
+@@ -19,9 +19,14 @@ rockchip_setup_interfaces()
  	rocktech,mpc1903|\
  	sharevdi,guangmiao-g4c|\
  	xunlong,orangepi-r1-plus|\
 -	xunlong,orangepi-r1-plus-lts)
 +	xunlong,orangepi-r1-plus-lts|\
++	friendlyarm,nanopc-t6|\
 +	friendlyarm,nanopi-r6c)
  		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
  		;;
@@ -72,7 +73,7 @@
 +		wan_mac=$(nanopi_get_mac wan 2-0051)
 +		lan_mac=$(nanopi_get_mac lan 2-0051)
 +		;;
-+	friendlyarm,nanopi-r6s|friendlyarm,nanopi-r6c)
++	friendlyarm,nanopi-r6s|friendlyarm,nanopi-r6c|friendlyarm,nanopc-t6)
 +		wan_mac=$(nanopi_get_mac wan 6-0053)
 +		lan_mac=$(nanopi_get_mac lan 6-0053)
  		;;
@@ -81,18 +82,22 @@
 
 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
 +++ a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
-@@ -30,6 +30,15 @@ friendlyarm,nanopi-r5s)
+@@ -30,6 +30,19 @@ friendlyarm,nanopi-r5s)
  hinlink,opc-h68k)
  	ucidef_set_led_netdev "wan" "WAN" "blue:net" "eth0"
  	;;
 +friendlyarm,nanopi-r6s)
-+	ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth2" "link"
-+	ucidef_set_led_netdev "lan1" "LAN1" "lan1_led" "eth1" "link"
-+	ucidef_set_led_netdev "lan2" "LAN2" "lan2_led" "eth0" "link"
++	ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth2"
++	ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth1"
++	ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth0"
 +	;;
 +friendlyarm,nanopi-r6c)
-+	ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth0" "link"
-+	ucidef_set_led_netdev "lan1" "LAN1" "lan1_led" "eth1" "link"
++	ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
++	ucidef_set_led_netdev "lan1" "LAN1" "green:lan" "eth1"
++	;;
++friendlyarm,nanopc-t6)
++	ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
++	ucidef_set_led_netdev "lan1" "LAN1" "green:lan" "eth1"
 +	;;
  esac