compose: Stabilize compose rootfs

Expose this as `rpm-ostree compose rootfs`.

Signed-off-by: Colin Walters <walters@verbum.org>

rpmostree-cxxrs.cxx

@@ -2196,6 +2196,9 @@ extern "C"
   ::rust::repr::PtrLen
   rpmostreecxx$cxxbridge1$compose_image (::rust::Vec< ::rust::String> *args) noexcept;
 
+  ::rust::repr::PtrLen
+  rpmostreecxx$cxxbridge1$compose_rootfs_entrypoint (::rust::Vec< ::rust::String> *args) noexcept;
+
   ::rust::repr::PtrLen rpmostreecxx$cxxbridge1$configure_build_repo_from_target (
       ::rpmostreecxx::OstreeRepo const &build_repo,
       ::rpmostreecxx::OstreeRepo const &target_repo) noexcept;
@@ -3980,6 +3983,17 @@ compose_image (::rust::Vec< ::rust::String> args)
     }
 }
 
+void
+compose_rootfs_entrypoint (::rust::Vec< ::rust::String> args)
+{
+  ::rust::ManuallyDrop< ::rust::Vec< ::rust::String> > args$ (::std::move (args));
+  ::rust::repr::PtrLen error$ = rpmostreecxx$cxxbridge1$compose_rootfs_entrypoint (&args$.value);
+  if (error$.ptr)
+    {
+      throw ::rust::impl< ::rust::Error>::error (error$);
+    }
+}
+
 void
 configure_build_repo_from_target (::rpmostreecxx::OstreeRepo const &build_repo,
                                   ::rpmostreecxx::OstreeRepo const &target_repo)

rpmostree-cxxrs.h

@@ -1862,6 +1862,8 @@ ::rpmostreecxx::GVariant *get_header_variant (::rpmostreecxx::OstreeRepo const &
 
 void compose_image (::rust::Vec< ::rust::String> args);
 
+void compose_rootfs_entrypoint (::rust::Vec< ::rust::String> args);
+
 void configure_build_repo_from_target (::rpmostreecxx::OstreeRepo const &build_repo,
                                        ::rpmostreecxx::OstreeRepo const &target_repo);
 

rust/src/compose.rs

@@ -518,6 +518,12 @@ impl RootfsOpts {
     }
 }
 
+pub(crate) fn compose_rootfs_entrypoint(args: Vec<String>) -> CxxResult<()> {
+    let args = args.iter().map(|v| v.as_str());
+    RootfsOpts::parse_from(["rootfs"].into_iter().chain(args)).run()?;
+    Ok(())
+}
+
 impl CommitToContainerRootfsOpts {
     /// Execute `compose commit-to-container-rootfs`. This just:
     /// - Opens up the target ostree repo

rust/src/lib.rs

@@ -282,6 +282,7 @@ pub mod ffi {
     // compose.rs
     extern "Rust" {
         fn compose_image(args: Vec<String>) -> Result<()>;
+        fn compose_rootfs_entrypoint(args: Vec<String>) -> Result<()>;
 
         fn configure_build_repo_from_target(
             build_repo: &OstreeRepo,

src/app/rpmostree-builtin-compose.cxx

@@ -53,6 +53,8 @@ static RpmOstreeCommand compose_subcommands[] = {
   { "image", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
     "Generate a reproducible \"chunked\" container image (using RPM data) from a treefile",
     rpmostree_compose_builtin_image },
+  { "rootfs", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD, "Generate a root filesystem tree from a treefile",
+    rpmostree_compose_builtin_rootfs },
   { NULL, (RpmOstreeBuiltinFlags)0, NULL, NULL }
 };
 
@@ -76,4 +78,16 @@ rpmostree_compose_builtin_image (int argc, char **argv, RpmOstreeCommandInvocati
     rustargv.push_back (std::string (argv[i]));
   CXX_TRY (rpmostreecxx::compose_image (rustargv), error);
   return TRUE;
+}
+
+gboolean
+rpmostree_compose_builtin_rootfs (int argc, char **argv, RpmOstreeCommandInvocation *invocation,
+                                  GCancellable *cancellable, GError **error)
+{
+  rust::Vec<rust::String> rustargv;
+  g_assert_cmpint (argc, >, 0);
+  for (int i = 0; i < argc; i++)
+    rustargv.push_back (std::string (argv[i]));
+  CXX_TRY (rpmostreecxx::compose_rootfs_entrypoint (rustargv), error);
+  return TRUE;
 }

src/app/rpmostree-compose-builtins.h

@@ -48,5 +48,8 @@ gboolean rpmostree_compose_builtin_container_encapsulate (int argc, char **argv,
 gboolean rpmostree_compose_builtin_image (int argc, char **argv,
                                           RpmOstreeCommandInvocation *invocation,
                                           GCancellable *cancellable, GError **error);
+gboolean rpmostree_compose_builtin_rootfs (int argc, char **argv,
+                                           RpmOstreeCommandInvocation *invocation,
+                                           GCancellable *cancellable, GError **error);
 
 G_END_DECLS

tests/compose-rootfs/Containerfile

@@ -17,7 +17,7 @@ COPY . /src
 WORKDIR /src
 RUN --mount=type=bind,from=repos,src=/,dst=/repos,rw <<EORUN
 set -xeuo pipefail
-exec rpm-ostree experimental compose rootfs --source-root-rw=/repos manifest.yaml /target-rootfs
+exec rpm-ostree compose rootfs --source-root-rw=/repos manifest.yaml /target-rootfs
 EORUN
 
 # This pulls in the rootfs generated in the previous step