update 20231129

.github/workflows/cloud-n1-openwrt.yaml

@@ -18,7 +18,7 @@ env:
   CONFIG_SH: config.sh
   UPLOAD_FIRMWARE: true
   TZ: Asia/Shanghai
-  KERNEL_VERSION: 6.1.57
+  KERNEL_VERSION: 6.1.63
 
 jobs:
   build_openwrt:
@@ -33,7 +33,7 @@ jobs:
         # this might remove tools that are actually needed,
         # if set to "true" but frees about 6 GB
         tool-cache: true
-        
+
         # all of these default to true, but feel free to set to
         # "false" if necessary for your workflow
         android: true

README.md

@@ -1,31 +1,6 @@
 # 云编译 N1 OpenWrt 固件
 
-**更新日志**
-- 20231015 更新内核版本 6.1.57，集成 `PassWall`
-- 20231013 更新截图
-- 20231009 更新内核版本 6.1.56
-- 20230915 修正 Github Action 空间不足导致的打包失败，更新内核版本 6.1.52
-- 20230619 修正 Github Action 空间不足导致的打包失败，更新内核版本 6.1.34
-- 20230525 更新配置
-- 20230523 更新配置
-- 20230211 修正 `set-output` 有效性造成的编译错误，更新内核版本 6.1.10
-- 20230118 更新内核版本 6.1.6
-- 20221031 更新内核版本 6.0.6
-- 20220917 更新配置
-- 20220814 更新内核版本 5.19.1
-- 20220731 更新内核版本 5.18.15
-- 20220620 更新内核版本 5.18.5
-- 20220509 更新配置，更新内核版本 5.17.5
-- 20220428 添加自动打包命令，生成刷机固件
-- 20220427 更新配置，Release 默认保留3个
-- 20220426 更新依赖安装命令，更新配置
-- 20210827 更新配置，具体功能见截图
-- 20210210 修正源码更新造成的编译错误，集成 `docker`。脚本文件调整
-- 20201124 修正 `set-env` 有效性造成的编译错误
-- 20200926 修正 `openclash` 编译错误
-- 20200727 `docker` 兼容性造成编译错误，暂不集成
-
-说明：
+**说明**：
 - 本项目使用 Github Actions 下载 [Lean](https://github.com/coolsnowwolf/lede) 的 `Openwrt` 源码仓库，进行云编译。
 - 本项目使用定时编译（北京时间每周日下午4点开始自动运行编译）及触发编译（更新 `README.md`、 `script.sh`、 `config.sh`后可开始编译）两种方式。
 - 本项目编译固件适配斐讯 N1 盒子，如需刷机，可直接下载 [releases](https://github.com/huangqian8/Cloud-N1-OpenWrt/releases/latest) 内固件。
@@ -38,11 +13,10 @@
   - [x] 编译 `Docker`
   - [x] 编译 `OpenVPN Server`
   - [x] 编译 `PassWall`
-  - [x] 编译 `ZeroTier`
+  - [x] 编译 `Wireguard`
   - [x] 添加主题 `opentomacat` 并设置为默认
   - [x] 添加第三方插件 `luci-app-adguardhome`
   - [x] 添加第三方插件 `luci-app-amlogic`
-  - [x] 添加第三方插件 `luci-app-vssr`
   - [x] 添加第三方插件 `luci-app-openclash`
 
 **精简项**：
@@ -55,6 +29,32 @@
   - [x] luci-app-upnp
   - [x] luci-app-vsftpd
 
+**更新日志**:
+- 20231129 更新内核版本 6.1.63，删除失效的插件
+- 20231015 更新内核版本 6.1.57，集成 `PassWall`
+- 20231013 更新截图
+- 20231009 更新内核版本 6.1.56
+- 20230915 修正 Github Action 空间不足导致的打包失败，更新内核版本 6.1.52
+- 20230619 修正 Github Action 空间不足导致的打包失败，更新内核版本 6.1.34
+- 20230525 更新配置
+- 20230523 更新配置
+- 20230211 修正 `set-output` 有效性造成的编译错误，更新内核版本 6.1.10
+- 20230118 更新内核版本 6.1.6
+- 20221031 更新内核版本 6.0.6
+- 20220917 更新配置
+- 20220814 更新内核版本 5.19.1
+- 20220731 更新内核版本 5.18.15
+- 20220620 更新内核版本 5.18.5
+- 20220509 更新配置，更新内核版本 5.17.5
+- 20220428 添加自动打包命令，生成刷机固件
+- 20220427 更新配置，Release 默认保留3个
+- 20220426 更新依赖安装命令，更新配置
+- 20210827 更新配置，具体功能见截图
+- 20210210 修正源码更新造成的编译错误，集成 `docker`。脚本文件调整
+- 20201124 修正 `set-env` 有效性造成的编译错误
+- 20200926 修正 `openclash` 编译错误
+- 20200727 `docker` 兼容性造成编译错误，暂不集成
+
 **界面截图**：
 
 ![N1_OpenWRT.png](https://github.com/huangqian8/Cloud-N1-OpenWrt/blob/main/snapshot.jpeg)

config.sh

@@ -66,6 +66,7 @@ CONFIG_PACKAGE_cgroupfs-mount=y
 CONFIG_PACKAGE_chattr=y
 CONFIG_PACKAGE_containerd=y
 CONFIG_PACKAGE_coreutils-nohup=y
+# CONFIG_PACKAGE_diffutils is not set
 CONFIG_PACKAGE_docker=y
 CONFIG_PACKAGE_dockerd=y
 CONFIG_PACKAGE_dosfstools=y
@@ -121,6 +122,7 @@ CONFIG_PACKAGE_kmod-ip6tables=y
 CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
 CONFIG_PACKAGE_kmod-ipt-iprange=y
 CONFIG_PACKAGE_kmod-ipt-nat6=y
+CONFIG_PACKAGE_kmod-ipt-physdev=y
 CONFIG_PACKAGE_kmod-ipt-socket=y
 CONFIG_PACKAGE_kmod-iptunnel=y
 CONFIG_PACKAGE_kmod-iptunnel4=y
@@ -172,7 +174,6 @@ CONFIG_PACKAGE_libminiupnpc=y
 CONFIG_PACKAGE_libmount=y
 CONFIG_PACKAGE_libnatpmp=y
 CONFIG_PACKAGE_libncurses=y
-CONFIG_PACKAGE_libnetwork=y
 CONFIG_PACKAGE_libparted=y
 CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_libruby=y
@@ -186,7 +187,6 @@ CONFIG_PACKAGE_losetup=y
 CONFIG_PACKAGE_lsattr=y
 CONFIG_PACKAGE_lsblk=y
 CONFIG_PACKAGE_lua-cjson=y
-CONFIG_PACKAGE_lua-maxminddb=y
 CONFIG_PACKAGE_luasocket=y
 # CONFIG_PACKAGE_luci-app-accesscontrol is not set
 CONFIG_PACKAGE_luci-app-adguardhome=y
@@ -207,11 +207,13 @@ CONFIG_PACKAGE_luci-app-dockerman=y
 CONFIG_PACKAGE_luci-app-openclash=y
 CONFIG_PACKAGE_luci-app-openvpn-server=y
 CONFIG_PACKAGE_luci-app-passwall=y
+# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Libev_Server is not set
 CONFIG_PACKAGE_luci-app-passwall_Iptables_Transparent_Proxy=y
 # CONFIG_PACKAGE_luci-app-rclone_INCLUDE_rclone-ng is not set
 # CONFIG_PACKAGE_luci-app-rclone_INCLUDE_rclone-webui is not set
 # CONFIG_PACKAGE_luci-app-ssr-plus is not set
 # CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ChinaDNS_NG is not set
+# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_MosDNS is not set
 # CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Client is not set
 # CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Simple_Obfs is not set
 # CONFIG_PACKAGE_luci-app-turboacc is not set
@@ -221,27 +223,21 @@ CONFIG_PACKAGE_luci-app-passwall_Iptables_Transparent_Proxy=y
 # CONFIG_PACKAGE_luci-app-unblockmusic_INCLUDE_UnblockNeteaseMusic_Go is not set
 # CONFIG_PACKAGE_luci-app-upnp is not set
 # CONFIG_PACKAGE_luci-app-vsftpd is not set
-CONFIG_PACKAGE_luci-app-vssr=y
-CONFIG_PACKAGE_luci-app-vssr_INCLUDE_Kcptun=y
-# CONFIG_PACKAGE_luci-app-vssr_INCLUDE_ShadowsocksR_Libev_Server is not set
 CONFIG_PACKAGE_luci-app-webadmin=y
 CONFIG_PACKAGE_luci-app-wireguard=y
-CONFIG_PACKAGE_luci-app-zerotier=y
-CONFIG_PACKAGE_luci-compat=y
 CONFIG_PACKAGE_luci-i18n-aliyundrive-webdav-zh-cn=y
 CONFIG_PACKAGE_luci-i18n-amlogic-zh-cn=y
 CONFIG_PACKAGE_luci-i18n-docker-zh-cn=y
 CONFIG_PACKAGE_luci-i18n-dockerman-zh-cn=y
 CONFIG_PACKAGE_luci-i18n-openvpn-server-zh-cn=y
 CONFIG_PACKAGE_luci-i18n-passwall-zh-cn=y
-CONFIG_PACKAGE_luci-i18n-vssr-zh-cn=y
 CONFIG_PACKAGE_luci-i18n-webadmin-zh-cn=y
 CONFIG_PACKAGE_luci-i18n-wireguard-zh-cn=y
-CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
 CONFIG_PACKAGE_luci-lib-docker=y
 CONFIG_PACKAGE_luci-proto-ipv6=y
 CONFIG_PACKAGE_luci-proto-wireguard=y
 CONFIG_PACKAGE_luci-theme-opentomcat=y
+# CONFIG_PACKAGE_mosdns is not set
 CONFIG_PACKAGE_mount-utils=y
 CONFIG_PACKAGE_odhcp6c=y
 CONFIG_PACKAGE_odhcp6c_ext_cer_id=0
@@ -310,6 +306,7 @@ CONFIG_PACKAGE_trojan-plus=y
 CONFIG_PACKAGE_ttyd=y
 CONFIG_PACKAGE_unzip=y
 CONFIG_PACKAGE_uuidgen=y
+# CONFIG_PACKAGE_v2dat is not set
 CONFIG_PACKAGE_v2ray-plugin=y
 CONFIG_PACKAGE_wireguard-tools=y
 CONFIG_PACKAGE_wireless-regdb=y
@@ -320,6 +317,7 @@ CONFIG_PACKAGE_xfs-mkfs=y
 CONFIG_PACKAGE_xray-plugin=y
 CONFIG_PACKAGE_xz=y
 CONFIG_PACKAGE_xz-utils=y
+# CONFIG_PACKAGE_yq is not set
 CONFIG_PACKAGE_zerotier=y
 CONFIG_PARTED_READLINE=y
 CONFIG_PERL_NOCOMMENT=y
@@ -341,6 +339,15 @@ CONFIG_boost-compile-visibility-hidden=y
 CONFIG_boost-runtime-shared=y
 CONFIG_boost-static-and-shared-libs=y
 CONFIG_boost-variant-release=y
+# CONFIG_DOCKER_OPTIONAL_FEATURES is not set
+# CONFIG_KERNEL_ARM_PMU is not set
+# CONFIG_KERNEL_CFQ_GROUP_IOSCHED is not set
+# CONFIG_KERNEL_CGROUP_HUGETLB is not set
+# CONFIG_KERNEL_CGROUP_PERF is not set
+# CONFIG_KERNEL_HUGETLBFS is not set
+# CONFIG_KERNEL_HUGETLB_PAGE is not set
+# CONFIG_KERNEL_MEMCG_SWAP_ENABLED is not set
+# CONFIG_KERNEL_PERF_EVENTS is not set
 CONFIG_PACKAGE_grub2-efi-arm=y
 # CONFIG_PACKAGE_kmod-crypto-kpp is not set
 CONFIG_PACKAGE_kmod-fs-vfat=y
@@ -354,7 +361,9 @@ CONFIG_PACKAGE_lua-neturl=y
 # CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE_CM is not set
 CONFIG_PACKAGE_luci-lib-ipkg=y
 CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_pdnsd-alt=y
 CONFIG_PACKAGE_shadowsocks-rust-ssserver=y
+CONFIG_PACKAGE_shadowsocksr-libev-ssr-check=y
 CONFIG_PACKAGE_vsftpd-alt=y
 CONFIG_VSFTPD_USE_UCI_SCRIPTS=y
 EOF

script.sh

@@ -20,6 +20,7 @@ rm -rf theme-temp
 default_theme='opentomcat'
 sed -i "s/bootstrap/$default_theme/g" feeds/luci/modules/luci-base/root/etc/config/luci
 
+<<COMMENT
 # Add luci-app-vssr
 git clone https://github.com/jerrykuku/lua-maxminddb.git package-temp/lua-maxminddb
 git clone https://github.com/jerrykuku/luci-app-vssr.git package-temp/luci-app-vssr
@@ -28,6 +29,7 @@ cp -r package-temp/small/* package/lean/
 mv -f package-temp/lua-maxminddb package/lean/
 mv -f package-temp/luci-app-vssr package/lean/
 rm -rf package-temp
+COMMENT
 
 # Add luci-app-amlogic
 git clone https://github.com/ophub/luci-app-amlogic.git  package-temp/luci-app-amlogic