From 51f52bbca2ae4c777dc6270feb7466fd252c750e Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 14 Jul 2013 14:59:01 -0400 Subject: [PATCH] fix(bootstrap_sdk): Don't include cross toolchains in final tarball. The packages have to be downloaded separately so don't waste space including it in the stage4 tarball. --- lib/catalyst_sdk_stage4.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/catalyst_sdk_stage4.sh b/lib/catalyst_sdk_stage4.sh index 44ad54587f..2012daa05f 100644 --- a/lib/catalyst_sdk_stage4.sh +++ b/lib/catalyst_sdk_stage4.sh @@ -11,12 +11,11 @@ for cross_chost in x86_64-cros-linux-gnu; do --stable --ex-gdb --init-target \ --target "${cross_chost}" || exit 1 - # If PKGCACHE is enabled check to see if binary packages are available - # or (due to --noreplace) the packages are already installed. If so then - # we don't need to perform a full bootstrap and just call emerge instead. + # If PKGCACHE is enabled check to see if binary packages are available. + # If so then don't perform a full bootstrap and just call emerge instead. if [[ -n "${clst_PKGCACHE}" ]] && \ emerge ${clst_myemergeopts} --usepkgonly --binpkg-respect-use=y \ - --noreplace "${cross_pkgs[@]}" &>/dev/null + --pretend "${cross_pkgs[@]}" &>/dev/null then run_merge -u "${cross_pkgs[@]}" else @@ -26,6 +25,11 @@ for cross_chost in x86_64-cros-linux-gnu; do --stable --ex-gdb --stage4 \ --target "${cross_chost}" || exit 1 fi + + # There is no point to including the built packages in the final tarball + # because the packages will have to be downloaded anyway due to how the + # cross toolchains are managed in board sysroots. + crossdev --force -C "${cross_chost}" done echo "Double checking everything is fresh and happy."