From 0e9a16f4c10e783d69c880cc5a910a2a4419b449 Mon Sep 17 00:00:00 2001 From: Felix Krull Date: Fri, 26 Mar 2021 20:11:25 +0100 Subject: [PATCH] Regenerate --- rust-bindings/rust/Cargo.toml | 2 ++ rust-bindings/rust/README.md | 2 +- rust-bindings/rust/src/auto/constants.rs | 4 +++ rust-bindings/rust/src/auto/deployment.rs | 18 +++++------ rust-bindings/rust/src/auto/functions.rs | 5 +++ rust-bindings/rust/src/auto/mod.rs | 4 +++ rust-bindings/rust/src/auto/repo.rs | 32 +++++++++++++++++--- rust-bindings/rust/src/auto/sysroot.rs | 11 ++++++- rust-bindings/rust/src/auto/versions.txt | 4 +-- rust-bindings/rust/sys/Cargo.toml | 4 +++ rust-bindings/rust/sys/src/auto/versions.txt | 4 +-- rust-bindings/rust/sys/src/lib.rs | 19 ++++++++++-- rust-bindings/rust/sys/tests/abi.rs | 4 +++ 13 files changed, 92 insertions(+), 21 deletions(-) diff --git a/rust-bindings/rust/Cargo.toml b/rust-bindings/rust/Cargo.toml index 6d6ae2d8..74b60162 100644 --- a/rust-bindings/rust/Cargo.toml +++ b/rust-bindings/rust/Cargo.toml @@ -88,3 +88,5 @@ v2020_1 = ["v2019_6", "ostree-sys/v2020_1"] v2020_2 = ["v2020_1", "ostree-sys/v2020_2"] v2020_4 = ["v2020_2", "ostree-sys/v2020_4"] v2020_7 = ["v2020_4", "ostree-sys/v2020_7"] +v2020_8 = ["v2020_7", "ostree-sys/v2020_8"] +v2021_1 = ["v2020_8", "ostree-sys/v2021_1"] diff --git a/rust-bindings/rust/README.md b/rust-bindings/rust/README.md index 6f0c9147..c06c5c89 100644 --- a/rust-bindings/rust/README.md +++ b/rust-bindings/rust/README.md @@ -45,7 +45,7 @@ version as well: ```toml [dependencies.ostree] version = "0.9" -features = ["v2020_4"] +features = ["v2021_1"] ``` ## Developing diff --git a/rust-bindings/rust/src/auto/constants.rs b/rust-bindings/rust/src/auto/constants.rs index 8e6ebd4f..8cb838ed 100644 --- a/rust-bindings/rust/src/auto/constants.rs +++ b/rust-bindings/rust/src/auto/constants.rs @@ -22,6 +22,10 @@ pub static COMMIT_META_KEY_SOURCE_TITLE: once_cell::sync::Lazy<&'static str> = o pub static COMMIT_META_KEY_VERSION: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_META_KEY_VERSION).to_str().unwrap()}); pub static DIRMETA_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_DIRMETA_GVARIANT_STRING).to_str().unwrap()}); pub static FILEMETA_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_FILEMETA_GVARIANT_STRING).to_str().unwrap()}); +#[cfg(any(feature = "v2021_1", feature = "dox"))] +pub static METADATA_KEY_BOOTABLE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_METADATA_KEY_BOOTABLE).to_str().unwrap()}); +#[cfg(any(feature = "v2021_1", feature = "dox"))] +pub static METADATA_KEY_LINUX: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_METADATA_KEY_LINUX).to_str().unwrap()}); #[cfg(any(feature = "v2018_9", feature = "dox"))] pub static META_KEY_DEPLOY_COLLECTION_ID: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_META_KEY_DEPLOY_COLLECTION_ID).to_str().unwrap()}); #[cfg(any(feature = "v2018_3", feature = "dox"))] diff --git a/rust-bindings/rust/src/auto/deployment.rs b/rust-bindings/rust/src/auto/deployment.rs index b55fe143..dfd6c962 100644 --- a/rust-bindings/rust/src/auto/deployment.rs +++ b/rust-bindings/rust/src/auto/deployment.rs @@ -21,7 +21,7 @@ glib_wrapper! { } impl Deployment { - pub fn new(index: i32, osname: &str, csum: &str, deployserial: i32, bootcsum: &str, bootserial: i32) -> Deployment { + pub fn new(index: i32, osname: &str, csum: &str, deployserial: i32, bootcsum: Option<&str>, bootserial: i32) -> Deployment { unsafe { from_glib_full(ostree_sys::ostree_deployment_new(index, osname.to_glib_none().0, csum.to_glib_none().0, deployserial, bootcsum.to_glib_none().0, bootserial)) } @@ -100,6 +100,12 @@ impl Deployment { } } + pub fn hash(&self) -> u32 { + unsafe { + ostree_sys::ostree_deployment_hash(ToGlibPtr::<*mut ostree_sys::OstreeDeployment>::to_glib_none(self).0 as glib_sys::gconstpointer) + } + } + #[cfg(any(feature = "v2018_3", feature = "dox"))] pub fn is_pinned(&self) -> bool { unsafe { @@ -114,7 +120,7 @@ impl Deployment { } } - pub fn set_bootconfig(&self, bootconfig: &BootconfigParser) { + pub fn set_bootconfig(&self, bootconfig: Option<&BootconfigParser>) { unsafe { ostree_sys::ostree_deployment_set_bootconfig(self.to_glib_none().0, bootconfig.to_glib_none().0); } @@ -132,18 +138,12 @@ impl Deployment { } } - pub fn set_origin(&self, origin: &glib::KeyFile) { + pub fn set_origin(&self, origin: Option<&glib::KeyFile>) { unsafe { ostree_sys::ostree_deployment_set_origin(self.to_glib_none().0, origin.to_glib_none().0); } } - pub fn hash(&self) -> u32 { - unsafe { - ostree_sys::ostree_deployment_hash(ToGlibPtr::<*mut ostree_sys::OstreeDeployment>::to_glib_none(self).0 as glib_sys::gconstpointer) - } - } - #[cfg(any(feature = "v2018_3", feature = "dox"))] pub fn origin_remove_transient_state(origin: &glib::KeyFile) { unsafe { diff --git a/rust-bindings/rust/src/auto/functions.rs b/rust-bindings/rust/src/auto/functions.rs index 8d514309..e643e170 100644 --- a/rust-bindings/rust/src/auto/functions.rs +++ b/rust-bindings/rust/src/auto/functions.rs @@ -83,6 +83,11 @@ pub fn commit_get_timestamp(commit_variant: &glib::Variant) -> u64 { } } +//#[cfg(any(feature = "v2021_1", feature = "dox"))] +//pub fn commit_metadata_for_bootable, Q: IsA>(root: &P, dict: /*Ignored*/&glib::VariantDict, cancellable: Option<&Q>) -> Result<(), glib::Error> { +// unsafe { TODO: call ostree_sys:ostree_commit_metadata_for_bootable() } +//} + pub fn content_file_parse, Q: IsA>(compressed: bool, content_path: &P, trusted: bool, cancellable: Option<&Q>) -> Result<(gio::InputStream, gio::FileInfo, glib::Variant), glib::Error> { unsafe { let mut out_input = ptr::null_mut(); diff --git a/rust-bindings/rust/src/auto/mod.rs b/rust-bindings/rust/src/auto/mod.rs index e6494dca..3eebf8e9 100644 --- a/rust-bindings/rust/src/auto/mod.rs +++ b/rust-bindings/rust/src/auto/mod.rs @@ -160,6 +160,10 @@ pub use self::constants::COMMIT_META_KEY_SOURCE_TITLE; pub use self::constants::COMMIT_META_KEY_VERSION; pub use self::constants::DIRMETA_GVARIANT_STRING; pub use self::constants::FILEMETA_GVARIANT_STRING; +#[cfg(any(feature = "v2021_1", feature = "dox"))] +pub use self::constants::METADATA_KEY_BOOTABLE; +#[cfg(any(feature = "v2021_1", feature = "dox"))] +pub use self::constants::METADATA_KEY_LINUX; #[cfg(any(feature = "v2018_9", feature = "dox"))] pub use self::constants::META_KEY_DEPLOY_COLLECTION_ID; #[cfg(any(feature = "v2018_3", feature = "dox"))] diff --git a/rust-bindings/rust/src/auto/repo.rs b/rust-bindings/rust/src/auto/repo.rs index 5fff6359..6f5133ae 100644 --- a/rust-bindings/rust/src/auto/repo.rs +++ b/rust-bindings/rust/src/auto/repo.rs @@ -279,6 +279,16 @@ impl Repo { } } + #[cfg(any(feature = "v2020_8", feature = "dox"))] + pub fn gpg_sign_data>(&self, data: &glib::Bytes, old_signatures: &glib::Bytes, key_id: &[&str], homedir: Option<&str>, cancellable: Option<&P>) -> Result { + unsafe { + let mut out_signatures = ptr::null_mut(); + let mut error = ptr::null_mut(); + let _ = ostree_sys::ostree_repo_gpg_sign_data(self.to_glib_none().0, data.to_glib_none().0, old_signatures.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, &mut out_signatures, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); + if error.is_null() { Ok(from_glib_full(out_signatures)) } else { Err(from_glib_full(error)) } + } + } + #[cfg(any(feature = "v2016_6", feature = "dox"))] pub fn gpg_verify_data, Q: IsA, R: IsA>(&self, remote_name: Option<&str>, data: &glib::Bytes, signatures: &glib::Bytes, keyringdir: Option<&P>, extra_keyring: Option<&Q>, cancellable: Option<&R>) -> Result { unsafe { @@ -362,6 +372,16 @@ impl Repo { // unsafe { TODO: call ostree_sys:ostree_repo_list_refs_ext() } //} + #[cfg(any(feature = "v2020_7", feature = "dox"))] + pub fn list_static_delta_indexes>(&self, cancellable: Option<&P>) -> Result, glib::Error> { + unsafe { + let mut out_indexes = ptr::null_mut(); + let mut error = ptr::null_mut(); + let _ = ostree_sys::ostree_repo_list_static_delta_indexes(self.to_glib_none().0, &mut out_indexes, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); + if error.is_null() { Ok(FromGlibPtrContainer::from_glib_container(out_indexes)) } else { Err(from_glib_full(error)) } + } + } + pub fn list_static_delta_names>(&self, cancellable: Option<&P>) -> Result, glib::Error> { unsafe { let mut out_deltas = ptr::null_mut(); @@ -676,7 +696,7 @@ impl Repo { } } - pub fn resolve_rev(&self, refspec: &str, allow_noent: bool) -> Result { + pub fn resolve_rev(&self, refspec: &str, allow_noent: bool) -> Result, glib::Error> { unsafe { let mut out_rev = ptr::null_mut(); let mut error = ptr::null_mut(); @@ -686,7 +706,7 @@ impl Repo { } #[cfg(any(feature = "v2016_7", feature = "dox"))] - pub fn resolve_rev_ext(&self, refspec: &str, allow_noent: bool, flags: RepoResolveRevExtFlags) -> Result { + pub fn resolve_rev_ext(&self, refspec: &str, allow_noent: bool, flags: RepoResolveRevExtFlags) -> Result, glib::Error> { unsafe { let mut out_rev = ptr::null_mut(); let mut error = ptr::null_mut(); @@ -786,7 +806,7 @@ impl Repo { } } - pub fn static_delta_generate>(&self, opt: StaticDeltaGenerateOpt, from: &str, to: &str, metadata: Option<&glib::Variant>, params: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(), glib::Error> { + pub fn static_delta_generate>(&self, opt: StaticDeltaGenerateOpt, from: Option<&str>, to: &str, metadata: Option<&glib::Variant>, params: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); let _ = ostree_sys::ostree_repo_static_delta_generate(self.to_glib_none().0, opt.to_glib(), from.to_glib_none().0, to.to_glib_none().0, metadata.to_glib_none().0, params.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); @@ -794,6 +814,10 @@ impl Repo { } } + //pub fn static_delta_reindex>(&self, flags: /*Ignored*/StaticDeltaIndexFlags, opt_to_commit: &str, cancellable: Option<&P>) -> Result<(), glib::Error> { + // unsafe { TODO: call ostree_sys:ostree_repo_static_delta_reindex() } + //} + #[cfg(any(feature = "v2020_7", feature = "dox"))] pub fn static_delta_verify_signature>(&self, delta_id: &str, sign: &P) -> Result, glib::Error> { unsafe { @@ -990,7 +1014,7 @@ impl Repo { } #[cfg(any(feature = "v2017_10", feature = "dox"))] - pub fn create_at>(dfd: i32, path: &str, mode: RepoMode, options: &glib::Variant, cancellable: Option<&P>) -> Result { + pub fn create_at>(dfd: i32, path: &str, mode: RepoMode, options: Option<&glib::Variant>, cancellable: Option<&P>) -> Result { unsafe { let mut error = ptr::null_mut(); let ret = ostree_sys::ostree_repo_create_at(dfd, path.to_glib_none().0, mode.to_glib(), options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); diff --git a/rust-bindings/rust/src/auto/sysroot.rs b/rust-bindings/rust/src/auto/sysroot.rs index 0326df9d..27b4123a 100644 --- a/rust-bindings/rust/src/auto/sysroot.rs +++ b/rust-bindings/rust/src/auto/sysroot.rs @@ -300,7 +300,7 @@ impl Sysroot { } #[cfg(any(feature = "v2017_7", feature = "dox"))] - pub fn query_deployments_for(&self, osname: Option<&str>) -> (Deployment, Deployment) { + pub fn query_deployments_for(&self, osname: Option<&str>) -> (Option, Option) { unsafe { let mut out_pending = ptr::null_mut(); let mut out_rollback = ptr::null_mut(); @@ -316,6 +316,15 @@ impl Sysroot { } } + #[cfg(any(feature = "v2021_1", feature = "dox"))] + pub fn require_booted_deployment(&self) -> Result { + unsafe { + let mut error = ptr::null_mut(); + let ret = ostree_sys::ostree_sysroot_require_booted_deployment(self.to_glib_none().0, &mut error); + if error.is_null() { Ok(from_glib_none(ret)) } else { Err(from_glib_full(error)) } + } + } + #[cfg(any(feature = "v2020_1", feature = "dox"))] pub fn set_mount_namespace_in_use(&self) { unsafe { diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt index a7300e77..ec9240f6 100644 --- a/rust-bindings/rust/src/auto/versions.txt +++ b/rust-bindings/rust/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab1) -from gir-files (https://github.com/gtk-rs/gir-files @ 2bdb1c1) +Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab) +from gir-files (https://github.com/gtk-rs/gir-files @ 90b20d3) diff --git a/rust-bindings/rust/sys/Cargo.toml b/rust-bindings/rust/sys/Cargo.toml index d4ac8739..107be753 100644 --- a/rust-bindings/rust/sys/Cargo.toml +++ b/rust-bindings/rust/sys/Cargo.toml @@ -52,6 +52,8 @@ v2020_2 = ["v2020_1"] v2020_4 = ["v2020_2"] dox = [] v2020_7 = ["v2020_4"] +v2020_8 = ["v2020_7"] +v2021_1 = ["v2020_8"] [lib] name = "ostree_sys" @@ -111,3 +113,5 @@ v2020_1 = "2020.1" v2020_2 = "2020.2" v2020_4 = "2020.4" v2020_7 = "2020.7" +v2020_8 = "2020.8" +v2021_1 = "2021.1" diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt index a7300e77..ec9240f6 100644 --- a/rust-bindings/rust/sys/src/auto/versions.txt +++ b/rust-bindings/rust/sys/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab1) -from gir-files (https://github.com/gtk-rs/gir-files @ 2bdb1c1) +Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab) +from gir-files (https://github.com/gtk-rs/gir-files @ 90b20d3) diff --git a/rust-bindings/rust/sys/src/lib.rs b/rust-bindings/rust/sys/src/lib.rs index 6864d7df..09d2c942 100644 --- a/rust-bindings/rust/sys/src/lib.rs +++ b/rust-bindings/rust/sys/src/lib.rs @@ -109,6 +109,9 @@ pub type OstreeStaticDeltaGenerateOpt = c_int; pub const OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY: OstreeStaticDeltaGenerateOpt = 0; pub const OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR: OstreeStaticDeltaGenerateOpt = 1; +pub type OstreeStaticDeltaIndexFlags = c_int; +pub const OSTREE_STATIC_DELTA_INDEX_FLAGS_NONE: OstreeStaticDeltaIndexFlags = 0; + // Constants pub const OSTREE_COMMIT_GVARIANT_STRING: *const c_char = b"(a{sv}aya(say)sstayay)\0" as *const u8 as *const c_char; pub const OSTREE_COMMIT_META_KEY_ARCHITECTURE: *const c_char = b"ostree.architecture\0" as *const u8 as *const c_char; @@ -122,6 +125,8 @@ pub const OSTREE_DIRMETA_GVARIANT_STRING: *const c_char = b"(uuua(ayay))\0" as * pub const OSTREE_FILEMETA_GVARIANT_STRING: *const c_char = b"(uuua(ayay))\0" as *const u8 as *const c_char; pub const OSTREE_MAX_METADATA_SIZE: c_int = 10485760; pub const OSTREE_MAX_METADATA_WARN_SIZE: c_int = 7340032; +pub const OSTREE_METADATA_KEY_BOOTABLE: *const c_char = b"ostree.bootable\0" as *const u8 as *const c_char; +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_REPO_METADATA_REF: *const c_char = b"ostree-metadata\0" as *const u8 as *const c_char; @@ -328,7 +333,7 @@ impl ::std::fmt::Debug for OstreeDiffDirsOptions { #[repr(C)] #[derive(Copy, Clone)] pub struct OstreeDiffItem { - pub refcount: /*volatile*/c_int, + pub refcount: c_int, pub src: *mut gio::GFile, pub target: *mut gio::GFile, pub src_info: *mut gio::GFileInfo, @@ -340,6 +345,7 @@ pub struct OstreeDiffItem { impl ::std::fmt::Debug for OstreeDiffItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!("OstreeDiffItem @ {:?}", self as *const _)) + .field("refcount", &self.refcount) .field("src", &self.src) .field("target", &self.target) .field("src_info", &self.src_info) @@ -1186,7 +1192,6 @@ extern "C" { //========================================================================= pub fn ostree_deployment_get_type() -> GType; pub fn ostree_deployment_new(index: c_int, osname: *const c_char, csum: *const c_char, deployserial: c_int, bootcsum: *const c_char, bootserial: c_int) -> *mut OstreeDeployment; - pub fn ostree_deployment_hash(v: gconstpointer) -> c_uint; #[cfg(any(feature = "v2018_3", feature = "dox"))] pub fn ostree_deployment_origin_remove_transient_state(origin: *mut glib::GKeyFile); #[cfg(any(feature = "v2016_4", feature = "dox"))] @@ -1204,6 +1209,7 @@ extern "C" { pub fn ostree_deployment_get_osname(self_: *mut OstreeDeployment) -> *const c_char; #[cfg(any(feature = "v2016_4", feature = "dox"))] pub fn ostree_deployment_get_unlocked(self_: *mut OstreeDeployment) -> OstreeDeploymentUnlockedState; + pub fn ostree_deployment_hash(v: gconstpointer) -> c_uint; #[cfg(any(feature = "v2018_3", feature = "dox"))] pub fn ostree_deployment_is_pinned(self_: *mut OstreeDeployment) -> gboolean; #[cfg(any(feature = "v2018_3", feature = "dox"))] @@ -1312,6 +1318,8 @@ extern "C" { pub fn ostree_repo_get_remote_list_option(self_: *mut OstreeRepo, remote_name: *const c_char, option_name: *const c_char, out_value: *mut *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2016_5", feature = "dox"))] pub fn ostree_repo_get_remote_option(self_: *mut OstreeRepo, remote_name: *const c_char, option_name: *const c_char, default_value: *const c_char, out_value: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_8", feature = "dox"))] + pub fn ostree_repo_gpg_sign_data(self_: *mut OstreeRepo, data: *mut glib::GBytes, old_signatures: *mut glib::GBytes, key_id: *mut *const c_char, homedir: *const c_char, out_signatures: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2016_6", feature = "dox"))] pub fn ostree_repo_gpg_verify_data(self_: *mut OstreeRepo, remote_name: *const c_char, data: *mut glib::GBytes, signatures: *mut glib::GBytes, keyringdir: *mut gio::GFile, extra_keyring: *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeGpgVerifyResult; pub fn ostree_repo_has_object(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, out_have_object: *mut gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; @@ -1330,6 +1338,8 @@ extern "C" { pub fn ostree_repo_list_refs(self_: *mut OstreeRepo, refspec_prefix: *const c_char, out_all_refs: *mut *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2016_4", feature = "dox"))] pub fn ostree_repo_list_refs_ext(self_: *mut OstreeRepo, refspec_prefix: *const c_char, out_all_refs: *mut *mut glib::GHashTable, flags: OstreeRepoListRefsExtFlags, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_7", feature = "dox"))] + pub fn ostree_repo_list_static_delta_indexes(self_: *mut OstreeRepo, out_indexes: *mut *mut glib::GPtrArray, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; pub fn ostree_repo_list_static_delta_names(self_: *mut OstreeRepo, out_deltas: *mut *mut glib::GPtrArray, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2015_7", feature = "dox"))] pub fn ostree_repo_load_commit(self_: *mut OstreeRepo, checksum: *const c_char, out_commit: *mut *mut glib::GVariant, out_state: *mut OstreeRepoCommitState, error: *mut *mut glib::GError) -> gboolean; @@ -1398,6 +1408,7 @@ extern "C" { #[cfg(any(feature = "v2020_7", feature = "dox"))] pub fn ostree_repo_static_delta_execute_offline_with_signature(self_: *mut OstreeRepo, dir_or_file: *mut gio::GFile, sign: *mut OstreeSign, skip_validation: gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; pub fn ostree_repo_static_delta_generate(self_: *mut OstreeRepo, opt: OstreeStaticDeltaGenerateOpt, from: *const c_char, to: *const c_char, metadata: *mut glib::GVariant, params: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; + pub fn ostree_repo_static_delta_reindex(repo: *mut OstreeRepo, flags: OstreeStaticDeltaIndexFlags, opt_to_commit: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2020_7", feature = "dox"))] pub fn ostree_repo_static_delta_verify_signature(self_: *mut OstreeRepo, delta_id: *const c_char, sign: *mut OstreeSign, out_success_message: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2018_6", feature = "dox"))] @@ -1552,6 +1563,8 @@ extern "C" { pub fn ostree_sysroot_query_deployments_for(self_: *mut OstreeSysroot, osname: *const c_char, out_pending: *mut *mut OstreeDeployment, out_rollback: *mut *mut OstreeDeployment); #[cfg(any(feature = "v2017_7", feature = "dox"))] pub fn ostree_sysroot_repo(self_: *mut OstreeSysroot) -> *mut OstreeRepo; + #[cfg(any(feature = "v2021_1", feature = "dox"))] + pub fn ostree_sysroot_require_booted_deployment(self_: *mut OstreeSysroot, error: *mut *mut glib::GError) -> *mut OstreeDeployment; #[cfg(any(feature = "v2020_1", feature = "dox"))] pub fn ostree_sysroot_set_mount_namespace_in_use(self_: *mut OstreeSysroot); pub fn ostree_sysroot_simple_write_deployment(sysroot: *mut OstreeSysroot, osname: *const c_char, new_deployment: *mut OstreeDeployment, merge_deployment: *mut OstreeDeployment, flags: OstreeSysrootSimpleWriteDeploymentFlags, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; @@ -1687,6 +1700,8 @@ extern "C" { pub fn ostree_commit_get_parent(commit_variant: *mut glib::GVariant) -> *mut c_char; #[cfg(any(feature = "v2016_3", feature = "dox"))] pub fn ostree_commit_get_timestamp(commit_variant: *mut glib::GVariant) -> u64; + #[cfg(any(feature = "v2021_1", feature = "dox"))] + pub fn ostree_commit_metadata_for_bootable(root: *mut gio::GFile, dict: *mut glib::GVariantDict, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; pub fn ostree_content_file_parse(compressed: gboolean, content_path: *mut gio::GFile, trusted: gboolean, out_input: *mut *mut gio::GInputStream, out_file_info: *mut *mut gio::GFileInfo, out_xattrs: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; pub fn ostree_content_file_parse_at(compressed: gboolean, parent_dfd: c_int, path: *const c_char, trusted: gboolean, out_input: *mut *mut gio::GInputStream, out_file_info: *mut *mut gio::GFileInfo, out_xattrs: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; pub fn ostree_content_stream_parse(compressed: gboolean, input: *mut gio::GInputStream, input_length: u64, trusted: gboolean, out_input: *mut *mut gio::GInputStream, out_file_info: *mut *mut gio::GFileInfo, out_xattrs: *mut *mut glib::GVariant, 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 1f917ee5..9305bf16 100644 --- a/rust-bindings/rust/sys/tests/abi.rs +++ b/rust-bindings/rust/sys/tests/abi.rs @@ -284,6 +284,7 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[ ("OstreeSePolicyRestoreconFlags", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeSignInterface", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeStaticDeltaGenerateOpt", Layout {size: size_of::(), alignment: align_of::()}), + ("OstreeStaticDeltaIndexFlags", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeSysrootDeployTreeOpts", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeSysrootSimpleWriteDeploymentFlags", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeSysrootUpgraderFlags", Layout {size: size_of::(), alignment: align_of::()}), @@ -334,6 +335,8 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(guint) OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT", "0"), ("OSTREE_MAX_METADATA_SIZE", "10485760"), ("OSTREE_MAX_METADATA_WARN_SIZE", "7340032"), + ("OSTREE_METADATA_KEY_BOOTABLE", "ostree.bootable"), + ("OSTREE_METADATA_KEY_LINUX", "ostree.linux"), ("OSTREE_META_KEY_DEPLOY_COLLECTION_ID", "ostree.deploy-collection-id"), ("(gint) OSTREE_OBJECT_TYPE_COMMIT", "4"), ("(gint) OSTREE_OBJECT_TYPE_COMMIT_META", "6"), @@ -406,6 +409,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("OSTREE_SIGN_NAME_ED25519", "ed25519"), ("(gint) OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY", "0"), ("(gint) OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR", "1"), + ("(gint) OSTREE_STATIC_DELTA_INDEX_FLAGS_NONE", "0"), ("OSTREE_SUMMARY_GVARIANT_STRING", "(a(s(taya{sv}))a{sv})"), ("OSTREE_SUMMARY_SIG_GVARIANT_STRING", "a{sv}"), ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE", "0"),