From 71d57fc924c59da24bcac6969efcd9147d591fda Mon Sep 17 00:00:00 2001 From: robojerk Date: Thu, 14 Aug 2025 13:06:25 -0700 Subject: [PATCH] Fix package metadata and build dependencies for Debian Trixie MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update debian/changelog: 1.5.1-1~noble1 → 1.5.1-1~trixie1 - Change distribution from noble-backports to trixie - Add missing build dependencies: libfuse3-dev, libsoup-3.0-dev, etc. - Update install.sh and README.md to reflect Trixie version - Fix repository URLs to use particle-os instead of robojerk - Ensure all required packages are available for successful build --- .forgejo/workflows/ci.yml | 11 +++++++---- README.md | 22 +++++++++++----------- debian/changelog | 2 +- install.sh | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index acdd927..36a3ab3 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -59,6 +59,9 @@ jobs: libcurl4-gnutls-dev libsystemd-dev libmount-dev \ libselinux1-dev libsepol-dev libarchive-dev \ libgpgme-dev libavahi-client-dev libavahi-common-dev \ + libfuse3-dev libsoup-3.0-dev gobject-introspection \ + gtk-doc-tools docbook-xml docbook-xsl xsltproc gjs \ + libglib2.0-doc \ libffi-dev libpcre2-dev libxml2-dev zlib1g-dev \ liblz4-dev liblzma-dev nettle-dev libgmp-dev \ libicu-dev libpython3-dev python3-dev \ @@ -67,7 +70,7 @@ jobs: - name: Checkout code run: | # Clone the repository manually - git clone https://git.raines.xyz/robojerk/bootc-deb.git /tmp/bootc-deb + git clone https://git.raines.xyz/particle-os/bootc-deb.git /tmp/bootc-deb cp -r /tmp/bootc-deb/* . cp -r /tmp/bootc-deb/.* . 2>/dev/null || true @@ -493,7 +496,7 @@ jobs: - name: Checkout code run: | - git clone https://git.raines.xyz/robojerk/bootc-deb.git /tmp/bootc-deb + git clone https://git.raines.xyz/particle-os/bootc-deb.git /tmp/bootc-deb cp -r /tmp/bootc-deb/* . cp -r /tmp/bootc-deb/.* . 2>/dev/null || true @@ -540,7 +543,7 @@ jobs: - name: Checkout code run: | - git clone https://git.raines.xyz/robojerk/bootc-deb.git /tmp/bootc-deb + git clone https://git.raines.xyz/particle-os/bootc-deb.git /tmp/bootc-deb cp -r /tmp/bootc-deb/* . cp -r /tmp/bootc-deb/.* . 2>/dev/null || true @@ -599,7 +602,7 @@ jobs: - name: Checkout code run: | - git clone https://git.raines.xyz/robojerk/bootc-deb.git /tmp/bootc-deb + git clone https://git.raines.xyz/particle-os/bootc-deb.git /tmp/bootc-deb cp -r /tmp/bootc-deb/* . cp -r /tmp/bootc-deb/.* . 2>/dev/null || true diff --git a/README.md b/README.md index 17dc6e0..791c442 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ A complete solution for building and distributing bootc .deb packages for Debian - **CI/CD**: Automated build pipeline with package upload to Forgejo - **Package Repository Integration**: Automatic upload to Forgejo package registry -**Note**: The libostree 2025.2-1 packages are available as Debian packages in the Forgejo repository: [libostree-dev](https://git.raines.xyz/robojerk/libostree-dev) +**Note**: The libostree 2025.2-1 packages are available as Debian packages in the Forgejo repository: [libostree-dev](https://git.raines.xyz/particle-os/libostree-dev) ## 🚀 Quick Start @@ -29,10 +29,10 @@ git clone bootc-deb cd bootc-deb # Step 1: Install libostree 2025.2-1 packages from Forgejo -curl -fsSL https://git.raines.xyz/api/packages/robojerk/debian/repository.key | sudo gpg --dearmor -o /usr/share/keyrings/forgejo-robojerk.gpg -echo "deb [signed-by=/usr/share/keyrings/forgejo-robojerk.gpg] https://git.raines.xyz/api/packages/robojerk/debian noble main" | sudo tee /etc/apt/sources.list.d/forgejo-robojerk.list +curl -fsSL https://git.raines.xyz/api/packages/particle-os/debian/repository.key | sudo gpg --dearmor -o /usr/share/keyrings/forgejo-particle-os.gpg +echo "deb [signed-by=/usr/share/keyrings/forgejo-particle-os.gpg] https://git.raines.xyz/api/packages/particle-os/debian trixie main" | sudo tee /etc/apt/sources.list.d/forgejo-particle-os.list sudo apt update -sudo apt install -y libostree-dev=2025.2-1~noble1 libostree-1-1=2025.2-1~noble1 +sudo apt install -y libostree-dev=2025.2-1~trixie1 libostree-1-1=2025.2-1~trixie1 # Step 2: Build the bootc .deb package ./build.sh @@ -57,7 +57,7 @@ bootc-deb/ ├── install.sh # Installation script ├── test-libostree-install.sh # Test libostree package installation ├── test-debian-upload.sh # Test package upload functionality -├── libostree-dev_noble_backport.sh # Legacy backport script (see separate repo) +├── libostree-dev_trixie_backport.sh # Legacy backport script (see separate repo) ├── README.md # This file ├── .forgejo/ # CI/CD workflows │ ├── workflows/ @@ -106,8 +106,8 @@ git clone bootc-deb cd bootc-deb # Install from Forgejo package repository -curl -fsSL https://git.raines.xyz/api/packages/robojerk/debian/repository.key | sudo gpg --dearmor -o /usr/share/keyrings/forgejo-robojerk.gpg -echo "deb [signed-by=/usr/share/keyrings/forgejo-robojerk.gpg] https://git.raines.xyz/api/packages/robojerk/debian noble main" | sudo tee /etc/apt/sources.list.d/forgejo-robojerk.list +curl -fsSL https://git.raines.xyz/api/packages/particle-os/debian/repository.key | sudo gpg --dearmor -o /usr/share/keyrings/forgejo-particle-os.gpg +echo "deb [signed-by=/usr/share/keyrings/forgejo-particle-os.gpg] https://git.raines.xyz/api/packages/particle-os/debian trixie main" | sudo tee /etc/apt/sources.list.d/forgejo-particle-os.list sudo apt update sudo apt install -y bootc ``` @@ -120,7 +120,7 @@ The complete workflow will: ## 📦 Package Information - **Package Name**: bootc -- **Version**: 1.5.1-1~noble1 +- **Version**: 1.5.1-1~trixie1 - **Target**: Ubuntu Noble (24.04 LTS) - **Dependencies**: libostree-1-1 (>= 2025.2), systemd, podman|docker.io, skopeo @@ -137,8 +137,8 @@ This packaging is specifically designed for Aurora-style workflow: Both libostree and bootc packages are available from the Forgejo package repository: -- **Repository**: [libostree-dev](https://git.raines.xyz/robojerk/libostree-dev) -- **Package Registry**: [Forgejo Packages](https://git.raines.xyz/robojerk/-/packages) +- **Repository**: [libostree-dev](https://git.raines.xyz/particle-os/libostree-dev) +- **Package Registry**: [Forgejo Packages](https://git.raines.xyz/particle-os/-/packages) - **Automated builds** with CI/CD integration - **Complete dependency chain** from libostree to bootc - **Easy installation** via standard apt commands @@ -149,7 +149,7 @@ If you prefer to build manually: ```bash # 1. Install libostree 2025.2-1 backport (if needed) -# See: https://git.raines.xyz/robojerk/libostree-dev +# See: https://git.raines.xyz/particle-os/libostree-dev # 2. Clone bootc source git clone --depth 1 --branch v1.5.1 https://github.com/containers/bootc.git bootc-1.5.1 diff --git a/debian/changelog b/debian/changelog index aafc496..c27bf18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -bootc (1.5.1-1~noble1) noble-backports; urgency=medium +bootc (1.5.1-1~trixie1) trixie; urgency=medium * Initial Debian package for bootc * Includes compatibility patch for libostree 2025.2-1 on Ubuntu Noble diff --git a/install.sh b/install.sh index fb26448..b6b828d 100755 --- a/install.sh +++ b/install.sh @@ -53,7 +53,7 @@ check_libostree() { find_deb_file() { log_info "Looking for bootc .deb file..." - DEB_FILE=$(find . -name "bootc_1.5.1-1~noble1_*.deb" | head -n 1) + DEB_FILE=$(find . -name "bootc_1.5.1-1~trixie1_*.deb" | head -n 1) if [ -z "$DEB_FILE" ]; then log_error "No bootc .deb file found. Please run ./build.sh first."