From 09cb728f30afba4a3e06f38e15150c5dfa4b4c5e Mon Sep 17 00:00:00 2001 From: DragonSlayer_14 Date: Sun, 20 Sep 2026 14:14:38 +0200 Subject: [PATCH] =?UTF-8?q?Ref:=20Entfernt=20vollst=C3=A4ndige=2032-Bit-Un?= =?UTF-8?q?terst=C3=BCtzung=20(i686)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Baut, paketiert und dokumentiert nur noch x86_64 und aarch64; i686-Cross-Compilation-Toolchain, -Targets und -Paketierungsschritte in den Gitea-Workflows sowie die i686-Linker-Konfiguration entfallen. Co-Authored-By: Claude Sonnet 5 --- .cargo/config.toml | 3 --- .gitea/workflows/main.yaml | 9 ++------- .gitea/workflows/testing.yaml | 9 ++------- .idea/jsonSchemas.xml | 16 ++++++++++++++++ AGENTS.md | 4 ++-- scripts/package-arch.py | 8 ++------ 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index c7356c5..bb28fe0 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -10,6 +10,3 @@ git-fetch-with-cli = true [target.aarch64-unknown-linux-gnu] linker = "aarch64-linux-gnu-gcc" - -[target.i686-unknown-linux-gnu] -linker = "i686-linux-gnu-gcc" diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index f201502..b9fac9e 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -64,7 +64,7 @@ jobs: - name: Install Cross-Compilation Toolchains (apt) run: | sudo apt-get update - sudo apt-get install -y gcc-aarch64-linux-gnu gcc-i686-linux-gnu + sudo apt-get install -y gcc-aarch64-linux-gnu - name: Ermittle Rust-Version für Rustup-Target-Cache-Key run: echo "RUST_VERSION=$(rustc --version | awk '{print $2}')" >> "$GITHUB_ENV" @@ -75,12 +75,11 @@ jobs: with: path: | ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/aarch64-unknown-linux-gnu - ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/i686-unknown-linux-gnu key: rustup-targets-${{ runner.os }}-${{ env.RUST_VERSION }} - name: Add Rust Cross-Compilation Targets if: steps.cache-rustup-targets.outputs.cache-hit != 'true' - run: rustup target add aarch64-unknown-linux-gnu i686-unknown-linux-gnu + run: rustup target add aarch64-unknown-linux-gnu - name: PATH um Cargo-bin-Verzeichnis ergänzen run: | @@ -111,7 +110,6 @@ jobs: run: | cargo build --release --target x86_64-unknown-linux-gnu cargo build --release --target aarch64-unknown-linux-gnu - cargo build --release --target i686-unknown-linux-gnu - name: Determine Build Number id: build_num @@ -130,20 +128,17 @@ jobs: run: | cargo deb --target x86_64-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build cargo deb --target aarch64-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build - cargo deb --target i686-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build - name: Build Fedora / RPM Packages (.rpm) run: | mkdir -p target/generate-rpm cargo generate-rpm --target x86_64-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm cargo generate-rpm --target aarch64-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm - cargo generate-rpm --target i686-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm - name: Build Arch Linux Packages (.pkg.tar.zst) run: | python3 scripts/package-arch.py --target x86_64-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}" python3 scripts/package-arch.py --target aarch64-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}" - python3 scripts/package-arch.py --target i686-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}" - name: Publish Packages to Gitea Package Registry env: diff --git a/.gitea/workflows/testing.yaml b/.gitea/workflows/testing.yaml index 6bf6d29..42cf728 100644 --- a/.gitea/workflows/testing.yaml +++ b/.gitea/workflows/testing.yaml @@ -64,7 +64,7 @@ jobs: - name: Install Cross-Compilation Toolchains (apt) run: | sudo apt-get update - sudo apt-get install -y gcc-aarch64-linux-gnu gcc-i686-linux-gnu + sudo apt-get install -y gcc-aarch64-linux-gnu - name: Ermittle Rust-Version für Rustup-Target-Cache-Key run: echo "RUST_VERSION=$(rustc --version | awk '{print $2}')" >> "$GITHUB_ENV" @@ -75,12 +75,11 @@ jobs: with: path: | ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/aarch64-unknown-linux-gnu - ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/i686-unknown-linux-gnu key: rustup-targets-${{ runner.os }}-${{ env.RUST_VERSION }} - name: Add Rust Cross-Compilation Targets if: steps.cache-rustup-targets.outputs.cache-hit != 'true' - run: rustup target add aarch64-unknown-linux-gnu i686-unknown-linux-gnu + run: rustup target add aarch64-unknown-linux-gnu - name: PATH um Cargo-bin-Verzeichnis ergänzen run: | @@ -111,7 +110,6 @@ jobs: run: | cargo build --release --target x86_64-unknown-linux-gnu cargo build --release --target aarch64-unknown-linux-gnu - cargo build --release --target i686-unknown-linux-gnu - name: Determine Build Number id: build_num @@ -130,20 +128,17 @@ jobs: run: | cargo deb --target x86_64-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build cargo deb --target aarch64-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build - cargo deb --target i686-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build - name: Build Fedora / RPM Packages (.rpm) run: | mkdir -p target/generate-rpm cargo generate-rpm --target x86_64-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm cargo generate-rpm --target aarch64-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm - cargo generate-rpm --target i686-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm - name: Build Arch Linux Packages (.pkg.tar.zst) run: | python3 scripts/package-arch.py --target x86_64-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}" python3 scripts/package-arch.py --target aarch64-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}" - python3 scripts/package-arch.py --target i686-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}" - name: Publish Packages to Gitea Package Registry env: diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml index bb9d296..9462e86 100644 --- a/.idea/jsonSchemas.xml +++ b/.idea/jsonSchemas.xml @@ -3,6 +3,22 @@ + + + + + + + diff --git a/AGENTS.md b/AGENTS.md index 3b7ff31..32e7104 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,7 +7,7 @@ Dieses Dokument dient als technischer Leitfaden und Kontextdokument für KI-Codi ## 1. Projektübersicht & Philosophie Dieses Repository ist ein **Rust-Projekt-Template** für Linux-Anwendungen und CLI-Tools mit Fokus auf: -- Automatisierte Multi-Architektur-Kompilierung (`x86_64`, `aarch64`, `i686`). +- Automatisierte Multi-Architektur-Kompilierung (`x86_64`, `aarch64`). - Native Paketierung für Debian (`.deb`), Fedora/RHEL (`.rpm`) und Arch Linux (`.pkg.tar.zst`) sowie Docker-Container-Images. - Vollständig automatisierte CI/CD-Pipelines via Gitea Actions (kompatibel mit Forgejo / GitHub Actions). - Automatisierte Sicherheits-Scans (Schwachstellen, Secrets) und Dependency-Updates. @@ -15,7 +15,7 @@ Dieses Repository ist ein **Rust-Projekt-Template** für Linux-Anwendungen und C ### Standards & Tech-Stack - **Sprache**: Rust (Edition 2024), Python 3 (für Hilfsskripte in `scripts/`). - **Rust Toolchain**: Stable. -- **Zielplattform**: Linux (GLIBC-basiert, Cross-Kompilierung für `x86_64-unknown-linux-gnu`, `aarch64-unknown-linux-gnu`, `i686-unknown-linux-gnu`). +- **Zielplattform**: Linux (GLIBC-basiert, Cross-Kompilierung für `x86_64-unknown-linux-gnu`, `aarch64-unknown-linux-gnu`). - **Container**: Docker-Images werden zusätzlich zu den nativen Paketen gebaut und in die Gitea Container Registry veröffentlicht. - **Sicherheits-Tooling**: Trivy, OSV-Scanner, TruffleHog (Secret-Scanning), Renovate (Dependency-Updates), Qodana (statische Codeanalyse). - **Lizenz**: GPL-3.0-or-later (sofern nicht im abgeleiteten Projekt anders definiert). diff --git a/scripts/package-arch.py b/scripts/package-arch.py index 5527523..80a6f69 100755 --- a/scripts/package-arch.py +++ b/scripts/package-arch.py @@ -17,10 +17,6 @@ TARGET_ARCH_MAP = { "aarch64-unknown-linux-musl": "aarch64", "aarch64": "aarch64", "arm64": "aarch64", - "i686-unknown-linux-gnu": "i686", - "i686-unknown-linux-musl": "i686", - "i686": "i686", - "i386": "i686", } @@ -200,8 +196,8 @@ def build_package(target_triple=None, target_arch=None, pkgrel=None): def main(): parser = argparse.ArgumentParser(description="Erstellt Arch Linux-Pakete (.pkg.tar.zst)") - parser.add_argument("--target", help="Rust Target-Triple (z.B. x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, i686-unknown-linux-gnu)") - parser.add_argument("--arch", help="Architektur (z.B. x86_64, aarch64, i686)") + parser.add_argument("--target", help="Rust Target-Triple (z.B. x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu)") + parser.add_argument("--arch", help="Architektur (z.B. x86_64, aarch64)") parser.add_argument("--pkgrel", help="Release-/Build-Nummer (z.B. 1, 2, ...)") args = parser.parse_args()