diff --git a/luci-theme-aurora/Makefile b/luci-theme-aurora/Makefile index 8eaa2c97..f0cdd910 100644 --- a/luci-theme-aurora/Makefile +++ b/luci-theme-aurora/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=Aurora Theme (A modern browser theme built with Vite and Tailwind CS LUCI_DEPENDS:=+luci-base PKG_VERSION:=1.1.2 -PKG_RELEASE:=52 +PKG_RELEASE:=53 PKG_LICENSE:=Apache-2.0 LUCI_MINIFY_CSS:= diff --git a/luci-theme-aurora/README.md b/luci-theme-aurora/README.md index 16c710e9..52e03c35 100644 --- a/luci-theme-aurora/README.md +++ b/luci-theme-aurora/README.md @@ -52,35 +52,74 @@ - **Safari 16.4+** _(released March 2023)_ - **Firefox 128+** _(released July 2024)_ -## Install a pre-built release +## Installation + +Run these commands on the router itself (e.g. over an SSH session). + +### Via the eamonxg package feed OpenWrt 25.12+ and snapshots use `apk`; other versions use `opkg`: > **Tip**: You can confirm your package manager by running `opkg --version` or `apk --version`. If it returns output (not "not found"), that's your package manager. +```sh +wget -qO- https://openwrt.eamonxg.fun/install.sh | sh +``` + - **opkg** (OpenWrt < 25.12): ```sh - cd /tmp && uclient-fetch -O luci-theme-aurora.ipk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora_1.1.0-r20260711_all.ipk && opkg install luci-theme-aurora.ipk + opkg install luci-theme-aurora ``` - **apk** (OpenWrt 25.12+ and snapshots): + ```sh - cd /tmp && uclient-fetch -O luci-theme-aurora.apk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora-1.1.0-r20260711.apk && apk add --allow-untrusted luci-theme-aurora.apk + apk add luci-theme-aurora ``` +Adds the feed once; later updates are just `opkg update && opkg install luci-theme-aurora` / `apk update && apk add luci-theme-aurora` — no re-downloading the file. Details: [openwrt.eamonxg.fun](https://openwrt.eamonxg.fun/). + +### Via a GitHub release + +```sh +cd /tmp + +# opkg +uclient-fetch -O luci-theme-aurora.ipk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora_1.1.0-r20260711_all.ipk +opkg install luci-theme-aurora.ipk + +# apk +uclient-fetch -O luci-theme-aurora.apk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora-1.1.0-r20260711.apk +apk add --allow-untrusted luci-theme-aurora.apk +``` + ## Build from source Build the package yourself with the OpenWrt build system. Host prerequisites: [Build system setup](https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem). The build writes the package to `bin/packages//base/` (e.g. `bin/packages/x86_64/base/luci-theme-aurora_*_all.ipk`); copy it to your router and install it as above. -### Via the OpenWrt buildroot +### Via the full source tree or SDK + +Get set up — clone the full source tree: ```sh -# Clone OpenWrt — the openwrt-24.10 branch builds an .ipk, the main branch builds an .apk +# Full source tree — the openwrt-24.10 branch builds an .ipk, the main branch builds an .apk git clone https://github.com/openwrt/openwrt.git cd openwrt -git checkout openwrt-24.10 # omit to stay on main (snapshots → .apk) +git checkout openwrt-24.10 +``` +Or the [prebuilt SDK](https://openwrt.org/docs/guide-developer/toolchain/using_the_sdk) (faster: skips building the toolchain). Grab the archive for your target from [downloads.openwrt.org](https://downloads.openwrt.org), which splits SDKs into Release and Snapshot builds — Release 24.10.x and earlier build `.ipk`; Release 25.12+ and Snapshot build `.apk` (filename, arch and compression vary by target): + +```sh +wget +tar -xf openwrt-sdk-*.tar.* +cd openwrt-sdk-*/ +``` + +Then, from that directory: + +```sh # Add this package and install feeds (provides luci-base) git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-aurora ./scripts/feeds update -a @@ -89,23 +128,10 @@ git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-au # Select the theme in menuconfig: LuCI → Themes → luci-theme-aurora make menuconfig -# Build host tools + toolchain, then compile the package +# Skip these two lines with the SDK — it already ships a built toolchain make tools/install -j$(nproc) make toolchain/install -j$(nproc) -make package/luci-theme-aurora/compile -j$(nproc) V=s -``` -### Via the prebuilt SDK (faster) - -The [OpenWrt SDK](https://openwrt.org/docs/guide-developer/toolchain/using_the_sdk) bundles a prebuilt toolchain, so the `tools/install` / `toolchain/install` steps are skipped. Download the SDK for your target from [downloads.openwrt.org](https://downloads.openwrt.org) (a release SDK builds `.ipk`, a snapshot SDK builds `.apk`), extract it, then from the SDK directory: - -```sh -git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-aurora -./scripts/feeds update -a -./scripts/feeds install -a - -# Select the theme in menuconfig: LuCI → Themes → luci-theme-aurora -make menuconfig make package/luci-theme-aurora/compile -j$(nproc) V=s ``` diff --git a/luci-theme-aurora/README_zh.md b/luci-theme-aurora/README_zh.md index f081f483..a25c2c04 100644 --- a/luci-theme-aurora/README_zh.md +++ b/luci-theme-aurora/README_zh.md @@ -52,36 +52,74 @@ - **Safari 16.4+** _(2023 年 3 月发布)_ - **Firefox 128+** _(2024 年 7 月发布)_ -## 安装预编译包 +## 安装 + +以下命令均在路由器本机执行(例如通过 SSH 会话)。 + +### 通过 eamonxg 软件源 OpenWrt 25.12+ 和 Snapshot 版本使用 `apk`;其他版本使用 `opkg`: > **提示**:您可以运行 `opkg --version` 或 `apk --version` 来确认您的包管理器。如果有输出内容(而非 "not found"),那就是您的包管理器。 -- **opkg** (OpenWrt < 25.12): +```sh +wget -qO- https://openwrt.eamonxg.fun/install.sh | sh +``` + +- **opkg**(OpenWrt < 25.12): ```sh - cd /tmp && uclient-fetch -O luci-theme-aurora.ipk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora_1.1.0-r20260711_all.ipk && opkg install luci-theme-aurora.ipk + opkg install luci-theme-aurora ``` -- **apk** (OpenWrt 25.12+ 及 snapshots): +- **apk**(OpenWrt 25.12+ 及 snapshots): ```sh - cd /tmp && uclient-fetch -O luci-theme-aurora.apk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora-1.1.0-r20260711.apk && apk add --allow-untrusted luci-theme-aurora.apk + apk add luci-theme-aurora ``` +一次性添加源,之后更新只需 `opkg update && opkg install luci-theme-aurora` / `apk update && apk add luci-theme-aurora`,无需再手动下载安装包。详细信息见 [openwrt.eamonxg.fun](https://openwrt.eamonxg.fun/)。 + +### 通过 GitHub Release + +```sh +cd /tmp + +# opkg +uclient-fetch -O luci-theme-aurora.ipk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora_1.1.0-r20260711_all.ipk +opkg install luci-theme-aurora.ipk + +# apk +uclient-fetch -O luci-theme-aurora.apk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora-1.1.0-r20260711.apk +apk add --allow-untrusted luci-theme-aurora.apk +``` + ## 从源码构建 使用 OpenWrt 构建系统自行编译。主机前置条件见 [Build system setup](https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem)。产物位于 `bin/packages//base/`(例如 `bin/packages/x86_64/base/luci-theme-aurora_*_all.ipk`),拷贝到路由器后按上文方式安装即可。 -### 通过 OpenWrt buildroot +### 通过完整源码或 SDK + +准备环境——克隆完整源码: ```sh -# 克隆 OpenWrt——openwrt-24.10 分支构建 .ipk,main 分支构建 .apk +# 完整源码——openwrt-24.10 分支构建 .ipk,main 分支构建 .apk git clone https://github.com/openwrt/openwrt.git cd openwrt -git checkout openwrt-24.10 # 省略则停留在 main(snapshot → .apk) +git checkout openwrt-24.10 +``` +或 [预编译 SDK](https://openwrt.org/docs/guide-developer/toolchain/using_the_sdk)(更快,省去编译工具链)。从 [downloads.openwrt.org](https://downloads.openwrt.org) 下载与目标匹配的压缩包,下载页面按 Release 和 Snapshot 分类——Release 24.10.x 及以下构建 `.ipk`;Release 25.12+ 和 Snapshot 构建 `.apk`(文件名、架构、压缩格式因目标而异): + +```sh +wget <从 downloads.openwrt.org 获取的 SDK 压缩包地址> +tar -xf openwrt-sdk-*.tar.* +cd openwrt-sdk-*/ +``` + +然后在该目录下: + +```sh # 加入本软件包并安装 feeds(提供 luci-base) git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-aurora ./scripts/feeds update -a @@ -90,23 +128,10 @@ git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-au # 在 menuconfig 中勾选主题:LuCI → Themes → luci-theme-aurora make menuconfig -# 先编译主机工具与工具链,再编译本软件包 +# 用 SDK 时跳过这两行——它已自带编译好的工具链 make tools/install -j$(nproc) make toolchain/install -j$(nproc) -make package/luci-theme-aurora/compile -j$(nproc) V=s -``` -### 通过预编译 SDK(更快) - -[OpenWrt SDK](https://openwrt.org/docs/guide-developer/toolchain/using_the_sdk) 自带预编译工具链,可省去 `tools/install` / `toolchain/install` 步骤。从 [downloads.openwrt.org](https://downloads.openwrt.org) 下载与目标匹配的 SDK(release SDK 构建 `.ipk`,snapshot SDK 构建 `.apk`)并解压,然后在 SDK 目录中执行: - -```sh -git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-aurora -./scripts/feeds update -a -./scripts/feeds install -a - -# 在 menuconfig 中勾选主题:LuCI → Themes → luci-theme-aurora -make menuconfig make package/luci-theme-aurora/compile -j$(nproc) V=s ``` diff --git a/openlist2/Makefile b/openlist2/Makefile index e545e21d..73cc9507 100644 --- a/openlist2/Makefile +++ b/openlist2/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openlist2 -PKG_VERSION:=4.2.3 +PKG_VERSION:=4.2.4 PKG_WEB_VERSION:=4.2.3 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE:=openlist-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/OpenListTeam/OpenList/tar.gz/v$(PKG_VERSION)?