Remove rpm depency from packagesystem!

.cci.jenkinsfile

@@ -17,7 +17,6 @@ parallel build: {
       }
       stage("Unit tests") {
         shwrap("""
-          cargo test --features rpm
           cargo test
         """)
       }

Cargo.toml

@@ -37,7 +37,6 @@ log = "^0.4"
 cap-std = "4.0.2"
 openssl = "^0.10"
 os-release = "0.1.0"
-rpm-version = { version = "0.5.0", default-features = false, optional = true }
 rustix = { version = "1.1.4", features = ["process", "fs"] }
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
@@ -60,4 +59,4 @@ tag-message = "bootupd {{version}}"
 
 [features]
 default = []
-rpm = ["rpm-version"]
+rpm = []

Makefile

@@ -5,6 +5,7 @@ RELEASE ?= 1
 CONTAINER_RUNTIME ?= podman
 IMAGE_PREFIX ?=
 IMAGE_NAME ?= bootupd-build
+PACKAGESYSTEM ?= rpm
 
 ifeq ($(RELEASE),1)
         PROFILE ?= release
@@ -24,10 +25,16 @@ all:
 	ln -f target/${PROFILE}/bootupd target/${PROFILE}/bootupctl
 
 .PHONY: install
-install:
+install: query-file-$(PACKAGESYSTEM)
 	mkdir -p "${DESTDIR}$(PREFIX)/bin" "${DESTDIR}$(LIBEXECDIR)"
 	install -D -t "${DESTDIR}$(LIBEXECDIR)" target/${PROFILE}/bootupd
-	ln -f ${DESTDIR}$(LIBEXECDIR)/bootupd ${DESTDIR}$(PREFIX)/bin/bootupctl
+	ln -f "${DESTDIR}$(LIBEXECDIR)/bootupd" "${DESTDIR}$(PREFIX)/bin/bootupctl"
+
+.PHONY: query-file-$(PACKAGESYSTEM)
+query-file-$(PACKAGESYSTEM):
+	install -D -m 755 \
+		"packagesystem/query-file-owner-$(PACKAGESYSTEM)" \
+		"${DESTDIR}$(PREFIX)/lib/bootupd/packagesystem/query-file-owner"
 
 .PHONY: install-grub-static
 install-grub-static:

README-devel.md

@@ -21,13 +21,31 @@ There's a reference [Dockerfile](Dockerfile) that builds on [CentOS Stream bootc
 
 ## Integrating bootupd into a distribution/OS
 
-Today, bootupd only really works on systems that use RPMs and ostree.
-(Which usually means rpm-ostree, but not strictly necessarily)
+Today, bootupd only really works on systems that use ostree.
 
 Many bootupd developers (and current CI flows) target Fedora CoreOS
 and derivatives, so it can be used as a "reference" for integration.
 
-There's two parts to integration:
+There's three parts to integration:
+
+### Modifying query-file-owner
+
+This script provides package ownership detection for `packagesystem.rs`, there are already done scripts for the package systems in `packagesystem/query-file-owner-*`,
+in the file filesystem there's only one script for one package system in `usr/lib/bootupd/packagesystem/query-file-owner` in the sysroot.
+
+Now you need to modify this file to work with your package manager, ex. `deb/pacman/apk/rpm`
+
+You can test it like this:
+`query-file-owner [FILE] [FILE...]`
+
+- Make sure it returns a list of packages info and it should look like this:
+  `grub2-efi-x64 1:2.06-95.fc38
+  shim-x64 15.6-2` (one package per line)
+
+  So, the output of package looks like this:
+  `NAME VERSION`
+
+- You can use already done query-file-owner using for ex.: `make install-all PACKAGESYSTEM=rpm` the supported package systems are: `deb`, `rpm`, `pacman` and `apk`
 
 ### Generating an update payload
 

contrib/packaging/bootupd.spec

@@ -54,6 +54,7 @@ Conflicts:      bootc < 1.14.1
 %{_bindir}/bootupctl
 %{_libexecdir}/bootupd
 %{_prefix}/lib/bootupd/grub2-static/
+%{_prefix}/lib/bootupd/packagesystem/query-file-owner
 %{_unitdir}/bootloader-update.service
 
 %prep

packagesystem/query-file-owner-apk

@@ -0,0 +1,30 @@
+#!/usr/bin/sh
+set -eu
+
+# Script to detect package ownership of a file in a Linux system.
+# Required environment setup for consistent output
+export LC_ALL=C
+export LANG=C
+
+# Usage: ./query-file-owner [FILE] [FILE...]
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 [FILE] [FILE...]"
+    exit 1
+fi
+
+for FILE in "$@"; do
+    # Use your package manager to find the package that owns the file
+    # Package Manager should return two space-separated values: NAME and VERSION
+    ABS_FILE=$(realpath "$FILE" 2>/dev/null || echo "$FILE")
+
+    apk info -W "$ABS_FILE" 2>/dev/null | \
+        sed 's/.*is owned by //' | \
+        awk -F'-' '{
+            # Build version from the end
+            ver = $(NF-1) "-" $NF;
+            name = $1;
+            for(i=2; i<NF-1; i++) name = name "-" $i;
+            print name " " ver
+        }'
+done
+

packagesystem/query-file-owner-dpkg

@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+set -euo pipefail
+
+# Script to detect package ownership of a file in a Linux system.
+# Required environment setup for consistent output
+export LC_ALL=C
+export LANG=C
+
+# Usage: ./query-file-owner [FILE] [FILE...]
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 [FILE] [FILE...]"
+    exit 1
+fi
+
+for FILE in "$@"; do
+    # Use your package manager to find the package that owns the file
+    # Package Manager should return two space-separated values: NAME and VERSION
+    dpkg-query -W -f '${Package} ${Version}\n' "$(dpkg -S "$FILE" | cut -d: -f1)"
+done
+

packagesystem/query-file-owner-pacman

@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+set -euo pipefail
+
+# Script to detect package ownership of a file in a Linux system.
+# Required environment setup for consistent output
+export LC_ALL=C
+export LANG=C
+
+# Usage: ./query-file-owner [FILE] [FILE...]
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 [FILE] [FILE...]"
+    exit 1
+fi
+
+for FILE in "$@"; do
+    # Use your package manager to find the package that owns the file
+    # Package Manager should return two space-separated values: NAME and VERSION
+    pacman -Q "$(pacman -Qoq "$FILE")"
+done
+

packagesystem/query-file-owner-rpm

@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+set -euo pipefail
+
+# Script to detect package ownership of a file in a Linux system.
+# Required environment setup for consistent output
+export LC_ALL=C
+export LANG=C
+
+# Usage: ./query-file-owner [FILE] [FILE...]
+if [ "$#" -eq 0 ]; then
+    echo "Usage: $0 [FILE] [FILE...]"
+    exit 1
+fi
+
+for FILE in "$@"; do
+    # Use your package manager to find the package that owns the file
+    # Package Manager should return two space-separated values: NAME and VERSION
+    rpm -q --qf '%{NAME} %{EVR}\n' -f "$FILE"
+done
+

src/efi.rs

@@ -31,7 +31,8 @@ use crate::bootupd::RootContext;
 use crate::freezethaw::fsfreeze_thaw_cycle;
 use crate::model::*;
 use crate::ostreeutil;
-use crate::util::{self, get_metadata_timestamp};
+use crate::util;
+use crate::util::get_metadata_timestamp;
 use crate::{component::*, packagesystem::*};
 use crate::{filetree, grubconfigs};
 
@@ -902,7 +903,7 @@ fn generate_meta_from_usr_efi(sysroot_path: &Utf8Path) -> Result<ContentMetadata
     let mut packages = Vec::new();
     let mut modules_vec: Vec<Module> = vec![];
     for efi in efi_components {
-        packages.push(format!("{}-{}", efi.name, efi.version));
+        packages.push(format!("{} {}", efi.name, efi.version));
         modules_vec.push(Module {
             name: efi.name,
             rpm_evr: efi.version,

src/ostreeutil.rs

@@ -4,10 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-use std::path::Path;
-
 use anyhow::{Context, Result};
-use log::debug;
 
 /// https://github.com/coreos/rpm-ostree/pull/969/commits/dc0e8db5bd92e1f478a0763d1a02b48e57022b59
 #[cfg(any(
@@ -16,53 +13,6 @@ use log::debug;
     target_arch = "riscv64"
 ))]
 pub(crate) const BOOT_PREFIX: &str = "usr/lib/ostree-boot";
-const LEGACY_RPMOSTREE_DBPATH: &str = "usr/share/rpm";
-const SYSIMAGE_RPM_DBPATH: &str = "usr/lib/sysimage/rpm";
-
-/// Returns true if the target directory contains at least one file that does
-/// not start with `.`
-fn is_nonempty_dir(path: impl AsRef<Path>) -> Result<bool> {
-    let path = path.as_ref();
-    let it = match std::fs::read_dir(path) {
-        Ok(r) => r,
-        Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(false),
-        Err(e) => return Err(e.into()),
-    };
-    for ent in it {
-        let ent = ent?;
-        let name = ent.file_name();
-        if name.as_encoded_bytes().starts_with(b".") {
-            continue;
-        }
-        return Ok(true);
-    }
-    Ok(false)
-}
-
-pub(crate) fn rpm_cmd<P: AsRef<Path>>(sysroot: P) -> Result<std::process::Command> {
-    let mut c = std::process::Command::new("rpm");
-    let sysroot = sysroot.as_ref();
-    // Take the first non-empty database path
-    let mut arg = None;
-    for dbpath in [SYSIMAGE_RPM_DBPATH, LEGACY_RPMOSTREE_DBPATH] {
-        let dbpath = sysroot.join(dbpath);
-        if !is_nonempty_dir(&dbpath)? {
-            continue;
-        }
-        let mut s = std::ffi::OsString::new();
-        s.push("--dbpath=");
-        s.push(dbpath.as_os_str());
-        arg = Some(s);
-        break;
-    }
-    if let Some(arg) = arg {
-        debug!("Using dbpath {arg:?}");
-        c.arg(arg);
-    } else {
-        debug!("Failed to find dbpath");
-    }
-    Ok(c)
-}
 
 /// Get sysroot.bootloader in ostree repo config.
 pub(crate) fn get_ostree_bootloader() -> Result<Option<String>> {