GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-09-17 13:03:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: 撤销 Debian 11 快照修复并迁移至 Debian 12

Browse Source
This commit is contained in:
mofeng-git
2026-09-16 23:18:51 +08:00
parent c62ff2da87
commit 728373b067
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cross.toml
View File

@@ -1,5 +1,5 @@
# Cross-compilation configuration for One-KVM # Cross-compilation configuration for One-KVM
# Uses pre-built custom Debian 11 based images for consistent build/runtime environment # Uses pre-built custom Debian 12 based images for consistent build/runtime environment
# See: https://github.com/cross-rs/cross # See: https://github.com/cross-rs/cross
[build] [build]

6
build/Dockerfile.runtime
View File

@@ -1,18 +1,18 @@
# One-KVM Runtime Image # One-KVM Runtime Image
# This Dockerfile only packages pre-compiled binaries (no compilation) # This Dockerfile only packages pre-compiled binaries (no compilation)
# Used after cross-compiling with `cross build` # Used after cross-compiling with `cross build`
# Using Debian 11 for maximum compatibility (GLIBC 2.31) # Using Debian 12 to match the build images (GLIBC 2.36)
ARG TARGETPLATFORM=linux/amd64 ARG TARGETPLATFORM=linux/amd64
FROM debian:11-slim FROM debian:12-slim
ARG TARGETPLATFORM ARG TARGETPLATFORM
# Install runtime dependencies in a single layer # Install runtime dependencies in a single layer
# All codec libraries (libx264, libx265, libopus) are now statically linked # All codec libraries (libx264, libx265, libopus) are now statically linked
# Only hardware acceleration drivers and core system libraries remain dynamic # Only hardware acceleration drivers and core system libraries remain dynamic
RUN sed -i 's/ main$/ main contrib non-free/' /etc/apt/sources.list && \ RUN sed -i 's/^Components: main$/Components: main contrib non-free non-free-firmware/' /etc/apt/sources.list.d/debian.sources && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
# Core runtime (all platforms) - no codec libs needed # Core runtime (all platforms) - no codec libs needed

6
build/Dockerfile.runtime-full
View File

@@ -1,18 +1,18 @@
# One-KVM Runtime Image (full) # One-KVM Runtime Image (full)
# This Dockerfile only packages pre-compiled binaries (no compilation) # This Dockerfile only packages pre-compiled binaries (no compilation)
# Used after cross-compiling with `cross build` # Used after cross-compiling with `cross build`
# Using Debian 11 for maximum compatibility (GLIBC 2.31) # Using Debian 12 to match the build images (GLIBC 2.36)
ARG TARGETPLATFORM=linux/amd64 ARG TARGETPLATFORM=linux/amd64
FROM debian:11-slim FROM debian:12-slim
ARG TARGETPLATFORM ARG TARGETPLATFORM
# Install runtime dependencies in a single layer # Install runtime dependencies in a single layer
# All codec libraries (libx264, libx265, libopus) are now statically linked # All codec libraries (libx264, libx265, libopus) are now statically linked
# Only hardware acceleration drivers and core system libraries remain dynamic # Only hardware acceleration drivers and core system libraries remain dynamic
RUN sed -i 's/ main$/ main contrib non-free/' /etc/apt/sources.list && \ RUN sed -i 's/^Components: main$/Components: main contrib non-free non-free-firmware/' /etc/apt/sources.list.d/debian.sources && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
# Core runtime (all platforms) - no codec libs needed # Core runtime (all platforms) - no codec libs needed

2
build/build-images.sh
View File

@@ -21,7 +21,7 @@ build_arch() {
case "${CHINAMIRRO:-}" in case "${CHINAMIRRO:-}" in
1|true|TRUE|yes|YES|on|ON) 1|true|TRUE|yes|YES|on|ON)
local cross_build_opts="${CROSS_BUILD_OPTS:+$CROSS_BUILD_OPTS }--progress=plain --build-arg CHINAMIRRO=1 --build-arg GH_PROXY=${GH_PROXY:-https://gh-proxy.com/} --build-arg DEBIAN_IMAGE=${DEBIAN_IMAGE:-docker.1ms.run/library/debian:11}" local cross_build_opts="${CROSS_BUILD_OPTS:+$CROSS_BUILD_OPTS }--progress=plain --build-arg CHINAMIRRO=1 --build-arg GH_PROXY=${GH_PROXY:-https://gh-proxy.com/} --build-arg DEBIAN_IMAGE=${DEBIAN_IMAGE:-docker.1ms.run/library/debian:12}"
cross_build_opts="$cross_build_opts --build-arg HTTP_PROXY= --build-arg HTTPS_PROXY= --build-arg ALL_PROXY= --build-arg NO_PROXY=" cross_build_opts="$cross_build_opts --build-arg HTTP_PROXY= --build-arg HTTPS_PROXY= --build-arg ALL_PROXY= --build-arg NO_PROXY="
cross_build_opts="$cross_build_opts --build-arg http_proxy= --build-arg https_proxy= --build-arg all_proxy= --build-arg no_proxy=" cross_build_opts="$cross_build_opts --build-arg http_proxy= --build-arg https_proxy= --build-arg all_proxy= --build-arg no_proxy="
echo "=== China mirror acceleration: enabled ===" echo "=== China mirror acceleration: enabled ==="

22
build/cross/Dockerfile.arm64
View File

@@ -1,10 +1,9 @@
# Cross-compilation image for ARM64 based on Debian 11 # Cross-compilation image for ARM64 based on Debian 12
# Build on Debian 11 (GLIBC 2.31) for maximum runtime compatibility # Build on Debian 12 (GLIBC 2.36) to match the runtime images
ARG DEBIAN_IMAGE=debian:11 ARG DEBIAN_IMAGE=debian:12
FROM ${DEBIAN_IMAGE} FROM ${DEBIAN_IMAGE}
ARG DEBIAN_SNAPSHOT=20260713T000000Z
ARG CHINAMIRRO=0 ARG CHINAMIRRO=0
ARG GH_PROXY=https://gh-proxy.com/ ARG GH_PROXY=https://gh-proxy.com/
ARG RUSTUP_DIST_SERVER_CN=https://rsproxy.cn ARG RUSTUP_DIST_SERVER_CN=https://rsproxy.cn
@@ -20,11 +19,12 @@ ARG RKMPP_BRANCH=jellyfin-mpp
ARG RKRGA_BRANCH=jellyfin-rga ARG RKRGA_BRANCH=jellyfin-rga
ARG FFMPEG_ROCKCHIP_REV=40c412daccf08164493da0de990eb99a8948116b ARG FFMPEG_ROCKCHIP_REV=40c412daccf08164493da0de990eb99a8948116b
RUN printf '%s\n' \ # Optionally use China mirrors for builds in China.
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT}/ bullseye main" \ RUN if [ "$CHINAMIRRO" = "1" ]; then \
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/${DEBIAN_SNAPSHOT}/ bullseye-security main" \ sed -i -E \
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT}/ bullseye-updates main" \ -e 's@http://deb.debian.org/debian([[:space:]]|$)@http://mirrors.tuna.tsinghua.edu.cn/debian\1@g' \
> /etc/apt/sources.list /etc/apt/sources.list.d/debian.sources; \
fi
# Install Rust toolchain # Install Rust toolchain
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -83,8 +83,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# Install ARM64 development libraries (without VAAPI/X11 for ARM) # Install ARM64 development libraries (without VAAPI/X11 for ARM)
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl1.1 \ libssl3 \
libssl1.1:arm64 \ libssl3:arm64 \
libasound2-dev:arm64 \ libasound2-dev:arm64 \
libv4l-dev:arm64 \ libv4l-dev:arm64 \
libudev-dev:arm64 \ libudev-dev:arm64 \

22
build/cross/Dockerfile.armv7
View File

@@ -1,10 +1,9 @@
# Cross-compilation image for ARMv7 based on Debian 11 # Cross-compilation image for ARMv7 based on Debian 12
# Build on Debian 11 (GLIBC 2.31) for maximum runtime compatibility # Build on Debian 12 (GLIBC 2.36) to match the runtime images
ARG DEBIAN_IMAGE=debian:11 ARG DEBIAN_IMAGE=debian:12
FROM ${DEBIAN_IMAGE} FROM ${DEBIAN_IMAGE}
ARG DEBIAN_SNAPSHOT=20260713T000000Z
ARG CHINAMIRRO=0 ARG CHINAMIRRO=0
ARG GH_PROXY=https://gh-proxy.com/ ARG GH_PROXY=https://gh-proxy.com/
ARG RUSTUP_DIST_SERVER_CN=https://rsproxy.cn ARG RUSTUP_DIST_SERVER_CN=https://rsproxy.cn
@@ -20,11 +19,12 @@ ARG RKMPP_BRANCH=jellyfin-mpp
ARG RKRGA_BRANCH=jellyfin-rga ARG RKRGA_BRANCH=jellyfin-rga
ARG FFMPEG_ROCKCHIP_REV=40c412daccf08164493da0de990eb99a8948116b ARG FFMPEG_ROCKCHIP_REV=40c412daccf08164493da0de990eb99a8948116b
RUN printf '%s\n' \ # Optionally use China mirrors for builds in China.
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT}/ bullseye main" \ RUN if [ "$CHINAMIRRO" = "1" ]; then \
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/${DEBIAN_SNAPSHOT}/ bullseye-security main" \ sed -i -E \
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT}/ bullseye-updates main" \ -e 's@http://deb.debian.org/debian([[:space:]]|$)@http://mirrors.tuna.tsinghua.edu.cn/debian\1@g' \
> /etc/apt/sources.list /etc/apt/sources.list.d/debian.sources; \
fi
# Install Rust toolchain # Install Rust toolchain
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -83,8 +83,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# Install ARMv7 development libraries (without VAAPI/X11 for ARM) # Install ARMv7 development libraries (without VAAPI/X11 for ARM)
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl1.1 \ libssl3 \
libssl1.1:armhf \ libssl3:armhf \
libasound2-dev:armhf \ libasound2-dev:armhf \
libv4l-dev:armhf \ libv4l-dev:armhf \
libudev-dev:armhf \ libudev-dev:armhf \

18
build/cross/Dockerfile.x86_64
View File

@@ -1,10 +1,9 @@
# Cross-compilation image for x86_64 based on Debian 11 # Cross-compilation image for x86_64 based on Debian 12
# Build on Debian 11 (GLIBC 2.31) for maximum runtime compatibility # Build on Debian 12 (GLIBC 2.36) to match the runtime images
ARG DEBIAN_IMAGE=debian:11 ARG DEBIAN_IMAGE=debian:12
FROM ${DEBIAN_IMAGE} FROM ${DEBIAN_IMAGE}
ARG DEBIAN_SNAPSHOT=20260713T000000Z
ARG CHINAMIRRO=0 ARG CHINAMIRRO=0
ARG GH_PROXY=https://gh-proxy.com/ ARG GH_PROXY=https://gh-proxy.com/
ARG RUSTUP_DIST_SERVER_CN=https://rsproxy.cn ARG RUSTUP_DIST_SERVER_CN=https://rsproxy.cn
@@ -18,11 +17,12 @@ ARG X265_VERSION=3.4
ARG OPUS_VERSION=1.5.2 ARG OPUS_VERSION=1.5.2
ARG FFMPEG_ROCKCHIP_REV=40c412daccf08164493da0de990eb99a8948116b ARG FFMPEG_ROCKCHIP_REV=40c412daccf08164493da0de990eb99a8948116b
RUN printf '%s\n' \ # Optionally use China mirrors for builds in China.
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT}/ bullseye main" \ RUN if [ "$CHINAMIRRO" = "1" ]; then \
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/${DEBIAN_SNAPSHOT}/ bullseye-security main" \ sed -i -E \
"deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT}/ bullseye-updates main" \ -e 's@http://deb.debian.org/debian([[:space:]]|$)@http://mirrors.tuna.tsinghua.edu.cn/debian\1@g' \
> /etc/apt/sources.list /etc/apt/sources.list.d/debian.sources; \
fi
# Install Rust toolchain # Install Rust toolchain
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \

6
build/package-deb.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Build deb packages from pre-compiled binaries # Build deb packages from pre-compiled binaries
# Binaries are compiled once on Debian 11 (GLIBC 2.31) via build-images.sh # Binaries are compiled once on Debian 12 (GLIBC 2.36) via build-images.sh
# This script packages them directly on the host using dpkg-deb # This script packages them directly on the host using dpkg-deb
# Usage: ./build/build-deb.sh [arch] # Usage: ./build/build-deb.sh [arch]
# Example: ./build/build-deb.sh aarch64 # Example: ./build/build-deb.sh aarch64
@@ -125,7 +125,7 @@ EOF
chmod 755 "$PKG_DIR/DEBIAN/prerm" chmod 755 "$PKG_DIR/DEBIAN/prerm"
# Create control file # Create control file
BASE_DEPS="libc6 (>= 2.31), libgcc-s1, libstdc++6, libasound2t64 (>= 1.1) | libasound2 (>= 1.1), libdrm2 (>= 2.4)" BASE_DEPS="libc6 (>= 2.36), libgcc-s1, libstdc++6, libasound2t64 (>= 1.1) | libasound2 (>= 1.1), libdrm2 (>= 2.4)"
AMD64_DEPS="libva2 (>= 2.0), libva-drm2 (>= 2.10), libva-x11-2 (>= 2.10), libmfx-gen1.2 (>= 22.0) | libmfx1 (>= 21.1), libx11-6 (>= 1.6), libxcb1 (>= 1.14), i965-va-driver-shaders (>= 2.4), intel-media-va-driver-non-free (>= 21.1)" AMD64_DEPS="libva2 (>= 2.0), libva-drm2 (>= 2.10), libva-x11-2 (>= 2.10), libmfx-gen1.2 (>= 22.0) | libmfx1 (>= 21.1), libx11-6 (>= 1.6), libxcb1 (>= 1.14), i965-va-driver-shaders (>= 2.4), intel-media-va-driver-non-free (>= 21.1)"
DEPS="$BASE_DEPS" DEPS="$BASE_DEPS"
if [ "$DEB_ARCH" = "amd64" ]; then if [ "$DEB_ARCH" = "amd64" ]; then
@@ -143,7 +143,7 @@ Recommends: bluez
Maintainer: SilentWind <admin@mofeng.run> Maintainer: SilentWind <admin@mofeng.run>
Description: A open and lightweight IP-KVM solution Description: A open and lightweight IP-KVM solution
Enables BIOS-level remote management of servers and workstations. Enables BIOS-level remote management of servers and workstations.
Built on Debian 11, compatible with Debian 11+, Ubuntu 20.04+. Built on Debian 12, compatible with Debian 12+, Ubuntu 24.04+.
EOF EOF
# Build deb directly on host # Build deb directly on host