Merge branch 'ostreedev:main' into main

Author: qiuzhiqian

.github/workflows/bootc.yaml

@@ -32,11 +32,11 @@ jobs:
           sudo apt update
           sudo apt install -y crun/testing podman/testing skopeo/testing
       - name: build
-        run: sudo just build --build-arg=base=quay.io/centos-bootc/centos-bootc:${{ matrix.stream }}
+        run: sudo STREAM=${{ matrix.stream }} just build
       - name: unitcontainer
-        run: sudo just unitcontainer
+        run: sudo STREAM=${{ matrix.stream }} just unitcontainer
       - name: unittest
-        run: sudo just unittest
+        run: sudo STREAM=${{ matrix.stream }} just unittest
       - name: bootc install
         run: |
           set -xeuo pipefail

.github/workflows/tests.yml

@@ -213,18 +213,17 @@ jobs:
             configure-options: >-
               --with-crypto=openssl
 
-          # A build using libsoup3. After bookworm is released, this can
-          # be switched to Debian Stable.
-          - name: Debian Testing with libsoup3
-            image: debian:testing-slim
+          - name: Debian Stable with libsoup
+            image: debian:stable-slim
             container-options: --security-opt seccomp=unconfined
             pre-checkout-setup: |
               apt-get update
               apt-get install -y git
             extra-packages: >-
-              libsoup-3.0-dev
+              libsoup2.4-dev
             configure-options: >-
-              --with-soup3
+              --with-soup
+              --without-soup3
 
           # A build using static prepareorot
           - name: Debian stable + static-prepareroot

.lgtm.yml

@@ -9,7 +9,7 @@ name = "ostree"
 readme = "rust-bindings/README.md"
 repository = "https://github.com/ostreedev/ostree"
 rust-version = "1.77.0"
-version = "0.20.4"
+version = "0.20.5"
 
 include = [
     "/COPYING",

Cargo.toml

@@ -1,16 +1,22 @@
 # Detect the os for a workaround below
 osid := `. /usr/lib/os-release && echo $ID`
 
+stream := env('STREAM', 'stream9')
+build_args := "--jobs=4 --build-arg=base=quay.io/centos-bootc/centos-bootc:"+stream
+
 # Build the container image from current sources
 build *ARGS:
-    podman build --jobs=4 -t localhost/ostree {{ARGS}} .
+    podman build {{build_args}} -t localhost/ostree {{ARGS}} .
 
 build-unittest *ARGS:
-    podman build --jobs=4 --target build -t localhost/ostree-buildroot {{ARGS}} .
+    podman build {{build_args}} --target build -t localhost/ostree-buildroot {{ARGS}} .
 
 # Do a build but don't regenerate the initramfs
 build-noinitramfs *ARGS:
-    podman build --jobs=4 --target rootfs -t localhost/ostree {{ARGS}} .
+    podman build {{build_args}} --target rootfs -t localhost/ostree {{ARGS}} .
+
+unitcontainer-build *ARGS:
+    podman build {{build_args}} --target bin-and-test -t localhost/ostree-bintest {{ARGS}} .
 
 # We need a filesystem that supports O_TMPFILE right now (i.e. not overlayfs)
 # or ostree hard crashes in the http code =/
@@ -33,8 +39,6 @@ unittest-shell: build-unittest
 # For some reason doing the bind mount isn't working on at least the GHA Ubuntu 24.04 runner
 # without --privileged. I think it may be apparmor?
 unitpriv := if osid == "ubuntu" { "--privileged" } else { "" }
-unitcontainer-build:
-    podman build --jobs=4 --target bin-and-test -t localhost/ostree-bintest .
 unitcontainer: unitcontainer-build 
     # need cap-add=all for mounting
     podman run --rm --net=none {{unitpriv}} {{unittest_args}} --cap-add=all --env=TEST_CONTAINER=1 localhost/ostree-bintest /tests/run.sh
@@ -59,4 +63,4 @@ clang-format:
 
 # Check source files against clang-format defaults
 clang-format-check:
-    {{sourcefiles}} | xargs clang-format -i --Werror --dry-run
+    {{sourcefiles}} | xargs clang-format -i --Werror --dry-run

Justfile

@@ -97,7 +97,7 @@ case "$ID" in
             liblzma-dev
             libmount-dev
             libselinux1-dev
-            libsoup2.4-dev
+            libsoup-3.0-dev
             libsystemd-dev
             libtool
             libcap2-bin

ci/gh-install.sh

@@ -121,7 +121,7 @@ machines, you will need to choose a solution for `/etc/passwd`.  The
 core problem is that if you add a user to the system for a daemon, the
 OSTree upgrade process for `/etc` will simply notice that because
 `/etc/passwd` differs from the previous default, it will keep the
-modified config file, and your new OS user will not be visible.  
+modified config file, and your new OS user will not be visible.
 
 First, consider using [systemd DynamicUser=yes](https://0pointer.net/blog/dynamic-users-with-systemd.html)
 where applicable.  This entirely avoids problems with static
@@ -201,4 +201,4 @@ Then to actually deploy this tree for the next boot:
 `ostree admin deploy $osname/$releasename/$description`
 
 This is essentially what [rpm-ostree](https://github.com/projectatomic/rpm-ostree/)
-does to support its [package layering model](https://rpm-ostree.readthedocs.io/en/latest/manual/administrator-handbook/#hybrid-imagepackaging-via-package-layering).
+does to support its [package layering model](https://coreos.github.io/rpm-ostree/administrator-handbook/#hybrid-imagepackaging-via-package-layering).

docs/adapting-existing.md

@@ -44,15 +44,14 @@ Boston, MA 02111-1307, USA.
   </refsynopsisdiv>
 
   <refsect1>
-    <title>Experimental</title>
+    <title>Dealing with /opt</title>
     <para>
-      <emphasis role="bold">Note this feature is currently considered
-      experimental.</emphasis> It may not work correctly and some of its
-      semantics may be subject to change. Positive or negative feedback are both
-      welcome and may be provided at
-      <ulink url="https://github.com/ostreedev/ostree/discussions"/>. If using
-      the feature via rpm-ostree, feedback may also be provided at
-      <ulink url="https://github.com/coreos/rpm-ostree/issues/233"/>.
+      <emphasis role="bold">Note:</emphasis> In general, the preference for
+      handling <filename>/opt</filename> software is to use symbolic links for
+      just the parts that need to be mutable to some place in
+      <filename>/var</filename> that can be created e.g. by a
+      <literal>tmpfiles.d</literal> dropin. For more information, see
+      <ulink url="https://bootc-dev.github.io/bootc/building/guidance.html#handling-read-only-vs-writable-locations"/>.
     </para>
   </refsect1>
 

man/ostree-state-overlay@.service.xml

@@ -18,6 +18,7 @@ girs_directories = [ "../gir-files" ]
 
 generate = [
     "OSTree.AsyncProgress",
+    "OSTree.BlobReader",
     "OSTree.BootconfigParser",
     "OSTree.ChecksumFlags",
     "OSTree.ContentWriter",
@@ -83,6 +84,7 @@ manual = [
     "GLib.Quark",
     "GLib.String",
     "GLib.Variant",
+    "GLib.VariantDict",
     "GLib.VariantType",
 
     # [MANUAL] types implemented by hand