From ffd7e631b05feef1b9142adb9e63303549cf4e6c Mon Sep 17 00:00:00 2001 From: Lex <115115137+lex-ibm@users.noreply.github.com> Date: Tue, 11 Jun 2024 09:56:15 -0500 Subject: [PATCH] build: prepare for PPC64LE client (#1923) --- package_linux_bin.sh | 12 +- package_linux_reh.sh | 2 + patches/ppc64le-and-riscv64-support.patch | 481 ++++++++++++++++++++-- update_version.sh | 2 +- 4 files changed, 460 insertions(+), 37 deletions(-) diff --git a/package_linux_bin.sh b/package_linux_bin.sh index 3fecf7cb8b4..c5fd98616a6 100755 --- a/package_linux_bin.sh +++ b/package_linux_bin.sh @@ -16,6 +16,12 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; } export VSCODE_SKIP_NODE_VERSION_CHECK=1 export VSCODE_SYSROOT_PREFIX='-glibc-2.17' +if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then + export VSCODE_SYSROOT_REPO='VSCodium/vscode-linux-build-agent' + export VSCODE_SYSROOT_VERSION='20240129-253798' + export VSCODE_SYSROOT_PREFIX='-glibc-2.28' +fi + if [[ -d "../patches/${OS_NAME}/client/" ]]; then for file in "../patches/${OS_NAME}/client/"*.patch; do if [[ -f "${file}" ]]; then @@ -37,7 +43,11 @@ for i in {1..5}; do # try 5 times echo "Yarn failed $i, trying again..." done -./build/azure-pipelines/linux/setup-env.sh +if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then + source ./build/azure-pipelines/linux/setup-env.sh +else + ./build/azure-pipelines/linux/setup-env.sh +fi for i in {1..5}; do # try 5 times yarn --check-files && break diff --git a/package_linux_reh.sh b/package_linux_reh.sh index c81339d17b6..a951bd5ccea 100755 --- a/package_linux_reh.sh +++ b/package_linux_reh.sh @@ -32,6 +32,8 @@ elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 + export VSCODE_SYSROOT_REPO='VSCodium/vscode-linux-build-agent' + export VSCODE_SYSROOT_VERSION='20240129-253798' elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-riscv64" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 diff --git a/patches/ppc64le-and-riscv64-support.patch b/patches/ppc64le-and-riscv64-support.patch index 99e9c70019c..022f9471871 100644 --- a/patches/ppc64le-and-riscv64-support.patch +++ b/patches/ppc64le-and-riscv64-support.patch @@ -1,5 +1,5 @@ diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh -index e42a6b12b1f..e17f0e2bb17 100755 +index e42a6b12b1f..b31af12b086 100755 --- a/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh @@ -7,6 +7,10 @@ if [ "$SYSROOT_ARCH" == "x64" ]; then @@ -34,7 +34,7 @@ index e42a6b12b1f..e17f0e2bb17 100755 + fi diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh -index f07c0ba..1cb257b 100755 +index f07c0ba71b0..1cb257b33ec 100755 --- a/build/azure-pipelines/linux/verify-glibc-requirements.sh +++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh @@ -7,6 +7,8 @@ if [ "$VSCODE_ARCH" == "arm64" ]; then @@ -47,7 +47,7 @@ index f07c0ba..1cb257b 100755 # Get all files with .node extension from remote/node_modules folder diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt -index 0b5f38c60ce..70770276503 100644 +index 0b5f38c60ce..9f3b02beee3 100644 --- a/build/checksums/vscode-sysroot.txt +++ b/build/checksums/vscode-sysroot.txt @@ -4,3 +4,4 @@ @@ -110,7 +110,7 @@ index e1507e0424f..80ed8d91a41 100644 BUILD_TARGETS.forEach(buildTarget => { const dashed = (str) => (str ? `-${str}` : ``); diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js -index 8c2b62f7b2a..a58ec3d7725 100644 +index 8c2b62f7b2a..2ddc1226f49 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -28,7 +28,7 @@ const linuxPackageRevision = Math.floor(new Date().getTime() / 1000); @@ -118,7 +118,7 @@ index 8c2b62f7b2a..a58ec3d7725 100644 */ function getDebPackageArch(arch) { - return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch]; -+ return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch]; ++ return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el', riscv64: 'riscv64' }[arch]; } function prepareDebPackage(arch) { @@ -140,15 +140,32 @@ index 8c2b62f7b2a..a58ec3d7725 100644 ]; BUILD_TARGETS.forEach(({ arch }) => { +diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js +index bbcb6bfc3de..d00158f3de4 100644 +--- a/build/linux/debian/calculate-deps.js ++++ b/build/linux/debian/calculate-deps.js +@@ -49,6 +49,12 @@ function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot) + case 'arm64': + cmd.push(`-l${chromiumSysroot}/usr/lib/aarch64-linux-gnu`, `-l${chromiumSysroot}/lib/aarch64-linux-gnu`, `-l${vscodeSysroot}/usr/lib/aarch64-linux-gnu`, `-l${vscodeSysroot}/lib/aarch64-linux-gnu`); + break; ++ case 'ppc64el': ++ cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`, `-l${chromiumSysroot}/lib/powerpc64le-linux-gnu`, `-l${vscodeSysroot}/usr/lib/powerpc64le-linux-gnu`, `-l${vscodeSysroot}/lib/powerpc64le-linux-gnu`); ++ break; ++ case 'riscv64': ++ cmd.push(`-l${chromiumSysroot}/usr/lib/riscv64-linux-gnu`, `-l${chromiumSysroot}/lib/riscv64-linux-gnu`, `-l${vscodeSysroot}/usr/lib/riscv64-linux-gnu`, `-l${vscodeSysroot}/lib/riscv64-linux-gnu`); ++ break; + } + cmd.push(`-l${chromiumSysroot}/usr/lib`); + cmd.push(`-L${vscodeSysroot}/debian/libxkbfile1/DEBIAN/shlibs`); diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts -index 92f8065f262..4d930b269aa 100644 +index 92f8065f262..b86b4dba2b8 100644 --- a/build/linux/debian/calculate-deps.ts +++ b/build/linux/debian/calculate-deps.ts @@ -59,6 +59,18 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi `-l${vscodeSysroot}/usr/lib/aarch64-linux-gnu`, `-l${vscodeSysroot}/lib/aarch64-linux-gnu`); break; -+ case 'ppc64le': ++ case 'ppc64el': + cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`, + `-l${chromiumSysroot}/lib/powerpc64le-linux-gnu`, + `-l${vscodeSysroot}/usr/lib/powerpc64le-linux-gnu`, @@ -163,17 +180,107 @@ index 92f8065f262..4d930b269aa 100644 } cmd.push(`-l${chromiumSysroot}/usr/lib`); cmd.push(`-L${vscodeSysroot}/debian/libxkbfile1/DEBIAN/shlibs`); +diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js +index bdb265b6fec..4695f335416 100644 +--- a/build/linux/debian/dep-lists.js ++++ b/build/linux/debian/dep-lists.js +@@ -140,6 +140,85 @@ exports.referenceGeneratedDepsByArch = { + 'libxkbfile1 (>= 1:1.1.0)', + 'libxrandr2', + 'xdg-utils (>= 1.0.2)' ++ ], ++ 'ppc64el': [ ++ 'ca-certificates', ++ 'libasound2 (>= 1.0.17)', ++ 'libatk-bridge2.0-0 (>= 2.5.3)', ++ 'libatk1.0-0 (>= 2.2.0)', ++ 'libatspi2.0-0 (>= 2.9.90)', ++ 'libc6 (>= 2.17)', ++ 'libc6 (>= 2.28)', ++ 'libcairo2 (>= 1.6.0)', ++ 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', ++ 'libdbus-1-3 (>= 1.9.14)', ++ 'libdrm2 (>= 2.4.75)', ++ 'libexpat1 (>= 2.1~beta3)', ++ 'libgbm1 (>= 17.1.0~rc2)', ++ 'libglib2.0-0 (>= 2.37.3)', ++ 'libgssapi-krb5-2 (>= 1.17)', ++ 'libgtk-3-0 (>= 3.9.10)', ++ 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', ++ 'libkrb5-3 (>= 1.6.dfsg.2)', ++ 'libnspr4 (>= 2:4.9-2~)', ++ 'libnss3 (>= 2:3.30)', ++ 'libnss3 (>= 3.26)', ++ 'libpango-1.0-0 (>= 1.14.0)', ++ 'libstdc++6 (>= 4.1.1)', ++ 'libstdc++6 (>= 5)', ++ 'libstdc++6 (>= 5.2)', ++ 'libstdc++6 (>= 6)', ++ 'libx11-6', ++ 'libx11-6 (>= 2:1.4.99.1)', ++ 'libxcb1 (>= 1.9.2)', ++ 'libxcomposite1 (>= 1:0.4.4-1)', ++ 'libxdamage1 (>= 1:1.1)', ++ 'libxext6', ++ 'libxfixes3', ++ 'libxkbcommon0 (>= 0.5.0)', ++ 'libxkbfile1 (>= 1:1.1.0)', ++ 'libxrandr2', ++ 'xdg-utils (>= 1.0.2)' ++ ], ++ 'riscv64': [ ++ 'ca-certificates', ++ 'libatomic1', ++ 'libasound2 (>= 1.0.17)', ++ 'libatk-bridge2.0-0 (>= 2.5.3)', ++ 'libatk1.0-0 (>= 2.2.0)', ++ 'libatspi2.0-0 (>= 2.9.90)', ++ 'libc6 (>= 2.17)', ++ 'libc6 (>= 2.28)', ++ 'libcairo2 (>= 1.6.0)', ++ 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', ++ 'libdbus-1-3 (>= 1.0.2)', ++ 'libdrm2 (>= 2.4.60)', ++ 'libexpat1 (>= 2.0.1)', ++ 'libgbm1 (>= 17.1.0~rc2)', ++ 'libglib2.0-0 (>= 2.16.0)', ++ 'libglib2.0-0 (>= 2.39.4)', ++ 'libgtk-3-0 (>= 3.9.10)', ++ 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', ++ 'libnspr4 (>= 2:4.9-2~)', ++ 'libnss3 (>= 2:3.22)', ++ 'libnss3 (>= 3.26)', ++ 'libpango-1.0-0 (>= 1.14.0)', ++ 'libsecret-1-0 (>= 0.18)', ++ 'libstdc++6 (>= 4.1.1)', ++ 'libstdc++6 (>= 5)', ++ 'libstdc++6 (>= 5.2)', ++ 'libstdc++6 (>= 6)', ++ 'libx11-6', ++ 'libx11-6 (>= 2:1.4.99.1)', ++ 'libxcb1 (>= 1.9.2)', ++ 'libxcomposite1 (>= 1:0.4.4-1)', ++ 'libxdamage1 (>= 1:1.1)', ++ 'libxext6', ++ 'libxfixes3', ++ 'libxkbcommon0 (>= 0.4.1)', ++ 'libxkbfile1', ++ 'libxrandr2', ++ 'xdg-utils (>= 1.0.2)' + ] + }; + //# sourceMappingURL=dep-lists.js.map +\ No newline at end of file diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts -index 3d6c2eba6e9..0856a0514bd 100644 +index 3d6c2eba6e9..b8987ea7579 100644 --- a/build/linux/debian/dep-lists.ts +++ b/build/linux/debian/dep-lists.ts @@ -140,5 +140,84 @@ export const referenceGeneratedDepsByArch = { 'libxkbfile1 (>= 1:1.1.0)', 'libxrandr2', 'xdg-utils (>= 1.0.2)' -- ] + ], -+ 'ppc64le': [ ++ 'ppc64el': [ + 'ca-certificates', + 'libasound2 (>= 1.0.17)', + 'libatk-bridge2.0-0 (>= 2.5.3)', @@ -251,49 +358,103 @@ index 3d6c2eba6e9..0856a0514bd 100644 + 'libxkbfile1', + 'libxrandr2', + 'xdg-utils (>= 1.0.2)' -+ ], + ] }; diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js -index feca7d3..59c1c6a 100644 +index feca7d3fa9d..f075ebcba75 100644 --- a/build/linux/debian/install-sysroot.js +++ b/build/linux/debian/install-sysroot.js -@@ -70,7 +70,9 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) { +@@ -70,7 +70,10 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) { const timeout = setTimeout(() => controller.abort(), 30 * 1000); const version = '20240129-253798'; try { - const response = await fetch(`https://github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, { -+ // If the assetName starts with 'powerpc64le', we fetch from VSCodium/vscode-linux-build-agent -+ const repo = options.assetName.startsWith('powerpc64le') ? 'VSCodium/vscode-linux-build-agent' : 'Microsoft/vscode-linux-build-agent'; -+ const response = await fetch(`https://github.com/repos/${repo}/releases/tags/v${version}`, { ++ // if VSCODE_SYSROOT_REPO and VSCODE_SYSROOT_VERSION are set, use those instead ++ const repo = process.env['VSCODE_SYSROOT_REPO'] ?? 'Microsoft/vscode-linux-build-agent'; ++ const actualVersion = process.env['VSCODE_SYSROOT_VERSION'] ?? version; ++ const response = await fetch(`https://github.com/repos/${repo}/releases/tags/v${actualVersion}`, { headers: ghApiHeaders, signal: controller.signal /* Typings issue with lib.dom.d.ts */ }); -@@ -79,7 +81,7 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) { +@@ -79,7 +82,7 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) { const contents = Buffer.from(await response.arrayBuffer()); const asset = JSON.parse(contents.toString()).assets.find((a) => a.name === options.assetName); if (!asset) { - throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`); -+ throw new Error(`Could not find asset in release of ${repo} @ ${version}`); ++ throw new Error(`Could not find asset in release of ${repo} @ ${actualVersion}`); } console.log(`Found asset ${options.assetName} @ ${asset.url}.`); const assetResponse = await fetch(asset.url, { -@@ -134,6 +136,14 @@ async function getVSCodeSysroot(arch) { +@@ -134,6 +137,14 @@ async function getVSCodeSysroot(arch) { expectedName = `arm-rpi-linux-gnueabihf${prefix}.tar.gz`; triple = 'arm-rpi-linux-gnueabihf'; break; -+ case 'ppc64le': ++ case 'ppc64le': ++ expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`; ++ triple = `powerpc64le-linux-gnu`; ++ break; ++ case 'riscv64': ++ expectedName = `riscv64-linux-gnu${prefix}.tar.gz`; ++ triple = 'riscv64-linux-gnu'; ++ break; + } + console.log(`Fetching ${expectedName} for ${triple}`); + const checksumSha256 = getVSCodeSysrootChecksum(expectedName); +diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts +index aa417dcc722..02b1cc4e057 100644 +--- a/build/linux/debian/install-sysroot.ts ++++ b/build/linux/debian/install-sysroot.ts +@@ -82,7 +82,10 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000) + const timeout = setTimeout(() => controller.abort(), 30 * 1000); + const version = '20240129-253798'; + try { +- const response = await fetch(`https://github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, { ++ // if VSCODE_SYSROOT_REPO and VSCODE_SYSROOT_VERSION are set, use those instead ++ const repo = process.env['VSCODE_SYSROOT_REPO'] ?? 'Microsoft/vscode-linux-build-agent'; ++ const actualVersion = process.env['VSCODE_SYSROOT_VERSION'] ?? version; ++ const response = await fetch(`https://github.com/repos/${repo}/releases/tags/v${actualVersion}`, { + headers: ghApiHeaders, + signal: controller.signal as any /* Typings issue with lib.dom.d.ts */ + }); +@@ -91,7 +94,7 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000) + const contents = Buffer.from(await response.arrayBuffer()); + const asset = JSON.parse(contents.toString()).assets.find((a: { name: string }) => a.name === options.assetName); + if (!asset) { +- throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`); ++ throw new Error(`Could not find asset in release of ${repo} @ ${actualVersion}`); + } + console.log(`Found asset ${options.assetName} @ ${asset.url}.`); + const assetResponse = await fetch(asset.url, { +@@ -151,6 +154,14 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise + expectedName = `arm-rpi-linux-gnueabihf${prefix}.tar.gz`; + triple = 'arm-rpi-linux-gnueabihf'; + break; ++ case 'ppc64el': + expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`; -+ triple = `powerpc64le-linux-gnu`; ++ triple = 'powerpc64le-linux-gnu' + break; + case 'riscv64': -+ expectedName = `DUMMY`; ++ expectedName = `riscv64-linux-gnu${prefix}.tar.gz`; + triple = 'riscv64-linux-gnu'; + break; - } - console.log(`Fetching ${expectedName} for ${triple}`); - const checksumSha256 = getVSCodeSysrootChecksum(expectedName); + } + console.log(`Fetching ${expectedName} for ${triple}`); + const checksumSha256 = getVSCodeSysrootChecksum(expectedName); +diff --git a/build/linux/debian/types.js b/build/linux/debian/types.js +index ce21d50e1a9..cadefc2aa4c 100644 +--- a/build/linux/debian/types.js ++++ b/build/linux/debian/types.js +@@ -6,6 +6,6 @@ + Object.defineProperty(exports, "__esModule", { value: true }); + exports.isDebianArchString = isDebianArchString; + function isDebianArchString(s) { +- return ['amd64', 'armhf', 'arm64'].includes(s); ++ return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s); + } + //# sourceMappingURL=types.js.map +\ No newline at end of file diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts -index e97485ef128..01b121bc928 100644 +index e97485ef128..24fe452f7fe 100644 --- a/build/linux/debian/types.ts +++ b/build/linux/debian/types.ts @@ -3,8 +3,8 @@ @@ -301,11 +462,261 @@ index e97485ef128..01b121bc928 100644 *--------------------------------------------------------------------------------------------*/ -export type DebianArchString = 'amd64' | 'armhf' | 'arm64'; -+export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64le' | 'riscv64'; ++export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el' | 'riscv64'; export function isDebianArchString(s: string): s is DebianArchString { - return ['amd64', 'armhf', 'arm64'].includes(s); -+ return ['amd64', 'armhf', 'arm64', 'ppc64le', 'riscv64'].includes(s); ++ return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s); + } +diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js +index bd84fc146dc..50b195e1a98 100644 +--- a/build/linux/rpm/dep-lists.js ++++ b/build/linux/rpm/dep-lists.js +@@ -310,6 +310,106 @@ exports.referenceGeneratedDepsByArch = { + 'rpmlib(FileDigests) <= 4.6.0-1', + 'rtld(GNU_HASH)', + 'xdg-utils' ++ ], ++ "ppc64le": [ ++ 'ca-certificates', ++ 'ld-linux-x86-64.so.2()(64bit)', ++ 'ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)', ++ 'ld64.so.2()(64bit)', ++ 'ld64.so.2(GLIBC_2.17)(64bit)', ++ 'libX11.so.6()(64bit)', ++ 'libXcomposite.so.1()(64bit)', ++ 'libXdamage.so.1()(64bit)', ++ 'libXext.so.6()(64bit)', ++ 'libXfixes.so.3()(64bit)', ++ 'libXrandr.so.2()(64bit)', ++ 'libasound.so.2()(64bit)', ++ 'libasound.so.2(ALSA_0.9)(64bit)', ++ 'libasound.so.2(ALSA_0.9.0rc4)(64bit)', ++ 'libatk-1.0.so.0()(64bit)', ++ 'libatk-bridge-2.0.so.0()(64bit)', ++ 'libatspi.so.0()(64bit)', ++ 'libc.so.6()(64bit)', ++ 'libc.so.6(GLIBC_2.14)(64bit)', ++ 'libc.so.6(GLIBC_2.17)(64bit)', ++ 'libc.so.6(GLIBC_2.2.5)(64bit)', ++ 'libc.so.6(GLIBC_2.28)(64bit)', ++ 'libc.so.6(GLIBC_2.4)(64bit)', ++ 'libc.so.6(GLIBC_2.9)(64bit)', ++ 'libcairo.so.2()(64bit)', ++ 'libcups.so.2()(64bit)', ++ 'libcurl.so.4()(64bit)', ++ 'libdbus-1.so.3()(64bit)', ++ 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', ++ 'libdl.so.2()(64bit)', ++ 'libdl.so.2(GLIBC_2.17)(64bit)', ++ 'libdrm.so.2()(64bit)', ++ 'libexpat.so.1()(64bit)', ++ 'libgbm.so.1()(64bit)', ++ 'libgcc_s.so.1()(64bit)', ++ 'libgcc_s.so.1(GCC_3.0)(64bit)', ++ 'libgcc_s.so.1(GCC_3.4.4)(64bit)', ++ 'libgio-2.0.so.0()(64bit)', ++ 'libglib-2.0.so.0()(64bit)', ++ 'libgobject-2.0.so.0()(64bit)', ++ 'libgssapi_krb5.so.2()(64bit)', ++ 'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)', ++ 'libgtk-3.so.0()(64bit)', ++ 'libkrb5.so.3()(64bit)', ++ 'libkrb5.so.3(krb5_3_MIT)(64bit)', ++ 'libm.so.6()(64bit)', ++ 'libm.so.6(GLIBC_2.17)(64bit)', ++ 'libm.so.6(GLIBC_2.2.5)(64bit)', ++ 'libm.so.6(GLIBC_2.27)(64bit)', ++ 'libnspr4.so()(64bit)', ++ 'libnss3.so()(64bit)', ++ 'libnss3.so(NSS_3.11)(64bit)', ++ 'libnss3.so(NSS_3.12)(64bit)', ++ 'libnss3.so(NSS_3.12.1)(64bit)', ++ 'libnss3.so(NSS_3.2)(64bit)', ++ 'libnss3.so(NSS_3.22)(64bit)', ++ 'libnss3.so(NSS_3.3)(64bit)', ++ 'libnss3.so(NSS_3.30)(64bit)', ++ 'libnss3.so(NSS_3.4)(64bit)', ++ 'libnss3.so(NSS_3.5)(64bit)', ++ 'libnss3.so(NSS_3.9.2)(64bit)', ++ 'libnssutil3.so()(64bit)', ++ 'libnssutil3.so(NSSUTIL_3.12.3)(64bit)', ++ 'libpango-1.0.so.0()(64bit)', ++ 'libpthread.so.0()(64bit)', ++ 'libpthread.so.0(GLIBC_2.17)(64bit)', ++ 'libpthread.so.0(GLIBC_2.2.5)(64bit)', ++ 'libpthread.so.0(GLIBC_2.3.2)(64bit)', ++ 'libpthread.so.0(GLIBC_2.3.3)(64bit)', ++ 'libsmime3.so()(64bit)', ++ 'libsmime3.so(NSS_3.10)(64bit)', ++ 'libsmime3.so(NSS_3.2)(64bit)', ++ 'libssl3.so(NSS_3.28)(64bit)', ++ 'libstdc++.so.6()(64bit)', ++ 'libstdc++.so.6(CXXABI_1.3)(64bit)', ++ 'libstdc++.so.6(CXXABI_1.3.5)(64bit)', ++ 'libstdc++.so.6(CXXABI_1.3.8)(64bit)', ++ 'libstdc++.so.6(CXXABI_1.3.9)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.11)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.14)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.15)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.18)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.19)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.20)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.21)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)', ++ 'libutil.so.1()(64bit)', ++ 'libutil.so.1(GLIBC_2.2.5)(64bit)', ++ 'libxcb.so.1()(64bit)', ++ 'libxkbcommon.so.0()(64bit)', ++ 'libxkbcommon.so.0(V_0.5.0)(64bit)', ++ 'libxkbfile.so.1()(64bit)', ++ 'rpmlib(FileDigests) <= 4.6.0-1', ++ 'rtld(GNU_HASH)', ++ 'xdg-utils' + ] + }; + //# sourceMappingURL=dep-lists.js.map +\ No newline at end of file +diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts +index 82a4fe7698d..1ba4c5848e3 100644 +--- a/build/linux/rpm/dep-lists.ts ++++ b/build/linux/rpm/dep-lists.ts +@@ -309,5 +309,105 @@ export const referenceGeneratedDepsByArch = { + 'rpmlib(FileDigests) <= 4.6.0-1', + 'rtld(GNU_HASH)', + 'xdg-utils' ++ ], ++ "ppc64le": [ ++ 'ca-certificates', ++ 'ld-linux-x86-64.so.2()(64bit)', ++ 'ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)', ++ 'ld64.so.2()(64bit)', ++ 'ld64.so.2(GLIBC_2.17)(64bit)', ++ 'libX11.so.6()(64bit)', ++ 'libXcomposite.so.1()(64bit)', ++ 'libXdamage.so.1()(64bit)', ++ 'libXext.so.6()(64bit)', ++ 'libXfixes.so.3()(64bit)', ++ 'libXrandr.so.2()(64bit)', ++ 'libasound.so.2()(64bit)', ++ 'libasound.so.2(ALSA_0.9)(64bit)', ++ 'libasound.so.2(ALSA_0.9.0rc4)(64bit)', ++ 'libatk-1.0.so.0()(64bit)', ++ 'libatk-bridge-2.0.so.0()(64bit)', ++ 'libatspi.so.0()(64bit)', ++ 'libc.so.6()(64bit)', ++ 'libc.so.6(GLIBC_2.14)(64bit)', ++ 'libc.so.6(GLIBC_2.17)(64bit)', ++ 'libc.so.6(GLIBC_2.2.5)(64bit)', ++ 'libc.so.6(GLIBC_2.28)(64bit)', ++ 'libc.so.6(GLIBC_2.4)(64bit)', ++ 'libc.so.6(GLIBC_2.9)(64bit)', ++ 'libcairo.so.2()(64bit)', ++ 'libcups.so.2()(64bit)', ++ 'libcurl.so.4()(64bit)', ++ 'libdbus-1.so.3()(64bit)', ++ 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', ++ 'libdl.so.2()(64bit)', ++ 'libdl.so.2(GLIBC_2.17)(64bit)', ++ 'libdrm.so.2()(64bit)', ++ 'libexpat.so.1()(64bit)', ++ 'libgbm.so.1()(64bit)', ++ 'libgcc_s.so.1()(64bit)', ++ 'libgcc_s.so.1(GCC_3.0)(64bit)', ++ 'libgcc_s.so.1(GCC_3.4.4)(64bit)', ++ 'libgio-2.0.so.0()(64bit)', ++ 'libglib-2.0.so.0()(64bit)', ++ 'libgobject-2.0.so.0()(64bit)', ++ 'libgssapi_krb5.so.2()(64bit)', ++ 'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)', ++ 'libgtk-3.so.0()(64bit)', ++ 'libkrb5.so.3()(64bit)', ++ 'libkrb5.so.3(krb5_3_MIT)(64bit)', ++ 'libm.so.6()(64bit)', ++ 'libm.so.6(GLIBC_2.17)(64bit)', ++ 'libm.so.6(GLIBC_2.2.5)(64bit)', ++ 'libm.so.6(GLIBC_2.27)(64bit)', ++ 'libnspr4.so()(64bit)', ++ 'libnss3.so()(64bit)', ++ 'libnss3.so(NSS_3.11)(64bit)', ++ 'libnss3.so(NSS_3.12)(64bit)', ++ 'libnss3.so(NSS_3.12.1)(64bit)', ++ 'libnss3.so(NSS_3.2)(64bit)', ++ 'libnss3.so(NSS_3.22)(64bit)', ++ 'libnss3.so(NSS_3.3)(64bit)', ++ 'libnss3.so(NSS_3.30)(64bit)', ++ 'libnss3.so(NSS_3.4)(64bit)', ++ 'libnss3.so(NSS_3.5)(64bit)', ++ 'libnss3.so(NSS_3.9.2)(64bit)', ++ 'libnssutil3.so()(64bit)', ++ 'libnssutil3.so(NSSUTIL_3.12.3)(64bit)', ++ 'libpango-1.0.so.0()(64bit)', ++ 'libpthread.so.0()(64bit)', ++ 'libpthread.so.0(GLIBC_2.17)(64bit)', ++ 'libpthread.so.0(GLIBC_2.2.5)(64bit)', ++ 'libpthread.so.0(GLIBC_2.3.2)(64bit)', ++ 'libpthread.so.0(GLIBC_2.3.3)(64bit)', ++ 'libsmime3.so()(64bit)', ++ 'libsmime3.so(NSS_3.10)(64bit)', ++ 'libsmime3.so(NSS_3.2)(64bit)', ++ 'libssl3.so(NSS_3.28)(64bit)', ++ 'libstdc++.so.6()(64bit)', ++ 'libstdc++.so.6(CXXABI_1.3)(64bit)', ++ 'libstdc++.so.6(CXXABI_1.3.5)(64bit)', ++ 'libstdc++.so.6(CXXABI_1.3.8)(64bit)', ++ 'libstdc++.so.6(CXXABI_1.3.9)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.11)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.14)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.15)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.18)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.19)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.20)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.21)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)', ++ 'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)', ++ 'libutil.so.1()(64bit)', ++ 'libutil.so.1(GLIBC_2.2.5)(64bit)', ++ 'libxcb.so.1()(64bit)', ++ 'libxkbcommon.so.0()(64bit)', ++ 'libxkbcommon.so.0(V_0.5.0)(64bit)', ++ 'libxkbfile.so.1()(64bit)', ++ 'rpmlib(FileDigests) <= 4.6.0-1', ++ 'rtld(GNU_HASH)', ++ 'xdg-utils' + ] + }; +diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js +index a20b9c2fe02..99a8cff7856 100644 +--- a/build/linux/rpm/types.js ++++ b/build/linux/rpm/types.js +@@ -6,6 +6,6 @@ + Object.defineProperty(exports, "__esModule", { value: true }); + exports.isRpmArchString = isRpmArchString; + function isRpmArchString(s) { +- return ['x86_64', 'armv7hl', 'aarch64'].includes(s); ++ return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s); + } + //# sourceMappingURL=types.js.map +\ No newline at end of file +diff --git a/build/linux/rpm/types.ts b/build/linux/rpm/types.ts +index c6a01da1cf5..d94537e0c49 100644 +--- a/build/linux/rpm/types.ts ++++ b/build/linux/rpm/types.ts +@@ -3,8 +3,8 @@ + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +-export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64'; ++export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le' | 'riscv64'; + + export function isRpmArchString(s: string): s is RpmArchString { +- return ['x86_64', 'armv7hl', 'aarch64'].includes(s); ++ return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s); } diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs index 4bec13d6e86..3debda1224a 100644 @@ -372,10 +783,10 @@ index 4bec13d6e86..3debda1224a 100644 Platform::DarwinARM64 => "DarwinARM64", Platform::WindowsX64 => "WindowsX64", diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs -index 20a5bc94b37..50678354245 100644 +index 5d4953acbb2..f22ff60e391 100644 --- a/cli/src/util/prereqs.rs +++ b/cli/src/util/prereqs.rs -@@ -73,6 +73,10 @@ impl PreReqChecker { +@@ -74,6 +74,10 @@ impl PreReqChecker { Platform::LinuxX64 } else if cfg!(target_arch = "arm") { Platform::LinuxARM32 @@ -386,7 +797,7 @@ index 20a5bc94b37..50678354245 100644 } else { Platform::LinuxARM64 }); -@@ -82,6 +86,8 @@ impl PreReqChecker { +@@ -83,6 +87,8 @@ impl PreReqChecker { Platform::LinuxX64Legacy } else if cfg!(target_arch = "arm") { Platform::LinuxARM32Legacy @@ -409,14 +820,14 @@ index 079557869e3..c057746b870 100644 if [ "$OS_ID" != "alpine" ]; then diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts -index 9dae82eba07..94246285b26 100644 +index 665ea2e18df..d23ba6c8a76 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts @@ -33,6 +33,8 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) { case TargetPlatform.LINUX_X64: return 'Linux 64 bit'; case TargetPlatform.LINUX_ARM64: return 'Linux ARM 64'; case TargetPlatform.LINUX_ARMHF: return 'Linux ARM'; -+ case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC'; ++ case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC64'; + case TargetPlatform.LINUX_RISCV64: return 'Linux RISC-V 64'; case TargetPlatform.ALPINE_X64: return 'Alpine Linux 64 bit'; @@ -444,10 +855,10 @@ index 9dae82eba07..94246285b26 100644 case 'alpine': diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts -index 331aba1b55f..cade78e6557 100644 +index cfe5313b905..fe14a21f0e8 100644 --- a/src/vs/platform/extensions/common/extensions.ts +++ b/src/vs/platform/extensions/common/extensions.ts -@@ -303,6 +303,8 @@ export const enum TargetPlatform { +@@ -304,6 +304,8 @@ export const enum TargetPlatform { LINUX_X64 = 'linux-x64', LINUX_ARM64 = 'linux-arm64', LINUX_ARMHF = 'linux-armhf', diff --git a/update_version.sh b/update_version.sh index f694274f7d7..481cc146e18 100755 --- a/update_version.sh +++ b/update_version.sh @@ -23,7 +23,7 @@ if [[ -z "${BUILD_SOURCEVERSION}" ]]; then fi if [[ "${VSCODE_ARCH}" == "ppc64le" ]] || [[ "${VSCODE_ARCH}" == "riscv64" ]] ; then - echo "Skip ppc64le since only reh is published" + echo "Skip PPC64LE since only reh is published" exit 0 fi