From 72a6bd155ea8e19b859f5b26066814d571730b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Tue, 23 Jun 2020 17:22:52 +0200 Subject: [PATCH] install_cross_toolchain: work around crossdev being part of the SDK The SDK job includes most crossdev x86 files but doesn't include the /usr/local/portage/crossdev/cross-x86_64-cros-linux-gnu/ symlinks for the ebuild files. This causes the crossdev packages to be deinstalled as obsolete. Detect when the symlink folder is missing and run crossdev to create it during update_chroot setup. --- build_library/toolchain_util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index 1e853d3cc4..6ba1015375 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -314,7 +314,7 @@ install_cross_toolchain() { fi # Only call crossdev to regenerate configs if something has changed - if ! cmp --quiet - "${cross_cfg}" <<<"${cross_cfg_data}" + if [[ ! -d "${cross_overlay}/cross-${cross_chost}" ]] || ! cmp --quiet - "${cross_cfg}" <<<"${cross_cfg_data}" then $sudo crossdev "${cross_flags[@]}" --init-target $sudo tee "${cross_cfg}" <<<"${cross_cfg_data}" >/dev/null