Skip to content

Commit

Permalink
WIP: Adapt to and use new ostree-ext tar-split branch
Browse files Browse the repository at this point in the history
Depends ostreedev/ostree-rs-ext#123

We gain a new `rpm-ostree container-encapsulate` option which
is like `ostree container encapsulate`, but generates chunked
images using the RPM database.

And on the client side, we now know how to handle incremental
updates - chunks that haven't changed won't be redownloaded.
  • Loading branch information
cgwalters committed Mar 22, 2022
1 parent 0c738fb commit d084970
Show file tree
Hide file tree
Showing 12 changed files with 550 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,7 @@ bin-unit-tests = []
sanitizers = []

default = []

[patch.crates-io]
ostree-ext = { git = "https://github.com/cgwalters/ostree-rs-ext", branch = "tar-split" }
#ostree-ext = { path = "../../ostreedev/ostree-rs-ext/lib" }
2 changes: 1 addition & 1 deletion rust/src/composepost.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pub(crate) static COMPAT_VARLIB_SYMLINKS: &[&str] = &["alternatives", "vagrant"]

/* See rpmostree-core.h */
const RPMOSTREE_BASE_RPMDB: &str = "usr/lib/sysimage/rpm-ostree-base-db";
const RPMOSTREE_RPMDB_LOCATION: &str = "usr/share/rpm";
pub(crate) const RPMOSTREE_RPMDB_LOCATION: &str = "usr/share/rpm";
const RPMOSTREE_SYSIMAGE_RPMDB: &str = "usr/lib/sysimage/rpm";
pub(crate) const TRADITIONAL_RPMDB_LOCATION: &str = "var/lib/rpm";

Expand Down
Loading

0 comments on commit d084970

Please sign in to comment.