根据运行结果，修复测试序列

1. wrtbwmon 只在 lede 中有，从 both 移动到 lean's lede 序列。 2. luci-app-easymesh 依赖 mesh-wolfssl，与默认勾选的 basic-wolfssl 冲突，在序列中指定。 3. kenzok8 中没有 luci-app-gost 4. banip 已被标记为 broken openwrt/luci@8837f76 5. luci-app-unblockneteasemusic 依赖 node，node 依赖 fpu。换用 maxlicheng/luci-app-unblockmusic。 6. luci-app-dockerman 上游有架构限制，lean's lede 去掉了，我也试一下。 P.S. 据研究，github可能对 tmate 有限制，一个小时会关机 mxschmitt/action-tmate#99 (comment)
1-1-2 · Jul 15, 2022 · 936fa8c · 936fa8c
1 parent b20a0c2
commit 936fa8c
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 16 deletions.
diff --git a/.log/## luci-app-unblockneteasemusic.txt b/.log/## luci-app-unblockneteasemusic.txt
@@ -0,0 +1,64 @@
+## luci-app-unblockneteasemusic
+
+Source-Makefile: package/feeds/kenzo/luci-app-unblockneteasemusic/Makefile
+Build-Depends: lua/host luci-base/host LUCI_CSSTIDY:csstidy/host LUCI_SRCDIET:luasrcdiet/host
+
+Package: luci-app-unblockneteasemusic
+Submenu: 3. Applications
+Version: 2.13
+Depends: +libc +USE_GLIBC:librt +USE_GLIBC:libpthread +busybox +dnsmasq-full +ipset +jsonfilter +node +uclient-fetch +PACKAGE_firewall4:ucode @(PACKAGE_libustream-mbedtls||PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl)
+Conflicts:
+Menu-Depends:
+Provides:
+Section: luci
+Category: LuCI
+Repository: kenzo
+Title: LuCI support for UnblockNeteaseMusic
+Maintainer: OpenWrt LuCI community
+Source:
+Type: ipkg
+Description: LuCI support for UnblockNeteaseMusic
+https://github.com/openwrt/luci
+OpenWrt LuCI community
+
+62180 config PACKAGE_luci-app-unblockneteasemusic
+62181 tristate "luci-app-unblockneteasemusic........ LuCI support for UnblockNeteaseMusic"
+62182 default y if DEFAULT_luci-app-unblockneteasemusic
+62183 default m if ALL
+62184 select PACKAGE_ucode if PACKAGE_firewall4
+62185 select PACKAGE_librt if USE_GLIBC
+62186 depends on HAS_FPU
+62187 select PACKAGE_jsonfilter
+62188 depends on (PACKAGE_libustream-mbedtls||PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl)
+62189 select PACKAGE_libc
+62190 depends on (i386||x86_64||arm||aarch64||mipsel)
+62191 select PACKAGE_node
+62192 select PACKAGE_libpthread if USE_GLIBC
+62193 select PACKAGE_dnsmasq-full
+62194 select PACKAGE_busybox if PACKAGE_busybox-selinux<PACKAGE_luci-app-unblockneteasemusic
+62195 select PACKAGE_uclient-fetch
+62196 select PACKAGE_ipset
+62197 help
+62198 LuCI support for UnblockNeteaseMusic
+62199 https://github.com/openwrt/luci
+62200 OpenWrt LuCI community
+
+Symbol: PACKAGE_UnblockNeteaseMusic [=n]
+Type : tristate
+Defined at tmp/.config-package.in:97432
+ Prompt: UnblockNeteaseMusic.................. Revive Netease Cloud Music (NodeJS)
+ Depends on: (i386 [=n] || x86_64 [=n] || arm [=n] || aarch64 [=n] || mipsel [=y]) && HAS_FPU [=n]
+ Location:
+(1) -> Multimedia
+Selects: PACKAGE_libc [=y] && PACKAGE_libpthread [=y] && PACKAGE_librt [=y] && PACKAGE_node [=n]
+
+
+Symbol: PACKAGE_luci-app-unblockneteasemusic [=n]
+Type : tristate
+Defined at tmp/.config-package.in:62180
+ Prompt: luci-app-unblockneteasemusic........ LuCI support for UnblockNeteaseMusic
+ Depends on: HAS_FPU [=n] && (PACKAGE_libustream-mbedtls [=n] || PACKAGE_libustream-openssl [=n] || PACKAGE_libustream-wolfssl [=y]) && (i386 [=n] || x86_64 [=n] || arm [=n] || aarch64 [=n] || mipsel [=y])
+ Location:
+ -> LuCI
+(2) -> 3. Applications
+Selects: PACKAGE_ucode [=y] && PACKAGE_librt [=y] && PACKAGE_jsonfilter [=y] && PACKAGE_libc [=y] && PACKAGE_node [=n] && PACKAGE_libpthread [=y] && PACKAGE_dnsmasq-full [=y] && PACKAGE_busybox [=y] && PACKAGE_uclient-fetch [=y]
diff --git a/diy-part2/OpenWrt-Configurator-32M.sh b/diy-part2/OpenWrt-Configurator-32M.sh
@@ -22,18 +22,21 @@ EOF
 
 modification() {
  # 一些可能必要的修改
- echo '尝试更换 luci-app-clash 的依赖 openssl 为 wolfssl 看能不能通过编译'
+ echo '[MOD]更换 luci-app-clash 的依赖 openssl 为 wolfssl'
  find -type f -path '*/luci-app-clash/Makefile' -print -exec sed -i 's/openssl/wolfssl/w /dev/stdout' {} \;
 
- echo '尝试更换 luci-app-easymesh 的依赖 openssl 为 wolfssl 看能不能通过编译'
+ echo '[MOD]更换 luci-app-easymesh 的依赖 openssl 为 wolfssl'
  find -type f -path '*/luci-app-easymesh/Makefile' -print -exec sed -i 's/openssl/wolfssl/w /dev/stdout' {} \;
+
+ echo '[MOD]除去 luci-app-dockerman 的架构限制'
+ find -type f -path '*/luci-app-dockerman/Makefile' -print -exec sed -i 's#^.*LUCI_DEPENDS.*$#LUCI_DEPENDS:=\\#w /dev/stdout' {} \;
 }
 
 add_packages(){
  #=========================================
  # 两种方式（没有本质上的区别）：
  # M1. 从别的(类)OpenWrt源码仓库部分借用，放到feeds文件夹(通常为feeds/luci)
- # M2. 拉取专门的luci包到package文件夹
+ # M2. 拉取专门的luci包到package文件夹（注意 /package 与 /feeds/packages 的区别）
  # M3. 修正语言名（zh-cn -> zh_Hans），更新feeds索引，安装feeds
  #=========================================
  [ -e is_add_packages ] && echo Add packages is done already. && return 0
@@ -76,6 +79,9 @@ add_packages(){
  svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/automount lean/automount
  sed -i 's/ +ntfs3-mount//w /dev/stdout' lean/automount/Makefile # 去掉不存在的包
 
+ echo '拉取 maxlicheng/luci-app-unblockmusic'
+ git clone https://github.com/maxlicheng/luci-app-unblockmusic.git
+
  cd ..
 
  # 解决无法正确识别出简体中文语言包的问题

diff --git a/testSeq/.parted/both.ini b/testSeq/.parted/both.ini
@@ -17,7 +17,6 @@ CONFIG_PACKAGE_luci-app-advanced-reboot=y
 CONFIG_PACKAGE_luci-app-advanced=y
 CONFIG_PACKAGE_luci-app-watchcat=y
 CONFIG_PACKAGE_luci-app-wifischedule=y
-CONFIG_PACKAGE_luci-app-wrtbwmon=y
 @ DNS_luci-app-dnscrypt-proxy
 CONFIG_PACKAGE_luci-app-dnscrypt-proxy=y
 @ DNS_luci-app-dnsfilter
@@ -56,6 +55,8 @@ CONFIG_PACKAGE_luci-app-filebrowser=y
 CONFIG_PACKAGE_luci-app-minidlna=y
 @ NET_luci-app-easymesh
 CONFIG_PACKAGE_luci-app-easymesh=y
+CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+# CONFIG_PACKAGE_wpad-basic-wolfssl is not set
 @ PAK_tcpdump
 CONFIG_PACKAGE_tcpdump=y
 @ PAK_tcpdump-mini
@@ -78,8 +79,6 @@ CONFIG_PACKAGE_luci-app-nps=y
 CONFIG_PACKAGE_luci-app-bypass=y
 @ SCI_luci-app-clash
 CONFIG_PACKAGE_luci-app-clash=y
-@ SCI_luci-app-gost
-CONFIG_PACKAGE_luci-app-gost=y
 @ SCI_luci-app-openclash
 CONFIG_PACKAGE_luci-app-openclash=y
 @ SCI_luci-app-openvpn

diff --git a/testSeq/.parted/lean's lede.unique.ini b/testSeq/.parted/lean's lede.unique.ini
@@ -4,6 +4,7 @@ CONFIG_PACKAGE_luci-app-music-remote-center=y
 CONFIG_PACKAGE_ipv6helper=y
 CONFIG_PACKAGE_luci-app-accesscontrol=y
 CONFIG_PACKAGE_luci-app-guest-wifi=y
+CONFIG_PACKAGE_luci-app-wrtbwmon=y
 @ DNS_luci-app-dnsforwarder
 CONFIG_PACKAGE_luci-app-dnsforwarder=y
 @ Func_luci-app-haproxy-tcp

diff --git a/testSeq/.parted/openwrt.unique.ini b/testSeq/.parted/openwrt.unique.ini
@@ -5,8 +5,6 @@ CONFIG_PACKAGE_luci-app-acl=y
 CONFIG_PACKAGE_dnsmasq-full=y
 @ Func_luci-app-acme
 CONFIG_PACKAGE_luci-app-acme=y
-@ Func_luci-app-banip
-CONFIG_PACKAGE_luci-app-banip=y
 @ NAS_luci-app-ksmbd
 # CONFIG_PACKAGE_luci-app-samba4 is not set
 CONFIG_PACKAGE_luci-app-ksmbd=y

diff --git a/testSeq/lean's lede.ini b/testSeq/lean's lede.ini
@@ -17,7 +17,6 @@ CONFIG_PACKAGE_luci-app-advanced-reboot=y
 CONFIG_PACKAGE_luci-app-advanced=y
 CONFIG_PACKAGE_luci-app-watchcat=y
 CONFIG_PACKAGE_luci-app-wifischedule=y
-CONFIG_PACKAGE_luci-app-wrtbwmon=y
 @ DNS_luci-app-dnscrypt-proxy
 CONFIG_PACKAGE_luci-app-dnscrypt-proxy=y
 @ DNS_luci-app-dnsfilter
@@ -56,6 +55,8 @@ CONFIG_PACKAGE_luci-app-filebrowser=y
 CONFIG_PACKAGE_luci-app-minidlna=y
 @ NET_luci-app-easymesh
 CONFIG_PACKAGE_luci-app-easymesh=y
+CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+# CONFIG_PACKAGE_wpad-basic-wolfssl is not set
 @ PAK_tcpdump
 CONFIG_PACKAGE_tcpdump=y
 @ PAK_tcpdump-mini
@@ -78,8 +79,6 @@ CONFIG_PACKAGE_luci-app-nps=y
 CONFIG_PACKAGE_luci-app-bypass=y
 @ SCI_luci-app-clash
 CONFIG_PACKAGE_luci-app-clash=y
-@ SCI_luci-app-gost
-CONFIG_PACKAGE_luci-app-gost=y
 @ SCI_luci-app-openclash
 CONFIG_PACKAGE_luci-app-openclash=y
 @ SCI_luci-app-openvpn
@@ -129,6 +128,7 @@ CONFIG_PACKAGE_luci-app-music-remote-center=y
 CONFIG_PACKAGE_ipv6helper=y
 CONFIG_PACKAGE_luci-app-accesscontrol=y
 CONFIG_PACKAGE_luci-app-guest-wifi=y
+CONFIG_PACKAGE_luci-app-wrtbwmon=y
 @ DNS_luci-app-dnsforwarder
 CONFIG_PACKAGE_luci-app-dnsforwarder=y
 @ Func_luci-app-haproxy-tcp

diff --git a/testSeq/openwrt.ini b/testSeq/openwrt.ini
@@ -17,7 +17,6 @@ CONFIG_PACKAGE_luci-app-advanced-reboot=y
 CONFIG_PACKAGE_luci-app-advanced=y
 CONFIG_PACKAGE_luci-app-watchcat=y
 CONFIG_PACKAGE_luci-app-wifischedule=y
-CONFIG_PACKAGE_luci-app-wrtbwmon=y
 @ DNS_luci-app-dnscrypt-proxy
 CONFIG_PACKAGE_luci-app-dnscrypt-proxy=y
 @ DNS_luci-app-dnsfilter
@@ -56,6 +55,8 @@ CONFIG_PACKAGE_luci-app-filebrowser=y
 CONFIG_PACKAGE_luci-app-minidlna=y
 @ NET_luci-app-easymesh
 CONFIG_PACKAGE_luci-app-easymesh=y
+CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+# CONFIG_PACKAGE_wpad-basic-wolfssl is not set
 @ PAK_tcpdump
 CONFIG_PACKAGE_tcpdump=y
 @ PAK_tcpdump-mini
@@ -78,8 +79,6 @@ CONFIG_PACKAGE_luci-app-nps=y
 CONFIG_PACKAGE_luci-app-bypass=y
 @ SCI_luci-app-clash
 CONFIG_PACKAGE_luci-app-clash=y
-@ SCI_luci-app-gost
-CONFIG_PACKAGE_luci-app-gost=y
 @ SCI_luci-app-openclash
 CONFIG_PACKAGE_luci-app-openclash=y
 @ SCI_luci-app-openvpn
@@ -130,8 +129,6 @@ CONFIG_PACKAGE_luci-app-acl=y
 CONFIG_PACKAGE_dnsmasq-full=y
 @ Func_luci-app-acme
 CONFIG_PACKAGE_luci-app-acme=y
-@ Func_luci-app-banip
-CONFIG_PACKAGE_luci-app-banip=y
 @ NAS_luci-app-ksmbd
 # CONFIG_PACKAGE_luci-app-samba4 is not set
 CONFIG_PACKAGE_luci-app-ksmbd=y