Skip to content

Commit

Permalink
rust-bindings: Update to latest git
Browse files Browse the repository at this point in the history
This includes a change to the ostree_sepolicy_get_name()
API so we'll need a semver bump.
  • Loading branch information
cgwalters committed Jun 4, 2024
1 parent f84b8ab commit cae315c
Show file tree
Hide file tree
Showing 12 changed files with 318 additions and 287 deletions.
9 changes: 9 additions & 0 deletions rust-bindings/src/auto/deployment.rs

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

2 changes: 2 additions & 0 deletions rust-bindings/src/auto/flags.rs

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

10 changes: 10 additions & 0 deletions rust-bindings/src/auto/repo.rs

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

9 changes: 4 additions & 5 deletions rust-bindings/src/auto/se_policy.rs

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

24 changes: 24 additions & 0 deletions rust-bindings/src/auto/sysroot.rs

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

2 changes: 1 addition & 1 deletion rust-bindings/src/auto/versions.txt

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

10 changes: 9 additions & 1 deletion rust-bindings/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ v2019_6 = ["v2019_4"]
v2020_1 = ["v2019_6"]
v2020_2 = ["v2020_1"]
v2020_4 = ["v2020_2"]
dox = []
dox = ["glib/dox", "gobject/dox", "gio/dox"]
v2020_7 = ["v2020_4"]
v2020_8 = ["v2020_7"]
v2021_1 = ["v2020_8"]
Expand All @@ -69,6 +69,8 @@ v2022_5 = ["v2022_2"]
v2022_6 = ["v2022_5"]
v2022_7 = ["v2022_5"]
v2023_1 = ["v2022_7"]
v2023_8 = ["v2023_1"]
v2023_11 = ["v2023_8"]

[lib]
name = "ostree_sys"
Expand Down Expand Up @@ -232,3 +234,9 @@ version = "2022.7"

[package.metadata.system-deps.ostree_1.v2023_1]
version = "2023.1"

[package.metadata.system-deps.ostree_1.v2023_8]
version = "2023.8"

[package.metadata.system-deps.ostree_1.v2023_11]
version = "2023.11"
2 changes: 1 addition & 1 deletion rust-bindings/sys/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
from gir-files (@ e93ebd738598)
from gir-files (@ 8f559e94b775)
31 changes: 30 additions & 1 deletion rust-bindings/sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS: OstreeRepoCom
pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED: OstreeRepoCommitModifierFlags = 8;
pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME: OstreeRepoCommitModifierFlags = 16;
pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL: OstreeRepoCommitModifierFlags = 32;
pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SELINUX_LABEL_V1: OstreeRepoCommitModifierFlags = 64;

pub type OstreeRepoCommitState = c_uint;
pub const OSTREE_REPO_COMMIT_STATE_NORMAL: OstreeRepoCommitState = 0;
Expand Down Expand Up @@ -867,7 +868,8 @@ impl ::std::fmt::Debug for OstreeSignInterface {
#[derive(Copy, Clone)]
#[repr(C)]
pub struct OstreeSysrootDeployTreeOpts {
pub unused_bools: [gboolean; 8],
pub locked: gboolean,
pub unused_bools: [gboolean; 7],
pub unused_ints: [c_int; 8],
pub override_kernel_argv: *mut *mut c_char,
pub overlay_initrds: *mut *mut c_char,
Expand All @@ -877,6 +879,7 @@ pub struct OstreeSysrootDeployTreeOpts {
impl ::std::fmt::Debug for OstreeSysrootDeployTreeOpts {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
f.debug_struct(&format!("OstreeSysrootDeployTreeOpts @ {self:p}"))
.field("locked", &self.locked)
.field("unused_bools", &self.unused_bools)
.field("unused_ints", &self.unused_ints)
.field("override_kernel_argv", &self.override_kernel_argv)
Expand Down Expand Up @@ -1612,6 +1615,9 @@ extern "C" {
self_: *mut OstreeDeployment,
) -> OstreeDeploymentUnlockedState;
pub fn ostree_deployment_hash(v: gconstpointer) -> c_uint;
#[cfg(any(feature = "v2023_8", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2023_8")))]
pub fn ostree_deployment_is_finalization_locked(self_: *mut OstreeDeployment) -> gboolean;
#[cfg(any(feature = "v2018_3", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
pub fn ostree_deployment_is_pinned(self_: *mut OstreeDeployment) -> gboolean;
Expand Down Expand Up @@ -1835,6 +1841,15 @@ extern "C" {
cancellable: *mut gio::GCancellable,
error: *mut *mut glib::GError,
) -> gboolean;
pub fn ostree_repo_checkout_composefs(
self_: *mut OstreeRepo,
options: *mut glib::GVariant,
destination_dfd: c_int,
destination_path: *const c_char,
checksum: *const c_char,
cancellable: *mut gio::GCancellable,
error: *mut *mut glib::GError,
) -> gboolean;
pub fn ostree_repo_checkout_gc(
self_: *mut OstreeRepo,
cancellable: *mut gio::GCancellable,
Expand Down Expand Up @@ -3007,6 +3022,13 @@ extern "C" {
pub fn ostree_sysroot_get_deployment_origin_path(
deployment_path: *mut gio::GFile,
) -> *mut gio::GFile;
#[cfg(any(feature = "v2023_8", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2023_8")))]
pub fn ostree_sysroot_change_finalization(
self_: *mut OstreeSysroot,
deployment: *mut OstreeDeployment,
error: *mut *mut glib::GError,
) -> gboolean;
pub fn ostree_sysroot_cleanup(
self_: *mut OstreeSysroot,
cancellable: *mut gio::GCancellable,
Expand Down Expand Up @@ -3253,6 +3275,13 @@ extern "C" {
) -> gboolean;
pub fn ostree_sysroot_unload(self_: *mut OstreeSysroot);
pub fn ostree_sysroot_unlock(self_: *mut OstreeSysroot);
#[cfg(any(feature = "v2023_11", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2023_11")))]
pub fn ostree_sysroot_update_post_copy(
self_: *mut OstreeSysroot,
cancellable: *mut gio::GCancellable,
error: *mut *mut glib::GError,
) -> gboolean;
pub fn ostree_sysroot_write_deployments(
self_: *mut OstreeSysroot,
new_deployments: *mut glib::GPtrArray,
Expand Down
4 changes: 4 additions & 0 deletions rust-bindings/sys/tests/abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,10 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
"2",
),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE", "0"),
(
"(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SELINUX_LABEL_V1",
"64",
),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS", "1"),
("(guint) OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL", "2"),
("(guint) OSTREE_REPO_COMMIT_STATE_NORMAL", "0"),
Expand Down
Loading

0 comments on commit cae315c

Please sign in to comment.