From 75e12217a182d2cc379f37648af56d1a72be8d97 Mon Sep 17 00:00:00 2001 From: Jim Borden Date: Tue, 24 Sep 2024 11:32:30 +0900 Subject: [PATCH] Fix the half done merge that went in for clang (#574) * Remove unneeded argument from ci_cross_build * Corrected cross manifest --- jenkins/ci_cross_build.py | 1 - jenkins/cross_manifest.json | 28 ++++++---------------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/jenkins/ci_cross_build.py b/jenkins/ci_cross_build.py index 47eaa09f..e9e3ddbc 100755 --- a/jenkins/ci_cross_build.py +++ b/jenkins/ci_cross_build.py @@ -164,7 +164,6 @@ def check_sysroot(name: str): parser.add_argument('edition', type=str, choices=['enterprise', 'community'], help='The edition of the product to build') parser.add_argument('build_os', type=str, help="The OS to compile for") parser.add_argument('target_osname', type=str, help="OS name to use in deliverable .tar.gz files") - parser.add_argument('strip_prefix', type=str, help='The prefix to use on the binary for stripping the final product') parser.add_argument('toolchain', type=str, help='The CMake toolchain file to use for building') args = parser.parse_args() diff --git a/jenkins/cross_manifest.json b/jenkins/cross_manifest.json index 2aac975e..5d105f52 100644 --- a/jenkins/cross_manifest.json +++ b/jenkins/cross_manifest.json @@ -1,30 +1,14 @@ { - "raspbian9": { - "toolchain": "http://downloads.build.couchbase.com/mobile/toolchains/cross-gcc-9.3.0-pi_2-3.tar.gz", - "sysroot": "debian-stretch-armhf.tar.gz" - }, - "debian9-x86_64": { - "toolchain": "", - "sysroot": "debian-stretch-x64.tar.gz" - }, - "raspios10-armhf": { - "toolchain": "https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%208.3.0/Raspberry%20Pi%202%2C%203/cross-gcc-8.3.0-pi_2-3.tar.gz/download", - "sysroot": "debian-buster-armhf.tar.gz" - }, - "raspios10-arm64": { - "toolchain": "https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Bonus%20Raspberry%20Pi%20GCC%2064-Bit%20Toolchains/Raspberry%20Pi%20GCC%2064-Bit%20Cross-Compiler%20Toolchains/Buster/GCC%208.3.0/cross-gcc-8.3.0-pi_64.tar.gz/download", - "sysroot": "debian-buster-arm64.tar.gz" - }, - "ubuntu20.04-armhf": { + "debian11-armhf": { "toolchain": "", - "sysroot": "ubuntu-focal-armhf.tar.gz" + "sysroot": "debian-bookworm-armhf.tar.gz" }, - "ubuntu20.04-arm64": { + "debian11-arm64": { "toolchain": "", - "sysroot": "ubuntu-focal-arm64.tar.gz" + "sysroot": "debian-bookworm-arm64.tar.gz" }, - "ubuntu20.04-x86_64": { + "debian11-x86_64": { "toolchain": "", - "sysroot": "ubuntu-focal-x64.tar.gz" + "sysroot": "debian-bookworm-x64.tar.gz" } }