From c23a457e72abe608715ac76f076f47dc42af07a5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 20:31:44 +0200 Subject: Merging upstream version 1.74.1+dfsg1. Signed-off-by: Daniel Baumann --- .../ci/docker/aarch64-linux-android/Dockerfile | 18 ------------------ .../ci/docker/aarch64-unknown-linux-gnu/Dockerfile | 11 ----------- .../ci/docker/arm-linux-androideabi/Dockerfile | 18 ------------------ .../ci/docker/arm-unknown-linux-gnueabihf/Dockerfile | 10 ---------- .../ci/docker/armv7-linux-androideabi/Dockerfile | 18 ------------------ .../ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile | 10 ---------- .../ci/docker/i586-unknown-linux-gnu/Dockerfile | 5 ----- .../backtrace/ci/docker/i686-linux-android/Dockerfile | 18 ------------------ .../ci/docker/i686-unknown-linux-gnu/Dockerfile | 5 ----- .../ci/docker/powerpc64-unknown-linux-gnu/Dockerfile | 16 ---------------- .../ci/docker/s390x-unknown-linux-gnu/Dockerfile | 17 ----------------- .../ci/docker/x86_64-linux-android/Dockerfile | 18 ------------------ .../ci/docker/x86_64-pc-windows-gnu/Dockerfile | 10 ---------- .../ci/docker/x86_64-unknown-linux-gnu/Dockerfile | 6 ------ .../ci/docker/x86_64-unknown-linux-musl/Dockerfile | 6 ------ 15 files changed, 186 deletions(-) delete mode 100644 vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/aarch64-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/arm-linux-androideabi/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/i586-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/i686-linux-android/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/i686-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/s390x-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile delete mode 100644 vendor/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile (limited to 'vendor/backtrace/ci/docker') diff --git a/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile b/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile deleted file mode 100644 index 906c68789..000000000 --- a/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang \ - CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/aarch64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 871b353c0..000000000 --- a/vendor/backtrace/ci/docker/aarch64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-aarch64-linux-gnu \ - libc6-dev-arm64-cross \ - qemu-user - -ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \ - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -L /usr/aarch64-linux-gnu" diff --git a/vendor/backtrace/ci/docker/arm-linux-androideabi/Dockerfile b/vendor/backtrace/ci/docker/arm-linux-androideabi/Dockerfile deleted file mode 100644 index 7471dcb73..000000000 --- a/vendor/backtrace/ci/docker/arm-linux-androideabi/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \ - CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/vendor/backtrace/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile deleted file mode 100644 index 24665972c..000000000 --- a/vendor/backtrace/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-arm-linux-gnueabihf \ - libc6-dev-armhf-cross \ - qemu-user -ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ - CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" diff --git a/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile b/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile deleted file mode 100644 index 543fcd243..000000000 --- a/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \ - CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/vendor/backtrace/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile deleted file mode 100644 index 6f7d0fd36..000000000 --- a/vendor/backtrace/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-arm-linux-gnueabihf \ - libc6-dev-armhf-cross \ - qemu-user -ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" diff --git a/vendor/backtrace/ci/docker/i586-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/i586-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 316a233e3..000000000 --- a/vendor/backtrace/ci/docker/i586-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc-multilib \ - libc6-dev \ - ca-certificates diff --git a/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile b/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile deleted file mode 100644 index 61cb9d075..000000000 --- a/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android19-clang \ - CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/i686-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/i686-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 316a233e3..000000000 --- a/vendor/backtrace/ci/docker/i686-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc-multilib \ - libc6-dev \ - ca-certificates diff --git a/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 7ca5a64bf..000000000 --- a/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-powerpc64-linux-gnu \ - libc6-dev-ppc64-cross \ - qemu-user \ - qemu-system-ppc - -ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \ - # TODO: should actually run these tests - #CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64 -L /usr/powerpc64-linux-gnu" \ - CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER=echo \ - CC=powerpc64-linux-gnu-gcc diff --git a/vendor/backtrace/ci/docker/s390x-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/s390x-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 7c19dcbb4..000000000 --- a/vendor/backtrace/ci/docker/s390x-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - ca-certificates \ - libc6-dev \ - gcc-s390x-linux-gnu \ - libc6-dev-s390x-cross \ - qemu-user \ - # There seems to be a bug in processing mixed-architecture - # ld.so.cache files that causes crashes in some cases. Work - # around this by simply deleting the cache for now. - && rm /etc/ld.so.cache - -ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \ - CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x -L /usr/s390x-linux-gnu" \ - CC=s390x-linux-gnu-gcc diff --git a/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile b/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile deleted file mode 100644 index 4c8922936..000000000 --- a/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - unzip \ - openjdk-8-jre \ - python \ - gcc \ - libc6-dev - -COPY android-ndk.sh / -RUN /android-ndk.sh -ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin - -# TODO: run tests in an emulator eventually -ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang \ - CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER=echo diff --git a/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile b/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile deleted file mode 100644 index a8e859e67..000000000 --- a/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - libc6-dev \ - ca-certificates \ - gcc-mingw-w64-x86-64 - -# No need to run tests, we're just testing that it compiles -ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER=echo \ - CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc diff --git a/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 551ab1378..000000000 --- a/vendor/backtrace/ci/docker/x86_64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - libc6-dev \ - ca-certificates \ - dwz diff --git a/vendor/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile b/vendor/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile deleted file mode 100644 index e77e41f5b..000000000 --- a/vendor/backtrace/ci/docker/x86_64-unknown-linux-musl/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc \ - libc6-dev \ - ca-certificates \ - musl-tools -- cgit v1.2.3