keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
241cce1ec4
rpm-ostree/Cargo.toml

65 lines
1.5 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]
build(deps): bump anyhow from 1.0.34 to 1.0.35 in /rust Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.34 to 1.0.35. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.34...1.0.35) Signed-off-by: dependabot[bot] <support@github.com>
2020-12-07 18:35:43 +03:00
anyhow = "1.0.35"
Add support for some GObject bridging to cxx-rs cxx-rs has support for bridging types, but it's more awkward for us because those types are defined in other crates, so we need to do a newtype dance. Further cxx-rs doesn't currently support automatically generating wrappers, so add a custom `gobj_wrap()` for now.
2020-12-23 03:51:07 +03:00
paste = "1.0"
build(deps): bump serde from 1.0.117 to 1.0.118 in /rust Bumps [serde](https://github.com/serde-rs/serde) from 1.0.117 to 1.0.118. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.117...v1.0.118) Signed-off-by: dependabot[bot] <support@github.com>
2020-12-09 00:35:24 +03:00
serde = "1.0.118"
build(deps): bump serde_derive from 1.0.117 to 1.0.118 in /rust Bumps [serde_derive](https://github.com/serde-rs/serde) from 1.0.117 to 1.0.118. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.117...v1.0.118) Signed-off-by: dependabot[bot] <support@github.com>
2020-12-09 01:57:50 +03:00
serde_derive = "1.0.118"
build(deps): bump serde_json from 1.0.59 to 1.0.60 in /rust Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.59 to 1.0.60. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.59...v1.0.60) Signed-off-by: dependabot[bot] <support@github.com>
2020-12-08 02:04:18 +03:00
serde_json = "1.0.60"
build(deps): bump serde_yaml from 0.8.13 to 0.8.14 in /rust Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.8.13 to 0.8.14. - [Release notes](https://github.com/dtolnay/serde-yaml/releases) - [Commits](https://github.com/dtolnay/serde-yaml/compare/0.8.13...0.8.14) Signed-off-by: dependabot[bot] <support@github.com>
2020-11-02 09:51:21 +03:00
serde_yaml = "0.8.14"
build(deps): bump libc from 0.2.80 to 0.2.81 in /rust Bumps [libc](https://github.com/rust-lang/libc) from 0.2.80 to 0.2.81. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](https://github.com/rust-lang/libc/compare/0.2.80...0.2.81) Signed-off-by: dependabot[bot] <support@github.com>
2020-12-07 16:17:25 +03:00
libc = "0.2.81"
Use cxx-rs for core.rs This is much better than bindgen because it's fully safe. It's much more ergonomic too: - Invoke Rust methods-on-structs just like C++ methods-on-structs - Rust `Result<>` is translated automatically to exceptions See https://cxx.rs/context.html for more.
2020-12-11 04:21:33 +03:00
cxx = "1.0.18"
build(deps): bump nix from 0.19.0 to 0.19.1 in /rust Bumps [nix](https://github.com/nix-rust/nix) from 0.19.0 to 0.19.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/compare/v0.19.0...v0.19.1) Signed-off-by: dependabot[bot] <support@github.com>
2020-11-30 09:29:52 +03:00
nix = "0.19.1"
build(deps): bump glib-sys from 0.10.0 to 0.10.1 in /rust Bumps [glib-sys](https://github.com/gtk-rs/sys) from 0.10.0 to 0.10.1. - [Release notes](https://github.com/gtk-rs/sys/releases) - [Commits](https://github.com/gtk-rs/sys/compare/glib-sys-0.10.0...glib-sys-0.10.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-21 10:22:04 +03:00
glib-sys = "0.10.1"
rust: Update deps ``` $ cargo upgrade $ cargo update ```
2020-10-19 17:58:26 +03:00
glib = "0.10.3"
gio-sys = "0.10.1"
gio = "0.9.1"
ostree = { version = "0.9.1", features = ["v2020_4"] }
ostree-sys = "0.7.1"
tempfile = "3.1.0"
clap = "2.33.3"
build(deps): bump structopt from 0.3.20 to 0.3.21 in /rust Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.20 to 0.3.21. - [Release notes](https://github.com/TeXitoi/structopt/releases) - [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md) - [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.20...v0.3.21) Signed-off-by: dependabot[bot] <support@github.com>
2020-12-09 00:33:37 +03:00
structopt = "0.3.21"
build(deps): bump openat from 0.1.18 to 0.1.19 in /rust Bumps [openat](https://github.com/tailhook/openat) from 0.1.18 to 0.1.19. - [Release notes](https://github.com/tailhook/openat/releases) - [Commits](https://github.com/tailhook/openat/compare/v0.1.18...v0.1.19) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-15 21:32:40 +03:00
openat = "0.1.19"
build(deps): bump openat-ext from 0.1.8 to 0.1.9 in /rust Bumps [openat-ext](https://github.com/cgwalters/openat-ext) from 0.1.8 to 0.1.9. - [Release notes](https://github.com/cgwalters/openat-ext/releases) - [Commits](https://github.com/cgwalters/openat-ext/compare/v0.1.8...v0.1.9) Signed-off-by: dependabot[bot] <support@github.com>
2020-11-16 09:32:48 +03:00
openat-ext = "^0.1.9"
rust: Update deps ``` $ cargo upgrade $ cargo update ```
2020-10-19 17:58:26 +03:00
curl = "0.4.34"
build(deps): bump rayon from 1.4.1 to 1.5.0 in /rust Bumps [rayon](https://github.com/rayon-rs/rayon) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/rayon-rs/rayon/releases) - [Changelog](https://github.com/rayon-rs/rayon/blob/master/RELEASES.md) - [Commits](https://github.com/rayon-rs/rayon/compare/rayon-core-v1.4.1...rayon-core-v1.5.0) Signed-off-by: dependabot[bot] <support@github.com>
2020-10-26 09:32:58 +03:00
rayon = "1.5.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"
Add testutils generate-synthetic-upgrade We want to test upgrades that actually change files as a general rule; in some cases we want to test "large" upgrades to validate performance. This code generates a "synthetic" upgrade that adds an ELF note to a percentage of ELF files (randomly selected). By doing it this way we are only actually testing one version of the code. Migrated from https://github.com/coreos/coreos-assembler/pull/1635/ using the Rust code from https://github.com/ostreedev/ostree/pull/2127
2020-08-17 21:12:29 +03:00
rand = "0.7.3"
Move "ignored script list" to Rust, drop gperf Rust has a nice crate for doing perfect hashing. Move that code into Rust and drop the dependency on `gperf`. This also helps move away from Autotools.
2020-12-23 20:01:33 +03:00
phf = { version = "0.8", features = ["macros"] }
build(deps): bump systemd from 0.7.1 to 0.8.1 in /rust Bumps [systemd](https://github.com/jmesmon/rust-systemd) from 0.7.1 to 0.8.1. - [Release notes](https://github.com/jmesmon/rust-systemd/releases) - [Commits](https://github.com/jmesmon/rust-systemd/compare/systemd-0.7.1...systemd-0.8.1) Signed-off-by: dependabot[bot] <support@github.com>
2020-11-16 09:32:42 +03:00
systemd = "0.8.1"
build(deps): bump indicatif from 0.14.0 to 0.15.0 in /rust Bumps [indicatif](https://github.com/mitsuhiko/indicatif) from 0.14.0 to 0.15.0. - [Release notes](https://github.com/mitsuhiko/indicatif/releases) - [Commits](https://github.com/mitsuhiko/indicatif/compare/0.14.0...0.15.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-15 12:31:43 +03:00
indicatif = "0.15.0"
rust: Update deps ``` $ cargo upgrade $ cargo update ```
2020-10-19 17:58:26 +03:00
lazy_static = "1.4.0"
build(deps): bump envsubst from 0.1.1 to 0.2.0 in /rust Bumps [envsubst](https://github.com/lucab/envsubst-rs) from 0.1.1 to 0.2.0. - [Release notes](https://github.com/lucab/envsubst-rs/releases) - [Commits](https://github.com/lucab/envsubst-rs/compare/0.1.1...v0.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 17:53:34 +03:00
envsubst = "0.2.0"
daemon: Rewrite some core initramfs-overlay logic in Rust We had a memory safety/UB bug in the C code; let's use that as a good motivation to rewrite in Rust. It's a nice self contained bit.
2020-10-30 21:43:35 +03:00
subprocess = "0.2.6"
build(deps): bump chrono from 0.4.18 to 0.4.19 in /rust Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.18 to 0.4.19. - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.18...v0.4.19) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-05 10:19:54 +03:00
chrono = { version = "0.4.19", features = ["serde"] }
Move the main Rust infra (i.e. Cargo.toml) to the toplevel I think we should have done this as soon as it was clear that Rust was sticking and not just an optional thing. Reasons to make this change now: - More clear that Rust is going to be the majority of code in the future - `cargo build` and `cargo test` in a fresh git clone Just Work - Paves the way for using `cargo` to build C/C++ instead of Automake
2020-12-08 21:29:05 +03:00
libdnf-sys = { path = "rust/libdnf-sys", version = "0.1.0" }
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
Rework bindgen/cxx.rs usage and CI build cxx.rs (aka cxxbridge) and cbindgen are both generating source code. Since the last release we've introduced the former, and we need to ensure that the generated cxx.rs source ends up in release tarballs the same way as the cbindgen code. Rationalize and clean up the binding infrastructure. Drop support for the vendored cbindgen which we weren't actually using: Closes: https://github.com/coreos/rpm-ostree/issues/2392 Move the cxx-rs and cbindgen bits into the same place, and update our CoreOS CI build to use a separate `Makefile.bindings` that just generates the code, so our CI still "works like" a main Koji RPM build.
2020-12-31 19:55:19 +03:00
[build-dependencies]
cbindgen = "0.16.0"
Add fedora-integration: Support `override replace https://bodhi/...` This adds support for e.g.: ``` $ rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2020-2908628031 ``` This will find the Koji builds from the listed update, download all the RPMs (that aren't debuginfo) and pass them for overrides in the same way we support `override replace http://somewebserver/foo.rpm` now. We also support directly linking a Koji build: ``` $ rpm-ostree override replace https://koji.fedoraproject.org/koji/buildinfo?buildID=1625029 ``` Bodhi has a modern HTTP+JSON API, and the lack of a Koji equivalent drove me to create https://github.com/cgwalters/koji-sane-json-api and we currently depend on an instance set up in the OpenShift CI cluster. I hope it shouldn't take long to deploy this in Fedora Infra, but I don't want to block on it. Also notably this still downloads *all* the other RPMs even ones that aren't installed. Handling that truly correctly would require moving this logic to the daemon and core. All of this functionality is keyed off a `cfg(feature = "fedora-integration")` that is detected by a Rust `build.rs` which parses the build environment's `/etc/os-release` for now.
2020-12-28 17:16:32 +03:00
anyhow = "1.0"
Rework bindgen/cxx.rs usage and CI build cxx.rs (aka cxxbridge) and cbindgen are both generating source code. Since the last release we've introduced the former, and we need to ensure that the generated cxx.rs source ends up in release tarballs the same way as the cbindgen code. Rationalize and clean up the binding infrastructure. Drop support for the vendored cbindgen which we weren't actually using: Closes: https://github.com/coreos/rpm-ostree/issues/2392 Move the cxx-rs and cbindgen bits into the same place, and update our CoreOS CI build to use a separate `Makefile.bindings` that just generates the code, so our CI still "works like" a main Koji RPM build.
2020-12-31 19:55:19 +03:00
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"
Move the main Rust infra (i.e. Cargo.toml) to the toplevel I think we should have done this as soon as it was clear that Rust was sticking and not just an optional thing. Reasons to make this change now: - More clear that Rust is going to be the majority of code in the future - `cargo build` and `cargo test` in a fresh git clone Just Work - Paves the way for using `cargo` to build C/C++ instead of Automake
2020-12-08 21:29:05 +03:00
path = "rust/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
rust: Enable lto by default This avoids us leaking all of the Rust symbols as public into our shared library. Came up in team chat since one person tried to copy just `/usr/bin/rpm-ostree` from the dev container into a target and got a linker crash; but really we want to avoid all the duplicated symbols entirely. (And we should investigate cross-language LTO because that's the only way to get full savings)
2020-10-28 23:06:26 +03:00
# We need this to avoid leaking symbols, see
# https://internals.rust-lang.org/t/rust-staticlibs-and-optimizing-for-size/5746
lto = true
Default to sqlite rpmdb backend on f34 There won't be any support for writing to the bdb backend in f34, so e.g. pkglayering won't work (and obviously even composes wouldn't work once the buildroot moves to f34). Instead of requiring the whole world to add an `rpmdb` key in their manifests, let's just add a compile flag for it, and tweak the spec file to use this flag on f34.
2020-12-22 01:27:52 +03:00
[features]
sqlite-rpmdb-default = []
Add fedora-integration: Support `override replace https://bodhi/...` This adds support for e.g.: ``` $ rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2020-2908628031 ``` This will find the Koji builds from the listed update, download all the RPMs (that aren't debuginfo) and pass them for overrides in the same way we support `override replace http://somewebserver/foo.rpm` now. We also support directly linking a Koji build: ``` $ rpm-ostree override replace https://koji.fedoraproject.org/koji/buildinfo?buildID=1625029 ``` Bodhi has a modern HTTP+JSON API, and the lack of a Koji equivalent drove me to create https://github.com/cgwalters/koji-sane-json-api and we currently depend on an instance set up in the OpenShift CI cluster. I hope it shouldn't take long to deploy this in Fedora Infra, but I don't want to block on it. Also notably this still downloads *all* the other RPMs even ones that aren't installed. Handling that truly correctly would require moving this logic to the daemon and core. All of this functionality is keyed off a `cfg(feature = "fedora-integration")` that is detected by a Rust `build.rs` which parses the build environment's `/etc/os-release` for now.
2020-12-28 17:16:32 +03:00
fedora-integration = []
Default to sqlite rpmdb backend on f34 There won't be any support for writing to the bdb backend in f34, so e.g. pkglayering won't work (and obviously even composes wouldn't work once the buildroot moves to f34). Instead of requiring the whole world to add an `rpmdb` key in their manifests, let's just add a compile flag for it, and tweak the spec file to use this flag on f34.
2020-12-22 01:27:52 +03:00
default = []
Reference in New Issue Copy Permalink