From 5c25fdab080e70769307f9a61abdb2c178365d86 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 11 Jun 2020 10:34:07 +0200 Subject: sys/targets: fail loudly if SOURCEDIR_GOOS is set but compiler is broken Since we now have SOURCEDIR_{FUCHSIA,AKAROS,NETBSD} exported in the syz-big-env docker image, this will make CI fail for broken cross-builds too. Update instructions in the docker image to fix the current problem with permissions in syz-big-env: we need to tar with --mode=go=u. --- tools/docker/big-env/Dockerfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'tools/docker') diff --git a/tools/docker/big-env/Dockerfile b/tools/docker/big-env/Dockerfile index ae39c943c..cf3d7670a 100644 --- a/tools/docker/big-env/Dockerfile +++ b/tools/docker/big-env/Dockerfile @@ -13,16 +13,24 @@ FROM gcr.io/syzkaller/env # Install OS toolchains from pre-built archives. # These archives were created with: -# tar -czf akaros-toolchain.tar.gz akaros/toolchain -# tar -czf netbsd-toolchain.tar.gz netbsd/tools netbsd/dest -# tar -czf fuchsia-toolchain.tar.gz fuchsia/prebuilt/third_party/clang \ +# tar -cz --owner=0 --group=0 --mode=go=u -f akaros-toolchain.tar.gz akaros/toolchain +# tar -cz --owner=0 --group=0 --mode=go=u -f netbsd-toolchain.tar.gz netbsd/tools netbsd/dest +# tar -cz --owner=0 --group=0 --mode=go=u -f fuchsia-toolchain.tar.gz fuchsia/prebuilt/third_party/clang \ # fuchsia/zircon/system/ulib fuchsia/src/lib/ddk fuchsia/out/x64/fidling/gen \ # fuchsia/out/x64/zircon_toolchain/obj/zircon/public/sysroot/sysroot \ # fuchsia/out/x64/x64-shared/*.so fuchsia/out/arm64/fidling/gen \ # fuchsia/out/arm64/zircon_toolchain/obj/zircon/public/sysroot/sysroot \ # fuchsia/out/arm64/arm64-shared/*.so -# And then uploaded to GCS: +# +# And then uploaded to GCS with: +# gsutil mv gs://syzkaller/GOOS-toolchain.tar.gz gs://syzkaller/GOOS-toolchain.old.tar.gz # gsutil cp GOOS-toolchain.tar.gz gs://syzkaller/ +# gsutil acl ch -g all:R gs://syzkaller/GOOS-toolchain.tar.gz +# +# NetBSD toolchain can be re-built with: +# ./build.sh -j72 -m amd64 -U -T ../tools tools +# ./build.sh -j72 -m amd64 -U -T ../tools -D ../dest distribution + RUN curl https://storage.googleapis.com/syzkaller/fuchsia-toolchain.tar.gz | tar -C /syzkaller -xz RUN curl https://storage.googleapis.com/syzkaller/netbsd-toolchain.tar.gz | tar -C /syzkaller -xz RUN curl https://storage.googleapis.com/syzkaller/akaros-toolchain.tar.gz | tar -C /syzkaller -xz -- cgit mrf-deployment