Skip to content

Commit

Permalink
Merge pull request #5069 from cgwalters/fix-compat-modularity
Browse files Browse the repository at this point in the history
core: Continue to write now-empty `rpmostree.modules` metadata
  • Loading branch information
cgwalters authored Aug 29, 2024
2 parents 8b5c7b9 + d054672 commit fa51aa4
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/libpriv/rpmostree-core.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -4653,6 +4653,14 @@ rpmostree_context_commit (RpmOstreeContext *self, const char *parent,
g_variant_builder_add (&metadata_builder, "{sv}", "rpmostree.packages",
g_variant_builder_end (pkgs_v));

/* Older versions of rpm-ostree bail if this isn't found:
* https://github.com/coreos/rpm-ostree/issues/5048
* In practice we may as well keep this until the end of time...
*/
auto modules_v = g_variant_builder_new (G_VARIANT_TYPE ("as"));
g_variant_builder_add (&metadata_builder, "{sv}", "rpmostree.modules",
g_variant_builder_end (modules_v));

/* embed packages removed */
/* we have to embed both the pkgname and the full nevra to make it easier to match
* them up with origin directives. the full nevra is used for status -v */
Expand Down

0 comments on commit fa51aa4

Please sign in to comment.