Merge pull request #4008 from sumukhballal/twoliter-v0.2.0-release

build: update twoliter to v0.2.0
bottlerocket-os · May 31, 2024 · b136a8b · b136a8b
2 parents 043f775 + c86ccb8
commit b136a8b
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 63 deletions.
diff --git 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.1.1"
+TWOLITER_VERSION = "v0.2.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,
@@ -391,6 +391,18 @@ run_task = "run-twoliter"
 [tasks.build-variant]
 run_task = "run-twoliter"
 
+[tasks.repack-variant]
+run_task = "run-twoliter"
+
+[tasks.fetch-variant]
+run_task = "run-twoliter"
+
+[tasks.fetch-friendly-variant]
+run_task = "run-twoliter"
+
+[tasks.fetch-ova]
+run_task = "run-twoliter"
+
 [tasks.check-licenses]
 run_task = "run-twoliter"
 

diff --git a/Twoliter.toml b/Twoliter.toml
@@ -1,7 +1,10 @@
 schema-version = 1
 release-version = "1.21.0"
 
-[sdk]
+[vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"
-repo = "bottlerocket-sdk"
-tag = "v0.41.0"
+
+[sdk]
+name = "bottlerocket-sdk"
+version = "0.41.0"
+vendor = "bottlerocket"
diff --git a/packages/ca-certificates/.gitignore b/packages/ca-certificates/.gitignore
diff --git a/packages/ca-certificates/Cargo.toml b/packages/ca-certificates/Cargo.toml
diff --git a/packages/ca-certificates/ca-certificates.spec b/packages/ca-certificates/ca-certificates.spec
diff --git a/packages/filesystem/Cargo.toml b/packages/filesystem/Cargo.toml
@@ -5,5 +5,8 @@ edition = "2021"
 publish = false
 build = "../build.rs"
 
+
+[package.metadata.build-package]
+
 [lib]
 path = "../packages.rs"
diff --git a/packages/libgcc/Cargo.toml b/packages/libgcc/Cargo.toml
@@ -5,5 +5,7 @@ edition = "2021"
 publish = false
 build = "../build.rs"
 
+[package.metadata.build-package]
+
 [lib]
 path = "../packages.rs"
diff --git a/packages/libstd-rust/Cargo.toml b/packages/libstd-rust/Cargo.toml
@@ -5,5 +5,8 @@ edition = "2021"
 publish = false
 build = "../build.rs"
 
+
+[package.metadata.build-package]
+
 [lib]
 path = "../packages.rs"
diff --git a/packages/login/Cargo.toml b/packages/login/Cargo.toml
@@ -5,6 +5,8 @@ edition = "2021"
 publish = false
 build = "../build.rs"
 
+[package.metadata.build-package]
+
 [lib]
 path = "../packages.rs"
 

diff --git a/packages/netdog/Cargo.toml b/packages/netdog/Cargo.toml
@@ -8,7 +8,7 @@ build = "../build.rs"
 [lib]
 path = "../packages.rs"
 
-[package.metadata.build-packages]
+[package.metadata.build-package]
 source-groups = [
     "netdog",
     "dogtag",

diff --git a/packages/release/Cargo.toml b/packages/release/Cargo.toml
@@ -5,6 +5,8 @@ edition = "2021"
 publish = false
 build = "../build.rs"
 
+[package.metadata.build-package]
+
 [lib]
 path = "../packages.rs"
 
@@ -16,7 +18,6 @@ path = "../packages.rs"
 [dependencies]
 acpid = { path = "../acpid" }
 binutils = { path = "../binutils" }
-ca-certificates = { path = "../ca-certificates" }
 chrony = { path = "../chrony" }
 conntrack-tools = { path = "../conntrack-tools" }
 containerd = { path = "../containerd" }

diff --git a/...ertificates/ca-certificates-tmpfiles.conf → ...ase/release-ca-certificates-tmpfiles.conf b/...ertificates/ca-certificates-tmpfiles.conf → ...ase/release-ca-certificates-tmpfiles.conf
diff --git a/packages/release/release.spec b/packages/release/release.spec
@@ -15,6 +15,7 @@ Source95: release-systemd-networkd.conf
 Source96: release-repart-local.conf
 Source97: release-sysctl.conf
 Source98: release-systemd-system.conf
+Source99: release-ca-certificates-tmpfiles.conf
 
 Source200: motd.template
 Source201: proxy-env
@@ -99,7 +100,6 @@ Source1500: bootconfig-fips.conf
 
 Requires: %{_cross_os}acpid
 Requires: %{_cross_os}audit
-Requires: %{_cross_os}ca-certificates
 Requires: %{_cross_os}chrony
 Requires: %{_cross_os}conntrack-tools
 Requires: %{_cross_os}containerd
@@ -154,6 +154,7 @@ install -p -m 0644 %{S:11} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}
 
 install -d %{buildroot}%{_cross_tmpfilesdir}
 install -p -m 0644 %{S:93} %{buildroot}%{_cross_tmpfilesdir}/release.conf
+install -p -m 0644 %{S:99} %{buildroot}%{_cross_tmpfilesdir}/release-ca-certificates.conf
 install -p -m 0644 %{S:94} %{buildroot}%{_cross_tmpfilesdir}/release-fips.conf
 
 install -d %{buildroot}%{_cross_libdir}/systemd/networkd.conf.d
@@ -260,6 +261,7 @@ ln -s preconfigured.target %{buildroot}%{_cross_unitdir}/default.target
 %{_cross_factorydir}%{_cross_sysconfdir}/nsswitch.conf
 %{_cross_sysctldir}/80-release.conf
 %{_cross_tmpfilesdir}/release.conf
+%{_cross_tmpfilesdir}/release-ca-certificates.conf
 %{_cross_libdir}/os-release
 %dir %{_cross_libdir}/repart.d
 %{_cross_libdir}/repart.d/80-local.conf

diff --git a/packages/selinux-policy/Cargo.toml b/packages/selinux-policy/Cargo.toml
@@ -5,5 +5,7 @@ edition = "2021"
 publish = false
 build = "../build.rs"
 
+[package.metadata.build-package]
+
 [lib]
 path = "../packages.rs"
diff --git a/variants/Cargo.lock b/variants/Cargo.lock