Merge pull request #979 from krishjainx/remove-sdk-errors

Check the url in get_sdk_binhost before echoing
flatcar · Jul 20, 2023 · 75904af · 75904af
2 parents b315406 + fadf4c2
commit 75904af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
@@ -201,8 +201,10 @@ get_sdk_binhost() {
         # but normally it is not needed because everything is already part of the tarball.
         # To install the crossdev Rust package, /toolchain-arm64/ is derived from /toolchain/
         # when necessary in install_cross_toolchain().
-        echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/toolchain/"
-        echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/pkgs/"
+        if curl -Ifs -o /dev/null "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/pkgs/"; then
+            echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/toolchain/"
+            echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/pkgs/"
+        fi
     done
 }
 

diff --git a/update_chroot b/update_chroot
@@ -188,7 +188,7 @@ if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
   if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then
     EMERGE_FLAGS+=( --usepkgonly --rebuilt-binaries n )
   fi
-  if [ "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]; then
+  if [ "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ] && [ -n "${PORTAGE_BINHOST// }" ]; then
     EMERGE_FLAGS+=( --getbinpkg )
   fi