From d2ff0469b15d17dde98b23b1b1069561f1ffbfae Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Tue, 9 Apr 2024 16:46:26 +0100 Subject: [PATCH] 3DS: Remove bundled CA certificates curl v8.4.0 from dkp-pacman specifies sdmc:/config/ssl/cacert.pem as a standard location for installing certificates --- buildbot-config/platforms.py | 2 -- workers/devkit3ds/Dockerfile.m4 | 3 --- 2 files changed, 5 deletions(-) diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py index 449abe3..6909e0c 100644 --- a/buildbot-config/platforms.py +++ b/buildbot-config/platforms.py @@ -127,8 +127,6 @@ def _3ds(): platform = Platform("3ds") platform.workerimage = "devkit3ds" platform.compatibleBuilds = (builds.ScummVMBuild, ) - # Include CA certificates bundle to allow HTTPS - platform.env["DIST_3DS_EXTRA_FILES"] = "${DEVKITPRO}/cacert.pem" platform.configureargs.append("--host=3ds") platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-plugins", "--default-dynamic" ], diff --git a/workers/devkit3ds/Dockerfile.m4 b/workers/devkit3ds/Dockerfile.m4 index f3d99d0..ed7ff8e 100644 --- a/workers/devkit3ds/Dockerfile.m4 +++ b/workers/devkit3ds/Dockerfile.m4 @@ -13,9 +13,6 @@ COPY --from=toolchain ${DEVKITPRO}/libctru ${DEVKITPRO}/libctru/ COPY --from=toolchain ${DEVKITPRO}/portlibs/3ds ${DEVKITPRO}/portlibs/3ds/ COPY --from=toolchain ${DEVKITPRO}/tools ${DEVKITPRO}/tools/ -# Copy Debian certificates for bundling by buildbot -RUN cp /etc/ssl/certs/ca-certificates.crt "${DEVKITPRO}/cacert.pem" - # We add PATH here for *-config and platform specific binaries ENV \ def_binaries(`${DEVKITARM}/bin/${HOST}-', `ar, as, c++filt, ld, nm, objcopy, objdump, ranlib, readelf, strings, strip') \