diff --git a/.forgejo/workflows/build-packages.yml b/.forgejo/workflows/build-packages.yml index b9629bd..ee5dc6d 100644 --- a/.forgejo/workflows/build-packages.yml +++ b/.forgejo/workflows/build-packages.yml @@ -35,7 +35,7 @@ jobs: - name: Add source repositories run: | echo "deb-src http://us.archive.ubuntu.com/ubuntu/ noble main universe" | tee /etc/apt/sources.list.d/noble-sources.list - apt update + apt update -y - name: Create backport directory run: | @@ -127,8 +127,8 @@ jobs: echo "Current directory: $(pwd)" echo "Files in current directory:" ls -la - echo "Files in crates/lib/src/ (if it exists):" - ls -la crates/lib/src/ 2>/dev/null || echo "Directory does not exist" + echo "Files in lib/src/ (if it exists):" + ls -la lib/src/ 2>/dev/null || echo "Directory does not exist" echo "Patch file location:" ls -la ../bootc-libostree-compatibility.patch @@ -140,19 +140,9 @@ jobs: echo "This patch is required for bootc to work with the libostree backport." exit 1 fi - # Try to find the correct path for the file to patch - if [ -f "crates/lib/src/cli.rs" ]; then - echo "Found crates/lib/src/cli.rs, applying patch..." - patch -p1 < ../bootc-libostree-compatibility.patch - elif [ -f "lib/src/cli.rs" ]; then - echo "Found lib/src/cli.rs, applying patch with -p0..." - patch -p0 < ../bootc-libostree-compatibility.patch - else - echo "❌ ERROR: Could not find cli.rs file to patch!" - echo "Available files:" - find . -name "*.rs" | head -20 - exit 1 - fi + # Apply patch with correct strip level for lib/src/cli.rs + echo "Applying patch to lib/src/cli.rs..." + patch -p1 < ../bootc-libostree-compatibility.patch - name: Copy debian packaging run: | diff --git a/bootc-libostree-compatibility.patch b/bootc-libostree-compatibility.patch index 3998249..00bddc3 100644 --- a/bootc-libostree-compatibility.patch +++ b/bootc-libostree-compatibility.patch @@ -8,13 +8,13 @@ in the current ostree Rust bindings version, allowing bootc to build and run successfully with libostree 2025.2-1 backported to Ubuntu Noble. --- - crates/lib/src/cli.rs | 3 ++- + lib/src/cli.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/crates/lib/src/cli.rs b/crates/lib/src/cli.rs +diff --git a/lib/src/cli.rs b/lib/src/cli.rs index abc1234..def5678 100644 ---- a/crates/lib/src/cli.rs -+++ b/crates/lib/src/cli.rs +--- a/lib/src/cli.rs ++++ b/lib/src/cli.rs @@ -1029,7 +1029,8 @@ pub fn global_init() -> Result<()> { eprintln!("failed to set name: {e}"); }