From 5df373e68f90861539240409fe08bf417e7dc94e Mon Sep 17 00:00:00 2001 From: ziguayungui <244753440@qq.com> Date: Wed, 10 Apr 2024 15:01:14 +0000 Subject: [PATCH 1/3] rk35xx : add routergo and nginx --- src/repositories_aarch64.conf | 6 ++++++ src/target_rk35xx.manifest | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/repositories_aarch64.conf b/src/repositories_aarch64.conf index 5dc3125..a4d56b4 100644 --- a/src/repositories_aarch64.conf +++ b/src/repositories_aarch64.conf @@ -2,6 +2,12 @@ # src/gz %n %U # src custom file:///usr/src/openwrt/bin/%T/packages +src/gz openwrt_base https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/base +src/gz openwrt_luci https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/luci +src/gz openwrt_packages https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/packages +src/gz openwrt_routing https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/routing +src/gz openwrt_telephony https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/telephony + src/gz istore_all_compat https://istore.linkease.com/repo/all/compat src/gz istore_all https://istore.linkease.com/repo/all/store src/gz istore_all_meta https://istore.linkease.com/repo/all/meta diff --git a/src/target_rk35xx.manifest b/src/target_rk35xx.manifest index 404397e..a8cc3e7 100644 --- a/src/target_rk35xx.manifest +++ b/src/target_rk35xx.manifest @@ -874,3 +874,9 @@ xz - 5.4.1-1 xz-utils - 5.4.1-1 zlib - 1.2.11-6 zram-swap - 3 +routergo - 0.12.4 +luci-app-routerdog - 1.2.4 +luci-nginx +aria2 +luci-app-aria2 +app-meta-routerdog From 8ac6fb14dbc870b88c074073bf138ea8c073c994 Mon Sep 17 00:00:00 2001 From: ziguayungui <244753440@qq.com> Date: Wed, 10 Apr 2024 16:01:10 +0000 Subject: [PATCH 2/3] build : add rk35xx rk33xx repositories file --- .github/workflows/ci.yml | 4 ++-- src/repositories_rk33xx.conf | 20 ++++++++++++++++++++ src/repositories_rk35xx.conf | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/repositories_rk33xx.conf create mode 100644 src/repositories_rk35xx.conf diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3c4d60..52aa46f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,11 +94,11 @@ jobs: cp src/target_x86_64.manifest ib/target.manifest ;; *rk35xx*) - cp src/repositories_aarch64.conf ib/repositories.conf + cp src/repositories_rk35xx.conf ib/repositories.conf cp src/target_rk35xx.manifest ib/target.manifest ;; *rk33xx*) - cp src/repositories_aarch64.conf ib/repositories.conf + cp src/repositories_rk33xx.conf ib/repositories.conf cp src/target_rk33xx.manifest ib/target.manifest ;; *bcm2711*) diff --git a/src/repositories_rk33xx.conf b/src/repositories_rk33xx.conf new file mode 100644 index 0000000..8f3d7d8 --- /dev/null +++ b/src/repositories_rk33xx.conf @@ -0,0 +1,20 @@ +## Place your custom repositories here, they must match the architecture and version. +# src/gz %n %U +# src custom file:///usr/src/openwrt/bin/%T/packages + +src/gz openwrt_base https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_generic/base +src/gz openwrt_luci https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_generic/luci +src/gz openwrt_packages https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_generic/packages +src/gz openwrt_routing https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_generic/routing +src/gz openwrt_telephony https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_generic/telephony + +src/gz istore_all_compat https://istore.linkease.com/repo/all/compat +src/gz istore_all https://istore.linkease.com/repo/all/store +src/gz istore_all_meta https://istore.linkease.com/repo/all/meta +src/gz istore_all_nas_luci https://istore.linkease.com/repo/all/nas_luci +src/gz istore_nas https://istore.linkease.com/repo/aarch64_cortex-a53/nas + +## This is the local package repository, do not remove! +src imagebuilder file:packages + +# option check_signature diff --git a/src/repositories_rk35xx.conf b/src/repositories_rk35xx.conf new file mode 100644 index 0000000..a4d56b4 --- /dev/null +++ b/src/repositories_rk35xx.conf @@ -0,0 +1,20 @@ +## Place your custom repositories here, they must match the architecture and version. +# src/gz %n %U +# src custom file:///usr/src/openwrt/bin/%T/packages + +src/gz openwrt_base https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/base +src/gz openwrt_luci https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/luci +src/gz openwrt_packages https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/packages +src/gz openwrt_routing https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/routing +src/gz openwrt_telephony https://downloads.openwrt.org/releases/22.03.6/packages/aarch64_cortex-a53/telephony + +src/gz istore_all_compat https://istore.linkease.com/repo/all/compat +src/gz istore_all https://istore.linkease.com/repo/all/store +src/gz istore_all_meta https://istore.linkease.com/repo/all/meta +src/gz istore_all_nas_luci https://istore.linkease.com/repo/all/nas_luci +src/gz istore_nas https://istore.linkease.com/repo/aarch64_cortex-a53/nas + +## This is the local package repository, do not remove! +src imagebuilder file:packages + +# option check_signature From 0623e38c09d0929fa52ee5d086d44465f170e3a2 Mon Sep 17 00:00:00 2001 From: ziguayungui <244753440@qq.com> Date: Wed, 10 Apr 2024 16:08:47 +0000 Subject: [PATCH 3/3] build: sync ci to build.sh --- docker/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/build.sh b/docker/build.sh index f967f77..f6cb902 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -48,11 +48,11 @@ if [ "$IB_FOUND" = "0" ]; then cp src/target_x86_64.manifest ib/target.manifest ;; *rk35xx*) - cp src/repositories_aarch64.conf ib/repositories.conf + cp src/repositories_rk35xx.conf ib/repositories.conf cp src/target_rk35xx.manifest ib/target.manifest ;; *rk33xx*) - cp src/repositories_aarch64.conf ib/repositories.conf + cp src/repositories_rk33xx.conf ib/repositories.conf cp src/target_rk33xx.manifest ib/target.manifest ;; *bcm2711*)