From cf5462178c73971c4aea1fa80e649a4d41a05bb5 Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Fri, 4 Mar 2022 10:35:02 +0000 Subject: [PATCH] ostree-sys: refresh after gir bump --- rust-bindings/rust/sys/Cargo.toml | 6 +++++- rust-bindings/rust/sys/src/lib.rs | 9 +++++++++ rust-bindings/rust/sys/tests/abi.rs | 6 ++++++ rust-bindings/rust/sys/tests/constant.c | 6 ++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/rust-bindings/rust/sys/Cargo.toml b/rust-bindings/rust/sys/Cargo.toml index 442e14cd..08392105 100644 --- a/rust-bindings/rust/sys/Cargo.toml +++ b/rust-bindings/rust/sys/Cargo.toml @@ -1,5 +1,5 @@ [build-dependencies] -system-deps = "6" +system-deps = "3" [dependencies] glib-sys = "0.14" @@ -55,6 +55,7 @@ v2021_2 = ["v2021_1"] v2021_3 = ["v2021_2"] v2021_4 = ["v2021_3"] v2021_5 = ["v2021_4"] +v2022_2 = ["v2021_5"] [lib] name = "ostree_sys" @@ -203,3 +204,6 @@ version = "2021.4" [package.metadata.system-deps.ostree_1.v2021_5] version = "2021.5" + +[package.metadata.system-deps.ostree_1.v2022_2] +version = "2022.2" diff --git a/rust-bindings/rust/sys/src/lib.rs b/rust-bindings/rust/sys/src/lib.rs index e20189e4..90c9c3b8 100644 --- a/rust-bindings/rust/sys/src/lib.rs +++ b/rust-bindings/rust/sys/src/lib.rs @@ -66,6 +66,8 @@ pub const OSTREE_OBJECT_TYPE_COMMIT: OstreeObjectType = 4; pub const OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT: OstreeObjectType = 5; pub const OSTREE_OBJECT_TYPE_COMMIT_META: OstreeObjectType = 6; pub const OSTREE_OBJECT_TYPE_PAYLOAD_LINK: OstreeObjectType = 7; +pub const OSTREE_OBJECT_TYPE_FILE_XATTRS: OstreeObjectType = 8; +pub const OSTREE_OBJECT_TYPE_FILE_XATTRS_LINK: OstreeObjectType = 9; pub type OstreeRepoCheckoutFilterResult = c_int; pub const OSTREE_REPO_CHECKOUT_FILTER_ALLOW: OstreeRepoCheckoutFilterResult = 0; @@ -101,6 +103,7 @@ pub const OSTREE_REPO_MODE_ARCHIVE: OstreeRepoMode = 1; pub const OSTREE_REPO_MODE_ARCHIVE_Z2: OstreeRepoMode = 1; pub const OSTREE_REPO_MODE_BARE_USER: OstreeRepoMode = 2; pub const OSTREE_REPO_MODE_BARE_USER_ONLY: OstreeRepoMode = 3; +pub const OSTREE_REPO_MODE_BARE_SPLIT_XATTRS: OstreeRepoMode = 4; pub type OstreeRepoRemoteChange = c_int; pub const OSTREE_REPO_REMOTE_CHANGE_ADD: OstreeRepoRemoteChange = 0; @@ -134,6 +137,7 @@ pub const OSTREE_METADATA_KEY_BOOTABLE: *const c_char = b"ostree.bootable\0" as pub const OSTREE_METADATA_KEY_LINUX: *const c_char = b"ostree.linux\0" as *const u8 as *const c_char; pub const OSTREE_META_KEY_DEPLOY_COLLECTION_ID: *const c_char = b"ostree.deploy-collection-id\0" as *const u8 as *const c_char; pub const OSTREE_ORIGIN_TRANSIENT_GROUP: *const c_char = b"libostree-transient\0" as *const u8 as *const c_char; +pub const OSTREE_PATH_BOOTED: *const c_char = b"/run/ostree-booted\0" as *const u8 as *const c_char; pub const OSTREE_REPO_METADATA_REF: *const c_char = b"ostree-metadata\0" as *const u8 as *const c_char; pub const OSTREE_SHA256_DIGEST_LEN: c_int = 32; pub const OSTREE_SHA256_STRING_LEN: c_int = 64; @@ -172,6 +176,7 @@ pub const OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL: OstreeRepoCommitState = 2; pub type OstreeRepoCommitTraverseFlags = c_uint; pub const OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE: OstreeRepoCommitTraverseFlags = 1; +pub const OSTREE_REPO_COMMIT_TRAVERSE_FLAG_COMMIT_ONLY: OstreeRepoCommitTraverseFlags = 2; pub type OstreeRepoListObjectsFlags = c_uint; pub const OSTREE_REPO_LIST_OBJECTS_LOOSE: OstreeRepoListObjectsFlags = 1; @@ -189,6 +194,7 @@ pub type OstreeRepoPruneFlags = c_uint; pub const OSTREE_REPO_PRUNE_FLAGS_NONE: OstreeRepoPruneFlags = 0; pub const OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE: OstreeRepoPruneFlags = 1; pub const OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY: OstreeRepoPruneFlags = 2; +pub const OSTREE_REPO_PRUNE_FLAGS_COMMIT_ONLY: OstreeRepoPruneFlags = 4; pub type OstreeRepoPullFlags = c_uint; pub const OSTREE_REPO_PULL_FLAGS_NONE: OstreeRepoPullFlags = 0; @@ -1575,6 +1581,9 @@ extern "C" { #[cfg(any(feature = "v2018_5", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))] pub fn ostree_repo_traverse_commit_union_with_parents(repo: *mut OstreeRepo, commit_checksum: *const c_char, maxdepth: c_int, inout_reachable: *mut glib::GHashTable, inout_parents: *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2018_5", feature = "dox"))] + #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))] + pub fn ostree_repo_traverse_commit_with_flags(repo: *mut OstreeRepo, flags: OstreeRepoCommitTraverseFlags, commit_checksum: *const c_char, maxdepth: c_int, inout_reachable: *mut glib::GHashTable, inout_parents: *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2018_6", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))] pub fn ostree_repo_traverse_reachable_refs(self_: *mut OstreeRepo, depth: c_uint, reachable: *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; diff --git a/rust-bindings/rust/sys/tests/abi.rs b/rust-bindings/rust/sys/tests/abi.rs index 681ce997..d3e7029e 100644 --- a/rust-bindings/rust/sys/tests/abi.rs +++ b/rust-bindings/rust/sys/tests/abi.rs @@ -323,9 +323,12 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(gint) OSTREE_OBJECT_TYPE_DIR_META", "3"), ("(gint) OSTREE_OBJECT_TYPE_DIR_TREE", "2"), ("(gint) OSTREE_OBJECT_TYPE_FILE", "1"), + ("(gint) OSTREE_OBJECT_TYPE_FILE_XATTRS", "8"), + ("(gint) OSTREE_OBJECT_TYPE_FILE_XATTRS_LINK", "9"), ("(gint) OSTREE_OBJECT_TYPE_PAYLOAD_LINK", "7"), ("(gint) OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT", "5"), ("OSTREE_ORIGIN_TRANSIENT_GROUP", "libostree-transient"), + ("OSTREE_PATH_BOOTED", "/run/ostree-booted"), ("(gint) OSTREE_REPO_CHECKOUT_FILTER_ALLOW", "0"), ("(gint) OSTREE_REPO_CHECKOUT_FILTER_SKIP", "1"), ("(gint) OSTREE_REPO_CHECKOUT_MODE_NONE", "0"), @@ -350,6 +353,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(guint) OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL", "2"), ("(guint) OSTREE_REPO_COMMIT_STATE_NORMAL", "0"), ("(guint) OSTREE_REPO_COMMIT_STATE_PARTIAL", "1"), + ("(guint) OSTREE_REPO_COMMIT_TRAVERSE_FLAG_COMMIT_ONLY", "2"), ("(guint) OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE", "1"), ("(guint) OSTREE_REPO_LIST_OBJECTS_ALL", "4"), ("(guint) OSTREE_REPO_LIST_OBJECTS_LOOSE", "1"), @@ -365,8 +369,10 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(gint) OSTREE_REPO_MODE_ARCHIVE", "1"), ("(gint) OSTREE_REPO_MODE_ARCHIVE_Z2", "1"), ("(gint) OSTREE_REPO_MODE_BARE", "0"), + ("(gint) OSTREE_REPO_MODE_BARE_SPLIT_XATTRS", "4"), ("(gint) OSTREE_REPO_MODE_BARE_USER", "2"), ("(gint) OSTREE_REPO_MODE_BARE_USER_ONLY", "3"), + ("(guint) OSTREE_REPO_PRUNE_FLAGS_COMMIT_ONLY", "4"), ("(guint) OSTREE_REPO_PRUNE_FLAGS_NONE", "0"), ("(guint) OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE", "1"), ("(guint) OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY", "2"), diff --git a/rust-bindings/rust/sys/tests/constant.c b/rust-bindings/rust/sys/tests/constant.c index 9ecc6c96..d65f4666 100644 --- a/rust-bindings/rust/sys/tests/constant.c +++ b/rust-bindings/rust/sys/tests/constant.c @@ -80,9 +80,12 @@ int main() { PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_DIR_META); PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_DIR_TREE); PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_FILE); + PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_FILE_XATTRS); + PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_FILE_XATTRS_LINK); PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_PAYLOAD_LINK); PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT); PRINT_CONSTANT(OSTREE_ORIGIN_TRANSIENT_GROUP); + PRINT_CONSTANT(OSTREE_PATH_BOOTED); PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_FILTER_ALLOW); PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_FILTER_SKIP); PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_MODE_NONE); @@ -107,6 +110,7 @@ int main() { PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL); PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_STATE_NORMAL); PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_STATE_PARTIAL); + PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_TRAVERSE_FLAG_COMMIT_ONLY); PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE); PRINT_CONSTANT((guint) OSTREE_REPO_LIST_OBJECTS_ALL); PRINT_CONSTANT((guint) OSTREE_REPO_LIST_OBJECTS_LOOSE); @@ -122,8 +126,10 @@ int main() { PRINT_CONSTANT((gint) OSTREE_REPO_MODE_ARCHIVE); PRINT_CONSTANT((gint) OSTREE_REPO_MODE_ARCHIVE_Z2); PRINT_CONSTANT((gint) OSTREE_REPO_MODE_BARE); + PRINT_CONSTANT((gint) OSTREE_REPO_MODE_BARE_SPLIT_XATTRS); PRINT_CONSTANT((gint) OSTREE_REPO_MODE_BARE_USER); PRINT_CONSTANT((gint) OSTREE_REPO_MODE_BARE_USER_ONLY); + PRINT_CONSTANT((guint) OSTREE_REPO_PRUNE_FLAGS_COMMIT_ONLY); PRINT_CONSTANT((guint) OSTREE_REPO_PRUNE_FLAGS_NONE); PRINT_CONSTANT((guint) OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE); PRINT_CONSTANT((guint) OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY);