keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8db7821c30
rpm-ostree/rust/Cargo.toml

47 lines
1.2 KiB
TOML
Raw Normal View History

Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
[package]
build-sys: Make Rust library naming/entrypoint more generic Prep for adding more functionality beyond treefile bits. Closes: #1444 Approved by: jlebon
2018-07-04 21:50:40 +03:00
name = "rpmostree-rust"
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
version = "0.1.0"
status: Detect if staging failed in previous boot Sample output: ``` $ rpm-ostree status State: idle Warning: failed to finalize previous deployment check `journalctl -b -1 -u ostree-finalize-staged.service` AutomaticUpdates: disabled ... ``` (Though open to tweaking it). I also played with directly invoking `journalctl` for the user, but that can get really spammy with e.g. `os-prober` output and such. I wrote this in Rust using journal API wrappers because I also plan to implement the `history` command in Rust and will also enhance that new `journal` module there for that. Requires: https://github.com/ostreedev/ostree/pull/1750 Requires: https://github.com/jmesmon/rust-systemd/pull/54 (Though I've pointed the manifest at my branch for now for CI). Closes: #1567 Closes: #1601 Approved by: cgwalters
2018-10-05 19:57:00 +03:00
authors = ["Colin Walters <walters@verbum.org>", "Jonathan Lebon <jonathan@jlebon.com>"]
rust: Update to 2018 edition This mostly involves adjusting our path uses to be anchored, e.g. at `self::` or `crate::`. I took the opportunity to also tweak `use` ordering so that we consistently list modules in external crates first before our own. Closes: #1812 Approved by: lucab
2019-04-14 21:54:32 +03:00
edition = "2018"
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
[dependencies]
rust: Use `failure` crate for errors In a lot of places we're abusing `io::Error(io::ErrorKind::InvalidInput)` which is both verbose and inaccurate really. Maybe in some places we should be defining custom errors, but eh. I like the `failure` crate. Use it in just `utils.rs` for now. Tweak our error handling FFI wrappers to accept `Display` since all we do is convert the error to a string. Closes: #1675 Approved by: lucab
2018-11-13 23:34:38 +03:00
failure = "0.1.3"
rust/treefile: Add support for parsing JSON too Prep for moving more of our parsing into Rust. The main thing here is that for JSON, we need to continue to ignore unknown fields. It took me a little while but I eventually figured out that using `#[serde(flatten)]` works for this. Seriously: serde is freaking amazingly awesome. Closes: #1580 Approved by: jlebon
2018-09-12 17:11:33 +03:00
serde = "1.0.78"
serde_derive = "1.0.78"
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
serde_json = "1.0"
rust: Bump dependencies This leaves only indicatif outdated (see link in diff). Closes: #1720 Approved by: cgwalters
2018-12-19 23:33:17 +03:00
serde_yaml = "0.8"
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
libc = "0.2"
build(deps): bump nix from 0.15.0 to 0.16.1 in /rust Bumps [nix](https://github.com/nix-rust/nix) from 0.15.0 to 0.16.1. - [Release notes](https://github.com/nix-rust/nix/releases) - [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md) - [Commits](https://github.com/nix-rust/nix/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-29 00:46:33 +03:00
nix = "0.16.1"
rust: Bump dependencies Now that our minimum Rust toolchain version was bumped, we can bump all our deps to the latest and drop the frozen `rand` version that was done for #1777. Closes: #1810 Approved by: jlebon
2019-04-03 18:35:04 +03:00
glib-sys = "0.8.0"
gio-sys = "0.8.0"
glib = "0.7.1"
rust: Rework treefile to be an object In a later patch I'm going to add more API; basically rather than doing the JSON parsing from C, we can add APIs to directly access the treefile object. This also demonstrates how we can do more extensive APIs, in particular implement an "object" in Rust. The ownership across the FFI boundary becomes nicer here too, we don't need to do a dance with the fd. For writing this I found http://jakegoulding.com/rust-ffi-omnibus/objects/ quite useful, as well as https://github.com/rust-lang/regex/blob/master/regex-capi/src/rure.rs Closes: #1474 Approved by: jlebon
2018-07-28 00:36:34 +03:00
tempfile = "3.0.3"
rust: Bump dependencies Notably, the latest indicatif compiles fine again. This is now the latest of everything, except the glib stack: ``` $ cargo outdated -R Name Project Compat Latest Kind Platform ---- ------- ------ ------ ---- -------- gio-sys 0.7.0 --- 0.8.0 Normal --- glib 0.6.1 --- 0.7.1 Normal --- glib-sys 0.7.0 --- 0.8.0 Normal --- ``` because it requires a newer rustc than we're currently locked at. Closes: #1770 Approved by: cgwalters
2019-03-01 18:19:01 +03:00
clap = "~2.32"
Add hidden `coreos-rootfs seal` command All this does is put the immutable bit on the target directory. The intention is to replace this bit to start: https://github.com/coreos/coreos-assembler/blob/8b205bfbb971707382ace76bbb39e46ed3fc560d/src/create_disk.sh#L229 However, the real goal here is to add code in this file to handle redeploying the rootfs for Fedora CoreOS which combines OSTree+Ignition: https://github.com/coreos/fedora-coreos-tracker/issues/94 Basically doing this in proper Rust is going to be a lot nicer than shell script in dracut modules. Among other details, coreutils `mv` doesn't seem to do the right thing for SELinux labels when policy isn't loaded.
2019-09-25 14:52:44 +03:00
structopt = "0.2"
rust: Add support for inline rojig spec files The rojig spec is almost entirely rpm-ostree implementation details; let's not have lots of people fork/duplicate it. Rather add the bits of rojig to the treefile that people need to define (most notably the name). Prep for stabilizing rojig. I had a few false starts with this PR; managing ownership/lifetimes across C/Rust is just complicated. I got bit hard by the fact that the workdir in `--unified-core` is really dfd-relative, and had to do a dance to propagate the dfd into rust, as well as down into the rojig builder. Closes: #1484 Approved by: jlebon
2018-07-27 21:16:05 +03:00
openat = "0.1.15"
Move openat_utils to its own crate I wanted to use this in another project, and I don't think we're the only ones. I extracted the code, added better docs and tests, and published to crates.io: https://crates.io/crates/openat-ext
2019-08-21 04:42:49 +03:00
openat-ext = "0.1.0"
app: Add support for passing URLs to RPMs This teaches the client to fetch packages from URLs directly so that one doesn't have to `curl` first and then install. Supported anywhere package filenames are allowed (notably: `install` and `override replace`). One neat things about this is that we download the file into an `O_TMPFILE` and then pass on ownership of that fd directly to the daemon. So at no point are the packages actually laying visible on the system. (Assuming the filesystem supports `O_TMPFILE` that is). This adds direct linking to libcurl and openssl, two libraries which we were already pulling in indirectly. Closes: #1508 Approved by: cgwalters
2018-08-18 00:34:02 +03:00
curl = "0.4.14"
Add rayon dependency, do postprocessing in parallel Obviously doing these trivial functions in parallel doesn't matter, but I wanted to dip my toes into Rayon (and Rust parallelism in general). `try_for_each()` is just...staggeringly simple and beautiful. Closes: #1727 Approved by: jlebon
2019-01-07 20:49:31 +03:00
rayon = "1.0"
rust/treefile: Use the c_utf8 crate The advantage of this over CStr is that Rust knows it's UTF-8 too. I also tweaked our path code to use String, and only view it as a `Path`. This avoids having to `unwrap()` later back to a `str`. Closes: #1588 Approved by: jlebon
2018-09-27 16:31:50 +03:00
c_utf8 = "0.1.0"
rust: Drop crates-io patch and use 0.4.0 The latest release of the crate includes the features and fixes we need. Closes: #1639 Approved by: cgwalters
2018-10-25 21:52:12 +03:00
systemd = "0.4.0"
build(deps): bump indicatif from 0.11.0 to 0.13.0 in /rust Bumps [indicatif](https://github.com/mitsuhiko/indicatif) from 0.11.0 to 0.13.0. - [Release notes](https://github.com/mitsuhiko/indicatif/releases) - [Commits](https://github.com/mitsuhiko/indicatif/compare/0.11.0...0.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-28 22:28:34 +03:00
indicatif = "0.13.0"
Use indicatif for progress This turned out to be messier than I thought, because of two primary factors; the biggest mess here of course is the indirection through the DBus API. The other problem is that previously we passed the string to render each time, and with current indicatif that'd trigger a rerender. Since (usually) don't change the "prefix string", rework the API. Change the "percent/n_items" bits to use autocleanups as well, and to take the prefix string as an initial argument. Since the state expands to multiple components, also change the API to use the `0-initialized` pattern rather than trying to return an aggregate. We also gain a "sub message" which we use to display e.g. package names as we're doing checkouts. Note this ends up at the end, since otherwise everything else jumps around. Closes: #1661 Approved by: rfairley
2018-10-23 17:31:57 +03:00
lazy_static = "1.1.0"
treefile: allow ${releasever} in more keys Besides allowing ${releasever}, only do the substitution as the final pass after merging the treefiles for all the keys (currently ${basearch} and ${releasever}) instead of doing it per parse. This way we have the expected semantics where one could do: ``` include: "fedora-coreos.yaml" releasever: "42" ``` and have that releasever used. Fixes #1809 Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com> Closes: #1848 Approved by: cgwalters
2019-06-04 12:09:35 +03:00
envsubst = "0.1.0"
rust/lockfile: Add more metadata to generated lockfiles E.g. the generation timestamp, repos that were enabled, and their generation timestamps. This is just generally useful, though I'd like to make use specifically of the new `metadata.generated` key in FCOS to drive versioning: https://github.com/coreos/fedora-coreos-releng-automation/pull/50
2019-11-11 16:50:58 +03:00
chrono = { version = "0.4.9", features = ["serde"] }
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
[lib]
build-sys: Make Rust library naming/entrypoint more generic Prep for adding more functionality beyond treefile bits. Closes: #1444 Approved by: jlebon
2018-07-04 21:50:40 +03:00
name = "rpmostree_rust"
rust: Split out treefile into its own module Further prep for adding more code here. The `lib.rs` then is the collection of glue functions; perhaps in some ideal future it could be generated even. Closes: #1444 Approved by: jlebon
2018-07-04 22:17:51 +03:00
path = "src/lib.rs"
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
crate-type = ["staticlib"]
[profile.release]
build-sys: Turn Rust LTO off by default, add --enable-lto flag For us, this is primarily right now a size issue. See: https://internals.rust-lang.org/t/rust-staticlibs-and-optimizing-for-size/5746 For more information, there are these two issues: https://github.com/rust-lang/cargo/issues/4349 https://bugzilla.mozilla.org/show_bug.cgi?id=1386371 The basic issue here is that a build with LTO off (and a trivial change to add a `println!` takes 14s here, and with it on takes 38s. However, with LTO off the stripped size of `librpmostree_rust.a` is `6M`, with LTO on it's `1.1M`. I named this `--enable-lto` as I'd like to investigate doing this for the C code too. Closes: #1664 Approved by: jlebon
2018-11-05 18:50:24 +03:00
# Unwinding across FFI boundaries is undefined behavior, and anyways, we're
# [crash-only](https://en.wikipedia.org/wiki/Crash-only_software)
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
panic = "abort"
build-sys: Turn Rust LTO off by default, add --enable-lto flag For us, this is primarily right now a size issue. See: https://internals.rust-lang.org/t/rust-staticlibs-and-optimizing-for-size/5746 For more information, there are these two issues: https://github.com/rust-lang/cargo/issues/4349 https://bugzilla.mozilla.org/show_bug.cgi?id=1386371 The basic issue here is that a build with LTO off (and a trivial change to add a `println!` takes 14s here, and with it on takes 38s. However, with LTO off the stripped size of `librpmostree_rust.a` is `6M`, with LTO on it's `1.1M`. I named this `--enable-lto` as I'd like to investigate doing this for the C code too. Closes: #1664 Approved by: jlebon
2018-11-05 18:50:24 +03:00
# We assume we're being delivered via e.g. RPM which supports split debuginfo
rust: Use debug=true for release builds Because our primary delivery vechicle uses RPM which supports separate debuginfo, there's no reason not to build release builds with debuginfo, so that one can use gdb on them just like we do with C. Closes: #1550 Approved by: jlebon
2018-09-10 20:50:24 +03:00
debug = true
build-sys: Turn Rust LTO off by default, add --enable-lto flag For us, this is primarily right now a size issue. See: https://internals.rust-lang.org/t/rust-staticlibs-and-optimizing-for-size/5746 For more information, there are these two issues: https://github.com/rust-lang/cargo/issues/4349 https://bugzilla.mozilla.org/show_bug.cgi?id=1386371 The basic issue here is that a build with LTO off (and a trivial change to add a `println!` takes 14s here, and with it on takes 38s. However, with LTO off the stripped size of `librpmostree_rust.a` is `6M`, with LTO on it's `1.1M`. I named this `--enable-lto` as I'd like to investigate doing this for the C code too. Closes: #1664 Approved by: jlebon
2018-11-05 18:50:24 +03:00
# For true release builds, we do suggest you enable LTO via e.g.
# env RUSTFLAGS='-C lto=true' as part of the outer build. It's just
# off by default because it's quite slow and the default is more oriented
# towards local development.
Reference in New Issue Copy Permalink