From feb6b3a2b01c5a6c3e3cbe08e8a964241c325fcf Mon Sep 17 00:00:00 2001 From: Andrew Erickson Date: Sat, 24 Feb 2024 03:26:06 -0500 Subject: [PATCH] rename variable, hopefully fixes things --- .../10-additional-talos-reqs.sh | 11 ++++++----- scripts/ubuntu-jammy-from-community/05-install.sh | 8 ++++---- template/vars/ubuntu_amd64.yaml | 2 +- template/vars/ubuntu_arm64.yaml | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/ubuntu-jammy-from-community-gui/10-additional-talos-reqs.sh b/scripts/ubuntu-jammy-from-community-gui/10-additional-talos-reqs.sh index fe636ac..55ef310 100644 --- a/scripts/ubuntu-jammy-from-community-gui/10-additional-talos-reqs.sh +++ b/scripts/ubuntu-jammy-from-community-gui/10-additional-talos-reqs.sh @@ -39,13 +39,14 @@ sudo apt-get -y reinstall linux-headers-gcp linux-headers-`uname -r` ${pkg_name} # # pre-reqs -apt-get install -y dkms kmod llvm sox libxcb1 nodejs xvfb +apt-get install -y dkms kmod llvm sox libxcb1 nodejs xvfb apt-utils # v4l2loopback -# - fails for some reason... not sure why (works when run interactively... env vars?) -# - ignore result code -apt-get install -y v4l2loopback-dkms || true +# didn't help: +# - HOSTTYPE=x86_64 SRCARCH=`uname -m` +printenv +apt-get install -y v4l2loopback-dkms v4l2loopback-utils # see if autoinstall works -dkms autoinstall +# dkms autoinstall dkms status # not working: linux-headers diff --git a/scripts/ubuntu-jammy-from-community/05-install.sh b/scripts/ubuntu-jammy-from-community/05-install.sh index f4da75f..56fd27e 100644 --- a/scripts/ubuntu-jammy-from-community/05-install.sh +++ b/scripts/ubuntu-jammy-from-community/05-install.sh @@ -29,10 +29,10 @@ retry docker run hello-world # removed kvm vmware backdoor cd /usr/local/bin -retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/generic-worker-multiuser-linux-${ARCH}" > generic-worker -retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/start-worker-linux-${ARCH}" > start-worker -retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/livelog-linux-${ARCH}" > livelog -retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/taskcluster-proxy-linux-${ARCH}" > taskcluster-proxy +retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/generic-worker-multiuser-linux-${TC_ARCH}" > generic-worker +retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/start-worker-linux-${TC_ARCH}" > start-worker +retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/livelog-linux-${TC_ARCH}" > livelog +retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/taskcluster-proxy-linux-${TC_ARCH}" > taskcluster-proxy chmod a+x generic-worker start-worker taskcluster-proxy livelog mkdir -p /etc/generic-worker diff --git a/template/vars/ubuntu_amd64.yaml b/template/vars/ubuntu_amd64.yaml index bf2dfa3..bc0e6e3 100644 --- a/template/vars/ubuntu_amd64.yaml +++ b/template/vars/ubuntu_amd64.yaml @@ -1,3 +1,3 @@ env_vars: # currently only used for taskcluster component installation - ARCH: amd64 \ No newline at end of file + TC_ARCH: amd64 \ No newline at end of file diff --git a/template/vars/ubuntu_arm64.yaml b/template/vars/ubuntu_arm64.yaml index e97daf1..a4cb611 100644 --- a/template/vars/ubuntu_arm64.yaml +++ b/template/vars/ubuntu_arm64.yaml @@ -1,3 +1,3 @@ env_vars: # currently only used for taskcluster component installation - ARCH: arm64 \ No newline at end of file + TC_ARCH: arm64 \ No newline at end of file