fix luci missing

key2p · Nov 14, 2024 · 84c1d8b · 84c1d8b
1 parent 9ba600c
commit 84c1d8b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 18 deletions.
diff --git a/build_x86_64.dockerfile b/build_x86_64.dockerfile
@@ -11,8 +11,8 @@ ENV REPO_URL=https://github.com/immortalwrt/immortalwrt.git \
     FIRMWARE_TAG=X86_64 \
     TZ=Asia/Shanghai
 
-ENV OPENWRT_PATH=/builder/openwrt
-ENV WORK_DIR=/builder
+ENV OPENWRT_PATH=/builder/openwrt \
+    WORK_DIR=/builder
 
 WORKDIR /builder    
 

diff --git a/configs/ipq60xx-all.config b/configs/ipq60xx-all.config
@@ -153,23 +153,33 @@ CONFIG_PACKAGE_libuv=y
 #CONFIG_PACKAGE_libwebsockets-full=y
 CONFIG_PACKAGE_lsblk=y
 CONFIG_PACKAGE_lua=y
+
 #增加插件
-#CONFIG_PACKAGE_luci-app-ssr-plus=y
-#CONFIG_PACKAGE_luci-app-passwall=y
+CONFIG_PACKAGE_uhttpd=y
+CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-app-autoreboot=y
-#CONFIG_PACKAGE_luci-app-openclash=y
 CONFIG_PACKAGE_luci-app-store=y
 CONFIG_PACKAGE_luci-app-opkg=y
 CONFIG_PACKAGE_luci-app-argon-config=y
 CONFIG_PACKAGE_luci-app-cpufreq=y
-#CONFIG_PACKAGE_luci-app-sqm=y
 CONFIG_PACKAGE_luci-app-ttyd=y
 CONFIG_PACKAGE_ttyd=y
-#CONFIG_PACKAGE_luci-app-upnp=y
 CONFIG_PACKAGE_luci-app-vlmcsd=y
 CONFIG_PACKAGE_luci-app-wol=y
-#CONFIG_PACKAGE_luci-app-zerotier=y
 CONFIG_PACKAGE_luci-compat=y
+CONFIG_PACKAGE_luci-lib-base=y
+CONFIG_PACKAGE_luci-lib-ip=y
+CONFIG_PACKAGE_luci-lib-jsonc=y
+CONFIG_PACKAGE_luci-lib-nixio=y
+CONFIG_PACKAGE_luci-lua-runtime=y
+CONFIG_PACKAGE_luci-theme-argon=y
+
+#CONFIG_PACKAGE_luci-app-ssr-plus=y
+#CONFIG_PACKAGE_luci-app-passwall=y
+#CONFIG_PACKAGE_luci-app-openclash=y
+#CONFIG_PACKAGE_luci-app-sqm=y
+#CONFIG_PACKAGE_luci-app-upnp=y
+#CONFIG_PACKAGE_luci-app-zerotier=y
 #CONFIG_PACKAGE_luci-i18n-cpufreq-zh-cn=y
 
 #CONFIG_PACKAGE_luci-i18n-passwall-zh-cn=m
@@ -178,12 +188,6 @@ CONFIG_PACKAGE_luci-compat=y
 #CONFIG_PACKAGE_luci-i18n-upnp-zh-cn=y
 
 #CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
-CONFIG_PACKAGE_luci-lib-base=y
-CONFIG_PACKAGE_luci-lib-ip=y
-CONFIG_PACKAGE_luci-lib-jsonc=y
-CONFIG_PACKAGE_luci-lib-nixio=y
-CONFIG_PACKAGE_luci-lua-runtime=y
-CONFIG_PACKAGE_luci-theme-argon=y
 #CONFIG_PACKAGE_microsocks=m
 #CONFIG_PACKAGE_miniupnpd-nftables=y
 CONFIG_PACKAGE_parted=y

diff --git a/configs/x86_64.config b/configs/x86_64.config
@@ -285,6 +285,28 @@ CONFIG_PACKAGE_rt73-usb-firmware=y
 CONFIG_PACKAGE_rtl8192cu-firmware=y
 
 # Applications
+#增加插件
+CONFIG_PACKAGE_uhttpd=y
+CONFIG_PACKAGE_luci=y
+
+CONFIG_PACKAGE_luci-app-autoreboot=y
+CONFIG_PACKAGE_luci-app-store=y
+CONFIG_PACKAGE_luci-app-opkg=y
+CONFIG_PACKAGE_luci-app-argon-config=y
+CONFIG_PACKAGE_luci-app-cpufreq=y
+CONFIG_PACKAGE_luci-app-ttyd=y
+CONFIG_PACKAGE_ttyd=y
+CONFIG_PACKAGE_luci-app-vlmcsd=y
+CONFIG_PACKAGE_luci-app-wol=y
+CONFIG_PACKAGE_luci-compat=y
+CONFIG_PACKAGE_luci-lib-base=y
+CONFIG_PACKAGE_luci-lib-ip=y
+CONFIG_PACKAGE_luci-lib-jsonc=y
+CONFIG_PACKAGE_luci-lib-nixio=y
+CONFIG_PACKAGE_luci-lua-runtime=y
+CONFIG_PACKAGE_luci-theme-argon=y
+
+CONFIG_PACKAGE_liblucihttp-lua=y
 #CONFIG_PACKAGE_luci-app-accesscontrol=y
 #CONFIG_PACKAGE_luci-app-adbyby-plus=y
 #CONFIG_PACKAGE_luci-app-adguardhome=y
@@ -293,9 +315,9 @@ CONFIG_PACKAGE_rtl8192cu-firmware=y
 # CONFIG_PACKAGE_luci-app-aliyundrive-fuse is not set
 # CONFIG_PACKAGE_luci-app-aliyundrive-webdav is not set
 # CONFIG_PACKAGE_luci-app-amule is not set
-CONFIG_PACKAGE_luci-app-argon-config=y
+#CONFIG_PACKAGE_luci-app-argon-config=y
 #CONFIG_PACKAGE_luci-app-aria2=y
-CONFIG_PACKAGE_luci-app-arpbind=y
+#CONFIG_PACKAGE_luci-app-arpbind=y
 #CONFIG_PACKAGE_luci-app-autoreboot=y
 #CONFIG_PACKAGE_luci-app-cifs-mount=y
 #CONFIG_PACKAGE_luci-app-commands=y

diff --git a/diy-script.sh b/diy-script.sh
@@ -40,15 +40,17 @@ rm -rf feeds/packages/net/mosdns
 rm -rf feeds/packages/net/msd_lite
 rm -rf feeds/packages/net/smartdns
 rm -rf feeds/luci/themes/luci-theme-netgear
-rm -rf feeds/luci/themes/luci-theme-bootstrap*
+#rm -rf feeds/luci/themes/luci-theme-bootstrap*
 rm -rf feeds/luci/applications/luci-app-mosdns
 rm -rf feeds/luci/applications/luci-app-netdata
 rm -rf feeds/luci/applications/luci-app-serverchan
-rm -rf feeds/luci/applications/luci-theme-bootstrap*
+#rm -rf feeds/luci/applications/luci-theme-bootstrap*
 rm -rf feeds/luci/applications/luci-app-openclash
 rm -rf feeds/luci/applications/luci-app-passwall
 rm -rf feeds/luci/applications/luci-app-homeproxy
 
+# 删除 bootstrp 会导致luci 安装失败
+
 # 移除不需要的包
 rm -rf feeds/smpackage/{adguardhome,base-files,dnsmasq,firewall*,fullconenat,libnftnl,nftables,ppp,opkg,ucl,upx,vsftpd-alt,miniupnpd-iptables,wireless-regdb}
 rm -rf feeds/packages/{adguardhome,alist,frp,nps}