compose: If repos is unset, use global ones

Cargo.toml

@@ -77,7 +77,7 @@ paste = "1.0"
 phf = { version = "0.11", features = ["macros"] }
 rand = "0.8.5"
 rayon = "1.10.0"
-regex = "1.11"
+regex = "1.10"
 reqwest = { version = "0.12", features = ["native-tls", "blocking", "gzip"] }
 rpmostree-client = { path = "rust/rpmostree-client", version = "0.1.0" }
 rust-ini = "0.21.1"

docs/treefile.md

@@ -27,9 +27,9 @@ It supports the following parameters:
    secret key must be in the home directory of the building user.  Defaults to
    none.
 
- * `repos`: array of strings, mandatory: Names of yum repositories to
+ * `repos`: array of strings, optional: Names of yum repositories to
    use, from any files that end in `.repo`, in the same directory as
-   the treefile.  `rpm-ostree compose tree` does not use the system
+   the treefile. If specified, `rpm-ostree compose tree` does not use the system
    `/etc/yum.repos.d`, because it's common to want to compose a target
    system distinct from the one the host sytem is running.
 

rust/src/treefile.rs

@@ -1383,11 +1383,6 @@ impl Treefile {
 
     /// Do some upfront semantic checks we can do beyond just the type safety serde provides.
     fn validate_base_config(config: &TreeComposeConfig) -> Result<()> {
-        if config.base.repos.is_none() && config.base.lockfile_repos.is_none() {
-            return Err(anyhow!(
-                r#"Treefile has neither "repos" nor "lockfile-repos""#
-            ));
-        }
         if config
             .base
             .repovars

src/app/rpmostree-compose-builtin-tree.cxx

@@ -321,8 +321,21 @@ install_packages (RpmOstreeTreeComposeContext *self, gboolean *out_unmodified,
     rpmlogSetFile (NULL);
   }
 
-  if (!set_repos_dir (dnfctx, **self->treefile_rs, self->workdir_dfd, cancellable, error))
-    return FALSE;
+  const char *source_root;
+  auto repos = (*self->treefile_rs)->get_repos ();
+  if (!repos.empty ())
+    {
+      g_print ("Using rpm-md repositories from context directory\n");
+      if (!set_repos_dir (dnfctx, **self->treefile_rs, self->workdir_dfd, cancellable, error))
+        return FALSE;
+      source_root = NULL;
+    }
+  else
+    {
+      g_print ("Using global rpm-md repositories\n");
+      source_root = "/";
+      dnf_context_set_repo_dir (dnfctx, "/etc/yum.repos.d");
+    }
 
   /* By default, retain packages in addition to metadata with --cachedir, unless
    * we're doing unified core, in which case the pkgcache repo is the cache.
@@ -340,7 +353,8 @@ install_packages (RpmOstreeTreeComposeContext *self, gboolean *out_unmodified,
 
   {
     g_autofree char *tmprootfs_abspath = glnx_fdrel_abspath (rootfs_dfd, ".");
-    if (!rpmostree_context_setup (self->corectx, tmprootfs_abspath, NULL, cancellable, error))
+    if (!rpmostree_context_setup (self->corectx, tmprootfs_abspath, source_root, cancellable,
+                                  error))
       return FALSE;
   }
 

src/libpriv/rpmostree-core.cxx

@@ -505,6 +505,7 @@ static void
 disable_all_repos (RpmOstreeContext *context)
 {
   GPtrArray *sources = dnf_context_get_repos (context->dnfctx);
+  g_debug ("Disabling %u known repos", sources->len);
   for (guint i = 0; i < sources->len; i++)
     {
       auto src = static_cast<DnfRepo *> (sources->pdata[i]);
@@ -659,7 +660,9 @@ rpmostree_context_setup (RpmOstreeContext *self, const char *install_root, const
   else if (releasever.length () > 0)
     dnf_context_set_release_ver (self->dnfctx, releasever.c_str ());
 
+  g_debug ("install_root: %s", install_root);
   dnf_context_set_install_root (self->dnfctx, install_root);
+  g_debug ("source_root: %s", source_root);
   dnf_context_set_source_root (self->dnfctx, source_root);
 
   /* Hackaround libdnf logic, ensuring that `/etc/dnf/vars` gets sourced
@@ -724,6 +727,11 @@ rpmostree_context_setup (RpmOstreeContext *self, const char *install_root, const
           if (!enable_repos (self, repos, error))
             return FALSE;
         }
+      else
+        {
+          GPtrArray *sources = dnf_context_get_repos (self->dnfctx);
+          g_debug ("global repositories known: %u", sources->len);
+        }
 
       /* only enable lockfile-repos if we actually have a lockfile so we don't even waste
        * time fetching metadata */