diff --git a/content/awesome-openwrt.md b/content/awesome-openwrt.md index 9d13008..fb89bd1 100644 --- a/content/awesome-openwrt.md +++ b/content/awesome-openwrt.md @@ -155,10 +155,10 @@ su openwrt cd ~ ``` -- **拉取源码,这里用的是 OpenWrt 24.10 分支源码:** +- **拉取源码,这里用的是 ImmortalWrt 24.10 分支源码:** ``` -git clone https://github.com/openwrt/openwrt.git -cd openwrt +git clone https://github.com/immortalwrt/immortalwrt.git +cd immortalwrt git switch openwrt-24.10 ``` @@ -216,24 +216,26 @@ git clone https://github.com/chenmozhijin/turboacc.git - **自定义配置** -**修改默认IP为 10.0.0.2** -``` -sed -i 's/192.168.1.1/192.168.2.1/g' package/base-files/files/bin/config_generate ``` +#!/usr/bin/env bash +# diy-part2.sh — 在镜像生成时注入默认设置 -**修改默认主机名** -``` -sed -i '/uci commit system/i\uci set system.@system[0].hostname='OpenWrt'' package/lean/default-settings/files/zzz-default-settings -``` +# 1. 默认 hostname(可选) +sed -i 's/=ImmortalWrt/=my-device/' package/base-files/files/bin/config_generate -**加入编译者信息** -``` -sed -i "s/OpenWrt /smith build $(TZ=UTC-8 date "+%Y.%m.%d") @ OpenWrt /g" package/lean/default-settings/files/zzz-default-settings -``` +# 2. 默认 IP 地址(可选) +sed -i 's/192.168.1.1/192.168.5.1/' package/base-files/files/bin/config_generate -**修改默认主题** -``` -sed -i "s/luci-theme-bootstrap/luci-theme-argon/g" feeds/luci/collections/luci/Makefile +# 3. 默认 root 密码(请换成安全密码) +HASH=$(openssl passwd -1 'yourpassword') +sed -i "s|root::0:0:99999|root:${HASH}:0:0:99999|" package/base-files/files/etc/shadow + +# 4. 设置默认 LuCI 主题为 argon(内置在 luci feeds) +cat >>package/base-files/files/etc/uci-defaults/99_set_theme <<'EOF' +uci set luci.main.mediaurlbase=/luci-static/argon +uci commit luci +EOF +chmod +x package/base-files/files/etc/uci-defaults/99_set_theme ``` - 执行 **make menuconfig** 命令进入编译菜单。 @@ -316,6 +318,10 @@ find dl -size -1024c -exec rm -f {} \; - **最后编译固件(-j 后面是线程数,首次编译推荐用单线程)编译完成后输出路径是bin/targets.** ``` make V=s -j1 + +或者使用 make world -j1 V=s 2>&1 | tee world_debug.log + +如果报错可查看 grep -E "(error|fatal|Cannot install package)" world_debug.log -n ``` | make层级 | 目录示例 | 说明 | | -------- | ---------------------------- | ---------------- | @@ -402,6 +408,16 @@ opkg list-upgradable | grep luci- | cut -f 1 -d ' ' | xargs opkg upgrade # 如果要更新所有软件,包括 OpenWRT 内核、固件等 opkg list-upgradable | cut -f 1 -d ' ' | xargs opkg upgrade ``` +## 常用仓库 + +``` +src/gz kwrt_core https://dl.openwrt.ai/releases/24.10/targets/x86/64/6.6.83 +src/gz kwrt_base https://dl.openwrt.ai/releases/24.10/packages/x86_64/base +src/gz kwrt_packages https://dl.openwrt.ai/releases/24.10/packages/x86_64/packages +src/gz kwrt_luci https://dl.openwrt.ai/releases/24.10/packages/x86_64/luci +src/gz kwrt_routing https://dl.openwrt.ai/releases/24.10/packages/x86_64/routing +src/gz kwrt_kiddin9 https://dl.openwrt.ai/releases/24.10/packages/x86_64/kiddin9 +``` ## 常用科学插件 diff --git a/public/awesome-openwrt/index.html b/public/awesome-openwrt/index.html index 33c975c..9a5685d 100644 --- a/public/awesome-openwrt/index.html +++ b/public/awesome-openwrt/index.html @@ -281,10 +281,10 @@ cd ~
git clone https://github.com/openwrt/openwrt.git
-cd openwrt
+git clone https://github.com/immortalwrt/immortalwrt.git
+cd immortalwrt
git switch openwrt-24.10
目录说明
@@ -335,17 +335,25 @@
- 自定义配置
-修改默认IP为 10.0.0.2
-sed -i 's/192.168.1.1/192.168.2.1/g' package/base-files/files/bin/config_generate
-
-修改默认主机名
-sed -i '/uci commit system/i\uci set system.@system[0].hostname='OpenWrt'' package/lean/default-settings/files/zzz-default-settings
-
-加入编译者信息
-sed -i "s/OpenWrt /smith build $(TZ=UTC-8 date "+%Y.%m.%d") @ OpenWrt /g" package/lean/default-settings/files/zzz-default-settings
-
-修改默认主题
-sed -i "s/luci-theme-bootstrap/luci-theme-argon/g" feeds/luci/collections/luci/Makefile
+#!/usr/bin/env bash
+# diy-part2.sh — 在镜像生成时注入默认设置
+
+# 1. 默认 hostname(可选)
+sed -i 's/=ImmortalWrt/=my-device/' package/base-files/files/bin/config_generate
+
+# 2. 默认 IP 地址(可选)
+sed -i 's/192.168.1.1/192.168.5.1/' package/base-files/files/bin/config_generate
+
+# 3. 默认 root 密码(请换成安全密码)
+HASH=$(openssl passwd -1 'yourpassword')
+sed -i "s|root::0:0:99999|root:${HASH}:0:0:99999|" package/base-files/files/etc/shadow
+
+# 4. 设置默认 LuCI 主题为 argon(内置在 luci feeds)
+cat >>package/base-files/files/etc/uci-defaults/99_set_theme <<'EOF'
+uci set luci.main.mediaurlbase=/luci-static/argon
+uci commit luci
+EOF
+chmod +x package/base-files/files/etc/uci-defaults/99_set_theme
- 执行 make menuconfig 命令进入编译菜单。
@@ -420,6 +428,10 @@
- 最后编译固件(-j 后面是线程数,首次编译推荐用单线程)编译完成后输出路径是bin/targets.
make V=s -j1
+
+或者使用 make world -j1 V=s 2>&1 | tee world_debug.log
+
+如果报错可查看 grep -E "(error|fatal|Cannot install package)" world_debug.log -n
make层级 目录示例 说明
make[1] 顶层 Makefile 解析依赖,调度模块
@@ -490,6 +502,14 @@
# 如果要更新所有软件,包括 OpenWRT 内核、固件等
opkg list-upgradable | cut -f 1 -d ' ' | xargs opkg upgrade
+常用仓库
+src/gz kwrt_core https://dl.openwrt.ai/releases/24.10/targets/x86/64/6.6.83
+src/gz kwrt_base https://dl.openwrt.ai/releases/24.10/packages/x86_64/base
+src/gz kwrt_packages https://dl.openwrt.ai/releases/24.10/packages/x86_64/packages
+src/gz kwrt_luci https://dl.openwrt.ai/releases/24.10/packages/x86_64/luci
+src/gz kwrt_routing https://dl.openwrt.ai/releases/24.10/packages/x86_64/routing
+src/gz kwrt_kiddin9 https://dl.openwrt.ai/releases/24.10/packages/x86_64/kiddin9
+
常用科学插件
特性 HomeProxy OpenClash Passwall ShellClash
核心 Sing-box、Xray Clash Xray、Sing-box Clash、Xray、Sing-box
diff --git a/public/pagefind/fragment/en_4e40275.pf_fragment b/public/pagefind/fragment/en_4e40275.pf_fragment
deleted file mode 100644
index 6d5a067..0000000
Binary files a/public/pagefind/fragment/en_4e40275.pf_fragment and /dev/null differ
diff --git a/public/pagefind/fragment/en_e78a56d.pf_fragment b/public/pagefind/fragment/en_e78a56d.pf_fragment
new file mode 100644
index 0000000..57fb17d
Binary files /dev/null and b/public/pagefind/fragment/en_e78a56d.pf_fragment differ
diff --git a/public/pagefind/index/en_26a6a56.pf_index b/public/pagefind/index/en_26a6a56.pf_index
deleted file mode 100644
index 2844a1f..0000000
Binary files a/public/pagefind/index/en_26a6a56.pf_index and /dev/null differ
diff --git a/public/pagefind/index/en_2b926b0.pf_index b/public/pagefind/index/en_2b926b0.pf_index
new file mode 100644
index 0000000..d947bf8
Binary files /dev/null and b/public/pagefind/index/en_2b926b0.pf_index differ
diff --git a/public/pagefind/index/en_3bf3a55.pf_index b/public/pagefind/index/en_3bf3a55.pf_index
deleted file mode 100644
index ffc9060..0000000
Binary files a/public/pagefind/index/en_3bf3a55.pf_index and /dev/null differ
diff --git a/public/pagefind/index/en_4864192.pf_index b/public/pagefind/index/en_4864192.pf_index
deleted file mode 100644
index ca3792d..0000000
Binary files a/public/pagefind/index/en_4864192.pf_index and /dev/null differ
diff --git a/public/pagefind/index/en_4ab17da.pf_index b/public/pagefind/index/en_4ab17da.pf_index
new file mode 100644
index 0000000..555e635
Binary files /dev/null and b/public/pagefind/index/en_4ab17da.pf_index differ
diff --git a/public/pagefind/index/en_5f277a3.pf_index b/public/pagefind/index/en_5f277a3.pf_index
deleted file mode 100644
index 30974aa..0000000
Binary files a/public/pagefind/index/en_5f277a3.pf_index and /dev/null differ
diff --git a/public/pagefind/index/en_7c38456.pf_index b/public/pagefind/index/en_7c38456.pf_index
deleted file mode 100644
index 036c66b..0000000
Binary files a/public/pagefind/index/en_7c38456.pf_index and /dev/null differ
diff --git a/public/pagefind/index/en_98eed27.pf_index b/public/pagefind/index/en_98eed27.pf_index
new file mode 100644
index 0000000..9e1ff80
Binary files /dev/null and b/public/pagefind/index/en_98eed27.pf_index differ
diff --git a/public/pagefind/index/en_ddbabf6.pf_index b/public/pagefind/index/en_ddbabf6.pf_index
new file mode 100644
index 0000000..4caabc1
Binary files /dev/null and b/public/pagefind/index/en_ddbabf6.pf_index differ
diff --git a/public/pagefind/index/en_f5907bc.pf_index b/public/pagefind/index/en_f5907bc.pf_index
new file mode 100644
index 0000000..2749c03
Binary files /dev/null and b/public/pagefind/index/en_f5907bc.pf_index differ
diff --git a/public/pagefind/pagefind-entry.json b/public/pagefind/pagefind-entry.json
index 3f60466..5f15137 100644
--- a/public/pagefind/pagefind-entry.json
+++ b/public/pagefind/pagefind-entry.json
@@ -1 +1 @@
-{"version":"1.3.0","languages":{"en":{"hash":"en_36b0d71545","wasm":"en","page_count":98}}}
\ No newline at end of file
+{"version":"1.3.0","languages":{"en":{"hash":"en_153c70164b","wasm":"en","page_count":98}}}
\ No newline at end of file
diff --git a/public/pagefind/pagefind.en_153c70164b.pf_meta b/public/pagefind/pagefind.en_153c70164b.pf_meta
new file mode 100644
index 0000000..17185f4
Binary files /dev/null and b/public/pagefind/pagefind.en_153c70164b.pf_meta differ
diff --git a/public/pagefind/pagefind.en_36b0d71545.pf_meta b/public/pagefind/pagefind.en_36b0d71545.pf_meta
deleted file mode 100644
index a2c9191..0000000
Binary files a/public/pagefind/pagefind.en_36b0d71545.pf_meta and /dev/null differ