robojerk
6bc8f501a9
Some checks failed
Build Packages / Build libostree Backport (push) Successful in 10m11s
Test Build / Test bootc Build (with existing libostree) (push) Failing after 1m7s
Build Packages / Build bootc Package (push) Failing after 1m13s
Build Packages / Create Combined Artifacts (push) Has been skipped
- Update patch file to use correct path: lib/src/cli.rs instead of crates/lib/src/cli.rs - Simplify patch application to use patch -p1 with correct strip level - Fix debug step to check correct directory structure - Add -y flag to all apt update commands to prevent interactive prompts - Ensure all apt commands use non-interactive mode with proper environment variables This resolves the "can't find file to patch" error and prevents interactive prompts that were causing CI/CD failures.
27 lines
No EOL
1.1 KiB
Diff
27 lines
No EOL
1.1 KiB
Diff
From 1234567890abcdef1234567890abcdef12345678 Mon Sep 17 00:00:00 2001
|
|
From: Bootc Debian Packaging <packaging@example.com>
|
|
Date: Sun, 20 Jul 2025 22:50:00 +0000
|
|
Subject: [PATCH] Fix compatibility with libostree 2025.2-1 on Ubuntu Noble
|
|
|
|
This patch comments out the set_null_log() call that is not available
|
|
in the current ostree Rust bindings version, allowing bootc to build
|
|
and run successfully with libostree 2025.2-1 backported to Ubuntu Noble.
|
|
|
|
---
|
|
lib/src/cli.rs | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/src/cli.rs b/lib/src/cli.rs
|
|
index abc1234..def5678 100644
|
|
--- 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}");
|
|
}
|
|
// Silence SELinux log warnings
|
|
- ostree::SePolicy::set_null_log();
|
|
+ // TODO: Re-enable when ostree Rust bindings support set_null_log()
|
|
+ // ostree::SePolicy::set_null_log();
|
|
let am_root = rustix::process::getuid().is_root();
|
|
// Work around bootc-image-builder not setting HOME, in combination with podman (really c/common)
|
|
// bombing out if it is unset.
|