From 0148b0df16f9849d08772962502ed96a1f8b158d Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 5 Aug 2019 10:52:44 -0400 Subject: [PATCH] jenkins: Stop trying to install catalyst It's already built into the SDK. --- jenkins/sdk.sh | 4 +--- jenkins/toolchains.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/jenkins/sdk.sh b/jenkins/sdk.sh index bfb472f479..2606ebe672 100644 --- a/jenkins/sdk.sh +++ b/jenkins/sdk.sh @@ -13,9 +13,7 @@ gpg --import "${GPG_SECRET_KEY_FILE}" # Wipe all of catalyst. sudo rm -rf src/build -S=/mnt/host/source/src/scripts -enter sudo emerge -uv --jobs=2 catalyst -enter sudo ${S}/bootstrap_sdk \ +enter sudo /mnt/host/source/src/scripts/bootstrap_sdk \ --sign="${SIGNING_USER}" \ --sign_digests="${SIGNING_USER}" \ --upload_root="${UPLOAD_ROOT}" \ diff --git a/jenkins/toolchains.sh b/jenkins/toolchains.sh index 07df58bf42..92479e9157 100644 --- a/jenkins/toolchains.sh +++ b/jenkins/toolchains.sh @@ -13,9 +13,7 @@ gpg --import "${GPG_SECRET_KEY_FILE}" # Wipe all of catalyst. sudo rm -rf src/build -S=/mnt/host/source/src/scripts -enter sudo emerge -uv --jobs=2 catalyst -enter sudo ${S}/build_toolchains \ +enter sudo /mnt/host/source/src/scripts/build_toolchains \ --sign="${SIGNING_USER}" \ --sign_digests="${SIGNING_USER}" \ --upload_root="${UPLOAD_ROOT}" \