From 6a0c4da31e533ee4450f0adcb9b8f45b98643566 Mon Sep 17 00:00:00 2001 From: Emre Girgin <50592283+mrgirgin@users.noreply.github.com> Date: Thu, 15 Oct 2020 07:18:42 -0700 Subject: [PATCH 1/2] Remove toolchain-local-wget-list after use - toolchain-local-wget-list has been left at the end of a toolchain build. It shows up on `git status` whene toolchain is built locally. - Another solution would be adding it to `.gitignore`. --- toolkit/scripts/toolchain/create_toolchain_in_container.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/scripts/toolchain/create_toolchain_in_container.sh b/toolkit/scripts/toolchain/create_toolchain_in_container.sh index aec2ef8aa2c..eb80048a50d 100755 --- a/toolkit/scripts/toolchain/create_toolchain_in_container.sh +++ b/toolkit/scripts/toolchain/create_toolchain_in_container.sh @@ -55,6 +55,7 @@ rm -rvf ./populated_toolchain mv ./lfs ./populated_toolchain rm -rvf ./populated_toolchain/.dockerenv rm -rvf ./populated_toolchain/sources +rm ./container/toolchain-local-wget-list tar czf toolchain_from_container.tar.gz populated_toolchain ls -la ./ ls -la ./populated_toolchain @@ -66,4 +67,4 @@ rm -vf ./container/Awt_build_headless_only.patch rm -vf ./container/check-system-ca-certs.patch rm -vf ./container/.bashrc -echo Raw toolchain build complete \ No newline at end of file +echo Raw toolchain build complete From 8a132b6c466128e911eff8b5449825e9fa8b673d Mon Sep 17 00:00:00 2001 From: Emre Girgin Date: Thu, 15 Oct 2020 18:24:17 +0000 Subject: [PATCH 2/2] Add temporary toolchain build files to toolkit/.gitignore --- toolkit/.gitignore | 9 ++++++++- .../scripts/toolchain/create_toolchain_in_container.sh | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/toolkit/.gitignore b/toolkit/.gitignore index 466e24805a9..24ebb460623 100644 --- a/toolkit/.gitignore +++ b/toolkit/.gitignore @@ -1 +1,8 @@ -out/ \ No newline at end of file +out/ + +# Temporary toolchain build files that are left behind after a failed build. +scripts/toolchain/container/.bashrc +scripts/toolchain/container/Awt_build_headless_only.patch +scripts/toolchain/container/check-system-ca-certs.patch +scripts/toolchain/container/texinfo-perl-fix.patch +scripts/toolchain/container/toolchain-local-wget-list diff --git a/toolkit/scripts/toolchain/create_toolchain_in_container.sh b/toolkit/scripts/toolchain/create_toolchain_in_container.sh index eb80048a50d..51d098710cb 100755 --- a/toolkit/scripts/toolchain/create_toolchain_in_container.sh +++ b/toolkit/scripts/toolchain/create_toolchain_in_container.sh @@ -55,7 +55,6 @@ rm -rvf ./populated_toolchain mv ./lfs ./populated_toolchain rm -rvf ./populated_toolchain/.dockerenv rm -rvf ./populated_toolchain/sources -rm ./container/toolchain-local-wget-list tar czf toolchain_from_container.tar.gz populated_toolchain ls -la ./ ls -la ./populated_toolchain @@ -66,5 +65,6 @@ rm -vf ./container/texinfo-perl-fix.patch rm -vf ./container/Awt_build_headless_only.patch rm -vf ./container/check-system-ca-certs.patch rm -vf ./container/.bashrc +rm -vf ./container/toolchain-local-wget-list echo Raw toolchain build complete