From 0230d471bb535f59e198a21bccfb7d10b9c25501 Mon Sep 17 00:00:00 2001 From: Sumukh Ballal Date: Wed, 10 Apr 2024 00:48:25 +0000 Subject: [PATCH 1/2] sources: Fix clippy warnings for 1.77.0 --- sources/updater/updog/src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/updater/updog/src/main.rs b/sources/updater/updog/src/main.rs index ce2d7f36e4c..6c0ab0dd4f4 100644 --- a/sources/updater/updog/src/main.rs +++ b/sources/updater/updog/src/main.rs @@ -67,7 +67,7 @@ struct Config { // mode: Option<{Automatic, Managed, Disabled}> } -/// Prints a more specific message before exiting through usage(). +/// Prints a more specific message before exiting through `usage()`. fn usage_msg>(msg: S) -> ! { eprintln!("{}\n", msg.as_ref()); usage(); @@ -248,6 +248,7 @@ async fn write_target_to_disk>( let mut f = std::fs::OpenOptions::new() .write(true) .create(true) + .truncate(true) .open(&disk_path) .context(error::OpenPartitionSnafu { path: disk_path })?; std::io::copy(&mut reader, &mut f).context(error::WriteUpdateSnafu)?; From 193698456835815b1478a4985b134961ed87b3a4 Mon Sep 17 00:00:00 2001 From: Sumukh Ballal Date: Wed, 10 Apr 2024 00:48:38 +0000 Subject: [PATCH 2/2] Build: Update twoliter to v0.1.0 & SDK to v0.40.0 --- Makefile.toml | 2 +- Twoliter.toml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index e7ae12b3ad4..116810beae6 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -7,7 +7,7 @@ BUILDSYS_ROOT_DIR = "${CARGO_MAKE_WORKING_DIRECTORY}" # For binary installation, this should be a released version (prefixed with a v, # for example v0.1.0). For the git sourcecode installation method, this can be # any git rev, e.g. a tag, sha, or branch name. -TWOLITER_VERSION = "v0.0.7" +TWOLITER_VERSION = "v0.1.0" # For binary installation, this is the GitHub repository that has binary release artifacts attached # to it, for example https://github.com/bottlerocket-os/twoliter. For git sourcecode installation, diff --git a/Twoliter.toml b/Twoliter.toml index 0d81797a3c6..363b6cd3004 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -3,10 +3,5 @@ release-version = "1.20.0" [sdk] registry = "public.ecr.aws/bottlerocket" -name = "bottlerocket-sdk" -version = "v0.37.0" - -[toolchain] -registry = "public.ecr.aws/bottlerocket" -name = "bottlerocket-toolchain" -version = "v0.37.0" +repo = "bottlerocket-sdk" +tag = "v0.40.0"