diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-01 16:48:41 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-01 17:15:28 -0500 |
| commit | d465b21d22cf797623f5200d099bf6c28643f1ee (patch) | |
| tree | e458596994c8bf41318fbe1d340437996c7c5c20 | |
| parent | 0ebafa9068f4eff792824bc089bebcc22eac01f3 (diff) | |
root_image: Include rust
This uses rustup, so we get a recent version.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rwxr-xr-x | lib/testrunner | 2 | ||||
| -rwxr-xr-x | root_image | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/testrunner b/lib/testrunner index 64dd957..2d0a5ca 100755 --- a/lib/testrunner +++ b/lib/testrunner @@ -9,6 +9,8 @@ set -o errtrace export PS4='+`basename ${BASH_SOURCE[0]}`:${LINENO}:${FUNCNAME[0]:+${FUNCNAME[0]}()}+ ' KERNEL_ARCH="" +export PATH=$PATH:/root/.cargo/bin + . /host/$ktest_env ktest_dir="/host/$ktest_dir" @@ -71,7 +71,7 @@ parse_arch "$ktest_arch" mkdir -p "$(dirname "$ktest_image")" -PACKAGES=(kexec-tools less psmisc openssh-server \ +PACKAGES=(kexec-tools less psmisc openssh-server curl \ build-essential make gcc g++ \ autoconf automake autopoint bison \ pkg-config libtool-bin \ @@ -220,6 +220,11 @@ update_packages() _chroot "$MNT" apt-get -qq upgrade _chroot "$MNT" apt-get -qq install --no-install-recommends "${PACKAGES[@]}" rm -f "$MNT/var/cache/apt/archives/*.deb" + + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > "$MNT"/tmp/rustup.sh + chmod 755 "$MNT"/tmp/rustup.sh + + _chroot "$MNT" /tmp/rustup.sh -y } trim_image() |