Merge pull request #72 from jpculp/v0.26.0

update SDK to v0.26.0

.gitignore

@@ -1,2 +1,3 @@
+*.src.rpm
 *.tar.*
 **/target/

Dockerfile

@@ -285,14 +285,15 @@ RUN \
 FROM sdk-musl as sdk-musl-openssl
 USER builder
 
-ARG OPENSSLVER="3.0.0"
+ARG OPENSSLVER="3.0.2"
+ARG OPENSSLREV="4"
 
 WORKDIR /home/builder
 COPY ./hashes/openssl ./hashes
 RUN \
   sdk-fetch hashes && \
-  rpm2cpio openssl-${OPENSSLVER}-*.src.rpm | cpio -idmv && \
-  tar xf openssl-${OPENSSLVER}-hobbled.tar.xz && \
+  rpm2cpio openssl-${OPENSSLVER}-${OPENSSLREV}.*.src.rpm | cpio -idmv && \
+  tar xf openssl-${OPENSSLVER}-hobbled.tar.gz && \
   mv openssl-${OPENSSLVER} openssl && \
   for p in *.patch ; do \
     echo "applying ${p}" ; \
@@ -370,7 +371,7 @@ RUN \
 ARG ARCH
 ARG HOST_ARCH
 ARG VENDOR="bottlerocket"
-ARG RUSTVER="1.58.1"
+ARG RUSTVER="1.61.0"
 
 USER builder
 WORKDIR /home/builder
@@ -416,9 +417,9 @@ RUN \
 RUN \
   for libc in gnu musl ; do \
     cp compiler/rustc_target/src/spec/${ARCH}_{unknown,${VENDOR}}_linux_${libc}.rs && \
-    sed -i -e '/let mut base = super::linux_'${libc}'_base::opts();/a base.vendor = "'${VENDOR}'".to_string();' \
+    sed -i -e '/let mut base = super::linux_'${libc}'_base::opts();/a base.vendor = "'${VENDOR}'".into();' \
       compiler/rustc_target/src/spec/${ARCH}_${VENDOR}_linux_${libc}.rs && \
-    sed -i -e '/ \.\.super::linux_'${libc}'_base::opts()/i vendor: "'${VENDOR}'".to_string(),' \
+    sed -i -e '/ \.\.super::linux_'${libc}'_base::opts()/i vendor: "'${VENDOR}'".into(),' \
       compiler/rustc_target/src/spec/${ARCH}_${VENDOR}_linux_${libc}.rs && \
     sed -i -e '/("'${ARCH}-unknown-linux-${libc}'", .*),/a("'${ARCH}-${VENDOR}-linux-${libc}'", '${ARCH}_${VENDOR}_linux_${libc}'),' \
       compiler/rustc_target/src/spec/mod.rs ; \
@@ -474,7 +475,7 @@ FROM sdk-libc as sdk-go
 
 ARG ARCH
 ARG TARGET="${ARCH}-bottlerocket-linux-gnu"
-ARG GOVER="1.16.13"
+ARG GOVER="1.18.2"
 
 USER root
 RUN dnf -y install golang
@@ -501,16 +502,14 @@ ARG CGO_CXXFLAGS="${CXXFLAGS}"
 ARG CGO_LDFLAGS="${LDFLAGS}"
 
 WORKDIR /home/builder/sdk-go/src
-RUN ./make.bash --no-clean
+RUN ./make.bash
 
 # Build the standard library with and without PIE. Target binaries
 # should use PIE, but any host binaries generated during the build
 # might not.
 WORKDIR /home/builder/sdk-go
-ENV GOOS="${GOOS}" \
-  GOROOT="/home/builder/sdk-go" \
-  GOPATH="/home/builder/gopath" \
-  PATH="/home/builder/sdk-go/bin:${PATH}"
+ENV PATH="/home/builder/sdk-go/bin:${PATH}" \
+  GO111MODULE="auto"
 RUN \
   export GOARCH="${!GOARCH_ARCH}" ; \
   export CC="${TARGET}-gcc" ; \
@@ -520,8 +519,8 @@ RUN \
   export CXX_FOR_TARGET="${TARGET}-g++" ; \
   export CXX_FOR_${GOOS}_${GOARCH}="${TARGET}-g++" ; \
   export GOFLAGS="-mod=vendor" ; \
-  go install std && \
-  go install -buildmode=pie std
+  go install std cmd && \
+  go install -buildmode=pie std cmd
 
 RUN \
   install -p -m 0644 -Dt licenses LICENSE PATENTS
@@ -621,9 +620,9 @@ RUN \
   mkdir -p /usr/libexec/tools /usr/share/licenses/govmomi && \
   chown -R builder:builder /usr/libexec/tools /usr/share/licenses/govmomi
 
-ARG GOVMOMIVER="0.27.1"
-ARG GOVMOMISHORTCOMMIT="6209be5b"
-ARG GOVMOMIDATE="2021-10-15T15:35:40Z"
+ARG GOVMOMIVER="0.28.0"
+ARG GOVMOMISHORTCOMMIT="ac1eba30"
+ARG GOVMOMIDATE="2022-04-27T15:48:05Z"
 
 USER builder
 WORKDIR ${GOPATH}/src/github.com/vmware/govmomi
@@ -639,7 +638,7 @@ RUN \
   go mod vendor && \
   /usr/libexec/tools/bottlerocket-license-scan \
     --spdx-data /usr/libexec/tools/spdx-data \
-    --out-dir /usr/share/licenses/govmomi \
+    --out-dir /usr/share/licenses/govmomi/vendor \
     go-vendor ./vendor
 
 RUN \
@@ -744,8 +743,8 @@ COPY --chown=0:0 --from=sdk-cargo-deny /usr/libexec/tools/ /usr/libexec/tools/
 COPY --chown=0:0 --from=sdk-cargo-deny /usr/share/licenses/cargo-deny/ /usr/share/licenses/cargo-deny/
 
 # "sdk-govc" has the VMware govc tool and licenses.
-COPY --chown=0:0 --from=sdk-govc /usr/libexec/tools/govc /usr/libexec/tools/govc
-COPY --chown=0:0 --from=sdk-govc /usr/share/licenses/govmomi /usr/share/licenses/govmomi
+COPY --chown=0:0 --from=sdk-govc /usr/libexec/tools/ /usr/libexec/tools/
+COPY --chown=0:0 --from=sdk-govc /usr/share/licenses/govmomi/ /usr/share/licenses/govmomi/
 
 # "sdk-bootconfig" has the bootconfig tool
 COPY --chown=0:0 --from=sdk-bootconfig /usr/libexec/tools/bootconfig /usr/libexec/tools/bootconfig

VERSION

@@ -1 +1 @@
-v0.25.1
+v0.26.0

configs/rust/config-aarch64.toml.in

@@ -22,6 +22,9 @@ codegen-units-std = 1
 debuginfo-level-std = 2
 rpath = false
 
+[llvm]
+static-libstdcpp = false
+
 [install]
 prefix = "/usr/libexec/rust"
 sysconfdir = "/usr/libexec/rust/etc"

configs/rust/config-x86_64.toml.in

@@ -22,6 +22,9 @@ codegen-units-std = 1
 debuginfo-level-std = 2
 rpath = false
 
+[llvm]
+static-libstdcpp = false
+
 [install]
 prefix = "/usr/libexec/rust"
 sysconfdir = "/usr/libexec/rust/etc"

hashes/go

@@ -1,2 +1,2 @@
-# https://golang.org/dl/go1.16.13.src.tar.gz
-SHA512 (go1.16.13.src.tar.gz) = e168583a6264db5e28af0bc6a5de1e7586e0f4c248b8c387c8dd4a817c4a2bb303532e1f32067db3c565de9c1b39248f59573365c61c2f1116ba73f4af59b6bc
+# https://golang.org/dl/go1.18.2.src.tar.gz
+SHA512 (go1.18.2.src.tar.gz) = 9214cbc051cf26b49ab1bd4d8d30b060865944b831578a9ea7fcfe33f84009f77932a39f2948efbfc412b151e4734a3bc1f8332f3bea11b35a912b0e23a4118f

hashes/govmomi

@@ -1,2 +1,2 @@
-# /~https://github.com/vmware/govmomi/archive/v0.27.1.tar.gz#/govmomi-0.27.1.tar.gz
-SHA512 (govmomi-0.27.1.tar.gz) = 2135fb8ebc69e3c34881fb3ba6467cf32a4dcb2b6ccfa8f43ae9baef50fd0b11b29c1bdefd5c8a90f8aed28f210604ff74e24179a1f3e1b668b0edcce06c22b3
+# /~https://github.com/vmware/govmomi/archive/v0.28.0.tar.gz#/govmomi-0.28.0.tar.gz
+SHA512 (govmomi-0.28.0.tar.gz) = 8e475678bfbe68c62f51f1b7fd0804bb4058911d7550f0d91b8caca2cd77293bd659ce55cbeab457b9d92005b126a3a814030304b8e354bee4d37cf59974fb41

hashes/openssl

@@ -1,2 +1,2 @@
-# https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/openssl-3.0.0-1.fc36.src.rpm
-SHA512 (openssl-3.0.0-1.fc36.src.rpm) = f0aa28ee6c2810e595310221a610c58861ef75b2c2002f6f65f715b25927fb3359b8dd3b0da7ce1d4578bfe9990f42190b8f4e94ed009ac53220dc381417ddf8
+# https://dl.fedoraproject.org/pub/fedora/linux/releases/36/Everything/source/tree/Packages/o/openssl-3.0.2-4.fc36.src.rpm
+SHA512 (openssl-3.0.2-4.fc36.src.rpm) = 61d07f1d83e474d84bba10932d396d2099e5fe3424d0a7fc6af2617620b42e715c4d411093507868064156de7333b62c9425449ca83a12156fbe9992ea976b1b

hashes/rust

@@ -1,15 +1,15 @@
-# https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz
-SHA512 (rustc-1.58.1-src.tar.xz) = eff3279d2e519343cea542a9ae2daab592e44f35af344e33ff43ed55fc7c824511790d1991dd36a603d12465de8c3688e7194c2b9557f288c587ffa04738c2ce
-### See /~https://github.com/rust-lang/rust/blob/1.58.1/src/stage0.json for what to use below. ###
-# https://static.rust-lang.org/dist/2021-12-02/rust-std-1.57.0-x86_64-unknown-linux-gnu.tar.xz
-SHA512 (rust-std-1.57.0-x86_64-unknown-linux-gnu.tar.xz) = 1257ab3648d6569c827096253b60075b32ac3529e42fc68220cd0b83cecc2fda1a8187c716f81556069cd931d4a79cc4f8b7f7ea89cb8f0d1f244b41f0d4a15c
-# https://static.rust-lang.org/dist/2021-12-02/rustc-1.57.0-x86_64-unknown-linux-gnu.tar.xz
-SHA512 (rustc-1.57.0-x86_64-unknown-linux-gnu.tar.xz) = dca0cf813d42bec4f0b5395c7bc1e0f0049d987247120dcbc87b5234ae32178e1b95b5ae955ec99125ab9e88e8c60d2665becd971c43b30a25ef2c63fc6de1c1
-# https://static.rust-lang.org/dist/2021-12-02/cargo-1.57.0-x86_64-unknown-linux-gnu.tar.xz
-SHA512 (cargo-1.57.0-x86_64-unknown-linux-gnu.tar.xz) = ca84cfc9f0d52443aa41da1e18fe013d1c0412882e061b391d80b6a2fcc3c6858c923ee2dd53174c60c845fbd26523b62a9e1279b888bdc3c409702754d94557
-# https://static.rust-lang.org/dist/2021-12-02/rust-std-1.57.0-aarch64-unknown-linux-gnu.tar.xz
-SHA512 (rust-std-1.57.0-aarch64-unknown-linux-gnu.tar.xz) = 3977195413b1272f1364defadc444ccf6152410e4f926f6617052648e79bf9888df0a8a2415a75c224ef79a52c801ed91952017bf6659aa0d41a8cc59c9251a4
-# https://static.rust-lang.org/dist/2021-12-02/rustc-1.57.0-aarch64-unknown-linux-gnu.tar.xz
-SHA512 (rustc-1.57.0-aarch64-unknown-linux-gnu.tar.xz) = 3931771ad8e352c8d412193f69d6791c38c843b9435e79237e3968cd460a9b6cdb2c1b84ed576500017bc70e81624d3c120b4a452821a588d0af5a20d298f9b4
-# https://static.rust-lang.org/dist/2021-12-02/cargo-1.57.0-aarch64-unknown-linux-gnu.tar.xz
-SHA512 (cargo-1.57.0-aarch64-unknown-linux-gnu.tar.xz) = f99ac5d4ad6c8abb30116cb88f7eb6bd7e2e681f71b4a0345af992d32fa78b2acbd130bc41c581539153ebb9908f24e81dbfa12d8eca9c31e01ef1f3d1e6cf37
+# https://static.rust-lang.org/dist/rustc-1.61.0-src.tar.xz
+SHA512 (rustc-1.61.0-src.tar.xz) = 9bbdcc1c37f7b889be0c8d195963b4c3b65267a63ea309315eda12bd3b2cd36e0060301805dfc7da440c0a8702d085ccb0bf763155b27035a078769333637fb3
+### See /~https://github.com/rust-lang/rust/blob/1.61.0/src/stage0.json for what to use below. ###
+# https://static.rust-lang.org/dist/2022-04-07/rust-std-1.60.0-x86_64-unknown-linux-gnu.tar.xz
+SHA512 (rust-std-1.60.0-x86_64-unknown-linux-gnu.tar.xz) = 8fcab38cafeca1a4950ddd8bef0e45b01b060588970457e723eae3a98f6d515b5e44eaad6719acc19c47ae4f4aa33c9bf9fdb27d657cfe4c87881829d074aeff
+# https://static.rust-lang.org/dist/2022-04-07/rustc-1.60.0-x86_64-unknown-linux-gnu.tar.xz
+SHA512 (rustc-1.60.0-x86_64-unknown-linux-gnu.tar.xz) = 21ed900b9edae59253506ffcac06881252f202344f6d6a0e43c981bac6b92714e8c24c2ddd1f7714058c09090ee993919d4fd7fa161d6fab7c65e2ef83b0c98b
+# https://static.rust-lang.org/dist/2022-04-07/cargo-1.60.0-x86_64-unknown-linux-gnu.tar.xz
+SHA512 (cargo-1.60.0-x86_64-unknown-linux-gnu.tar.xz) = d07353486fe475d76d519a4ed226511717c8a1ce85c2aebddb09fdc0f67608731991b6ebb53d90d8494fe31b5141b64f422496fd05337e72e36990443017afeb
+# https://static.rust-lang.org/dist/2022-04-07/rust-std-1.60.0-aarch64-unknown-linux-gnu.tar.xz
+SHA512 (rust-std-1.60.0-aarch64-unknown-linux-gnu.tar.xz) = bab2005d52000127cf56d723a2e4e03d79f05e3bf2a25153aa56617a59cc4c6bc8e0c4a02ad1ded789efc83144087ee8621f61d950190ab54b2d37e314bc0668
+# https://static.rust-lang.org/dist/2022-04-07/rustc-1.60.0-aarch64-unknown-linux-gnu.tar.xz
+SHA512 (rustc-1.60.0-aarch64-unknown-linux-gnu.tar.xz) = 2ecdc690bb549d1596141435a113efc46be133aea187b6e5dadf89aa7f25a0ccb0299aee08b75c82e807dba5e2de60b7cffef6d75802a3de448e23a0ca569963
+# https://static.rust-lang.org/dist/2022-04-07/cargo-1.60.0-aarch64-unknown-linux-gnu.tar.xz
+SHA512 (cargo-1.60.0-aarch64-unknown-linux-gnu.tar.xz) = 942873d5e254eb0232e309f5af0347bea3a428fa97199e407adb4d8c4bcd59f23ea6adcb23ba6b00f8c9430b3f6fd706feb19b2fe7ec73e1d9aec08e40c1731b