123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734 |
- diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
- index 949b5f3..30093d6 100755
- --- a/build/azure-pipelines/linux/setup-env.sh
- +++ b/build/azure-pipelines/linux/setup-env.sh
- @@ -9,2 +9,6 @@ fi
-
- +if [ "$npm_config_arch" == "riscv64" ]; then
- + exit 0
- +fi
- +
- export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots
- @@ -67,2 +71,16 @@ elif [ "$npm_config_arch" == "arm" ]; then
- export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
- +elif [ "$npm_config_arch" == "ppc64" ]; then
- + if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then
- + # Set compiler toolchain for client native modules
- + export CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
- + export CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
- + export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
- + export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
- +
- + # Set compiler toolchain for remote server
- + export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
- + export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
- + export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
- + export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
- + fi
- fi
- diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
- index 19482c2..f49d910 100755
- --- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
- +++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
- @@ -9,2 +9,4 @@ elif [ "$VSCODE_ARCH" == "armhf" ]; then
- TRIPLE="arm-rpi-linux-gnueabihf"
- +elif [ "$VSCODE_ARCH" == "ppc64le" ]; then
- + TRIPLE="powerpc64le-linux-gnu"
- fi
- diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
- index 0b5f38c..9f3b02b 100644
- --- a/build/checksums/vscode-sysroot.txt
- +++ b/build/checksums/vscode-sysroot.txt
- @@ -6 +6,2 @@
- dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784 x86_64-linux-gnu-glibc-2.28.tar.gz
- +fa8176d27be18bb0eeb7f55b0fa22255050b430ef68c29136599f02976eb0b1b powerpc64le-linux-gnu-glibc-2.28.tar.gz
- diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
- index 7d58861..f14984f 100644
- --- a/build/gulpfile.reh.js
- +++ b/build/gulpfile.reh.js
- @@ -48,2 +48,4 @@ const BUILD_TARGETS = [
- { platform: 'linux', arch: 'arm64' },
- + { platform: 'linux', arch: 'ppc64le' },
- + { platform: 'linux', arch: 'riscv64' },
- { platform: 'alpine', arch: 'arm64' },
- @@ -217,2 +219,10 @@ function nodejs(platform, arch) {
- case 'linux':
- + if (arch === 'riscv64') {
- + return fetchUrls(`/download/release/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`,
- + { base: 'https://unofficial-builds.nodejs.org', checksumSha256 }).pipe(flatmap(stream => stream.pipe(gunzip()).pipe
- + (untar())))
- + .pipe(filter('**/node'))
- + .pipe(util.setExecutableBit('**'))
- + .pipe(rename('node'));
- + }
- return (product.nodejsRepository !== 'https://nodejs.org' ?
- diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
- index 6f8144b..8a8195e 100644
- --- a/build/gulpfile.scan.js
- +++ b/build/gulpfile.scan.js
- @@ -26,2 +26,4 @@ const BUILD_TARGETS = [
- { platform: 'linux', arch: 'arm64' },
- + { platform: 'linux', arch: 'ppc64le' },
- + { platform: 'linux', arch: 'riscv64' },
- ];
- diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
- index 4af4067..1f99344 100644
- --- a/build/gulpfile.vscode.js
- +++ b/build/gulpfile.vscode.js
- @@ -350,2 +350,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
-
- + const electronOverride = {};
- + if (process.env.VSCODE_ELECTRON_REPO) {
- + // electron doesn't support riscv64 and ppc64le, override the repo with `VSCODE_ELECTRON_REPO`.
- + electronOverride.repo = process.env.VSCODE_ELECTRON_REPO;
- + }
- +
- + if (process.env.VSCODE_ELECTRON_TAG) {
- + electronOverride.tag = process.env.VSCODE_ELECTRON_TAG;
- + }
- +
- let result = all
- @@ -354,3 +364,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- .pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
- - .pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
- + .pipe(electron({ ...config, ...electronOverride, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
- .pipe(filter(['**', '!LICENSE', '!version'], { dot: true }));
- @@ -449,2 +459,4 @@ const BUILD_TARGETS = [
- { platform: 'linux', arch: 'arm64' },
- + { platform: 'linux', arch: 'ppc64le' },
- + { platform: 'linux', arch: 'riscv64' },
- ];
- diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
- index 28ddfb0..cb3169c 100644
- --- a/build/gulpfile.vscode.linux.js
- +++ b/build/gulpfile.vscode.linux.js
- @@ -33,3 +33,3 @@ const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
- function getDebPackageArch(arch) {
- - return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch];
- + return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el', riscv64: 'riscv64' }[arch];
- }
- @@ -141,3 +141,3 @@ function getRpmBuildPath(rpmArch) {
- function getRpmPackageArch(arch) {
- - return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64' }[arch];
- + return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch];
- }
- @@ -301,2 +301,4 @@ const BUILD_TARGETS = [
- { arch: 'arm64' },
- + { arch: 'ppc64le' },
- + { arch: 'riscv64' },
- ];
- diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js
- index bbcb6bf..d00158f 100644
- --- a/build/linux/debian/calculate-deps.js
- +++ b/build/linux/debian/calculate-deps.js
- @@ -51,2 +51,8 @@ function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot)
- 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;
- }
- diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
- index 92f8065..b86b4db 100644
- --- a/build/linux/debian/calculate-deps.ts
- +++ b/build/linux/debian/calculate-deps.ts
- @@ -61,2 +61,14 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
- 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;
- }
- diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
- index 3a642a7..91daf09 100644
- --- a/build/linux/debian/dep-lists.js
- +++ b/build/linux/debian/dep-lists.js
- @@ -144,2 +144,81 @@ exports.referenceGeneratedDepsByArch = {
- '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)'
- ]
- diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
- index 86d1de1..ab0e268 100644
- --- a/build/linux/debian/dep-lists.ts
- +++ b/build/linux/debian/dep-lists.ts
- @@ -144,2 +144,81 @@ export const referenceGeneratedDepsByArch = {
- '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)'
- ]
- diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
- index feca7d3..f075ebc 100644
- --- a/build/linux/debian/install-sysroot.js
- +++ b/build/linux/debian/install-sysroot.js
- @@ -72,3 +72,6 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
- try {
- - const response = await fetch(`https://api.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://api.github.com/repos/${repo}/releases/tags/v${actualVersion}`, {
- headers: ghApiHeaders,
- @@ -81,3 +84,3 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
- 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}`);
- }
- @@ -136,2 +139,10 @@ async function getVSCodeSysroot(arch) {
- break;
- + 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;
- }
- diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
- index aa417dc..58f0eee 100644
- --- a/build/linux/debian/install-sysroot.ts
- +++ b/build/linux/debian/install-sysroot.ts
- @@ -84,3 +84,6 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
- try {
- - const response = await fetch(`https://api.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://api.github.com/repos/${repo}/releases/tags/v${actualVersion}`, {
- headers: ghApiHeaders,
- @@ -93,3 +96,3 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
- 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}`);
- }
- @@ -153,2 +156,10 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string>
- break;
- + case 'ppc64el':
- + 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;
- }
- diff --git a/build/linux/debian/types.js b/build/linux/debian/types.js
- index ce21d50..cadefc2 100644
- --- a/build/linux/debian/types.js
- +++ b/build/linux/debian/types.js
- @@ -8,3 +8,3 @@ exports.isDebianArchString = isDebianArchString;
- function isDebianArchString(s) {
- - return ['amd64', 'armhf', 'arm64'].includes(s);
- + return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s);
- }
- diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts
- index e97485e..24fe452 100644
- --- a/build/linux/debian/types.ts
- +++ b/build/linux/debian/types.ts
- @@ -5,6 +5,6 @@
-
- -export type DebianArchString = 'amd64' | 'armhf' | 'arm64';
- +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', 'ppc64el', 'riscv64'].includes(s);
- }
- diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
- index 9798451..bd246e7 100644
- --- a/build/linux/rpm/dep-lists.js
- +++ b/build/linux/rpm/dep-lists.js
- @@ -321,2 +321,102 @@ exports.referenceGeneratedDepsByArch = {
- '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/dep-lists.ts b/build/linux/rpm/dep-lists.ts
- index b798127..c3f5308 100644
- --- a/build/linux/rpm/dep-lists.ts
- +++ b/build/linux/rpm/dep-lists.ts
- @@ -320,2 +320,102 @@ export const referenceGeneratedDepsByArch = {
- '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 a20b9c2..99a8cff 100644
- --- a/build/linux/rpm/types.js
- +++ b/build/linux/rpm/types.js
- @@ -8,3 +8,3 @@ exports.isRpmArchString = isRpmArchString;
- function isRpmArchString(s) {
- - return ['x86_64', 'armv7hl', 'aarch64'].includes(s);
- + return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s);
- }
- diff --git a/build/linux/rpm/types.ts b/build/linux/rpm/types.ts
- index c6a01da..d94537e 100644
- --- a/build/linux/rpm/types.ts
- +++ b/build/linux/rpm/types.ts
- @@ -5,6 +5,6 @@
-
- -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 4bec13d..3debda1 100644
- --- a/cli/src/update_service.rs
- +++ b/cli/src/update_service.rs
- @@ -216,2 +216,5 @@ pub enum Platform {
- LinuxARM32Legacy,
- + LinuxPPC64LE,
- + LinuxPPC64LELegacy,
- + LinuxRISCV64,
- DarwinX64,
- @@ -229,2 +232,4 @@ impl Platform {
- Platform::LinuxARM32 => Some("linux-armhf".to_owned()),
- + Platform::LinuxPPC64LE => Some("linux-ppc64le".to_owned()),
- + Platform::LinuxRISCV64 => Some("linux-riscv64".to_owned()),
- Platform::DarwinX64 => Some("darwin".to_owned()),
- @@ -247,2 +252,5 @@ impl Platform {
- Platform::LinuxARM32Legacy => "server-linux-legacy-armhf",
- + Platform::LinuxPPC64LE => "server-linux-ppc64le",
- + Platform::LinuxPPC64LELegacy => "server-linux-legacy-ppc64le",
- + Platform::LinuxRISCV64 => "server-linux-riscv64",
- Platform::DarwinX64 => "server-darwin",
- @@ -266,2 +274,5 @@ impl Platform {
- Platform::LinuxARM32Legacy => "cli-linux-armhf",
- + Platform::LinuxPPC64LE => "cli-linux-ppc64le",
- + Platform::LinuxPPC64LELegacy => "cli-linux-ppc64le",
- + Platform::LinuxRISCV64 => "cli-linux-riscv64",
- Platform::DarwinX64 => "cli-darwin-x64",
- @@ -298,2 +309,6 @@ impl Platform {
- Some(Platform::LinuxARM64)
- + } else if cfg!(all(target_os = "linux", target_arch = "ppc64le")) {
- + Some(Platform::LinuxPPC64LE)
- + } else if cfg!(all(target_os = "linux", target_arch = "riscv64")) {
- + Some(Platform::LinuxRISCV64)
- } else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
- @@ -325,2 +340,5 @@ impl fmt::Display for Platform {
- Platform::LinuxARM32Legacy => "LinuxARM32Legacy",
- + Platform::LinuxPPC64LE => "LinuxPPC64LE",
- + Platform::LinuxPPC64LELegacy => "LinuxPPC64LELegacy",
- + Platform::LinuxRISCV64 => "LinuxRISCV64",
- Platform::DarwinX64 => "DarwinX64",
- diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
- index 0f49ab2..d873a49 100644
- --- a/cli/src/util/prereqs.rs
- +++ b/cli/src/util/prereqs.rs
- @@ -86,2 +86,6 @@ impl PreReqChecker {
- Platform::LinuxARM32
- + } else if cfg!(target_arch = "ppc64le") {
- + Platform::LinuxPPC64LE
- + } else if cfg!(target_arch = "riscv64") {
- + Platform::LinuxRISCV64
- } else {
- @@ -95,2 +99,4 @@ impl PreReqChecker {
- Platform::LinuxARM32Legacy
- + } else if cfg!(target_arch = "ppc64le") {
- + Platform::LinuxPPC64LELegacy
- } else {
- diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
- index 31a618f..dc457e0 100644
- --- a/resources/server/bin/helpers/check-requirements-linux.sh
- +++ b/resources/server/bin/helpers/check-requirements-linux.sh
- @@ -56,2 +56,4 @@ case $ARCH in
- ;;
- + ppc64el) LDCONFIG_ARCH="64bit";;
- + riscv64) LDCONFIG_ARCH="RISC-V";;
- esac
- diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
- index 1dcc4c7..54a7f36 100644
- --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
- +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
- @@ -41,2 +41,4 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
- case TargetPlatform.LINUX_ARMHF: return 'Linux ARM';
- + case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC64';
- + case TargetPlatform.LINUX_RISCV64: return 'Linux RISC-V 64';
-
- @@ -64,2 +66,4 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
- case TargetPlatform.LINUX_ARMHF: return TargetPlatform.LINUX_ARMHF;
- + case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE;
- + case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64;
-
- @@ -99,2 +103,8 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
- }
- + if (arch === 'ppc64le') {
- + return TargetPlatform.LINUX_PPC64LE;
- + }
- + if (arch === 'riscv64') {
- + return TargetPlatform.LINUX_RISCV64;
- + }
- return TargetPlatform.UNKNOWN;
- diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
- index 822260b..fc11650 100644
- --- a/src/vs/platform/extensions/common/extensions.ts
- +++ b/src/vs/platform/extensions/common/extensions.ts
- @@ -294,2 +294,4 @@ export const enum TargetPlatform {
- LINUX_ARMHF = 'linux-armhf',
- + LINUX_PPC64LE = 'linux-ppc64le',
- + LINUX_RISCV64 = 'linux-riscv64',
-
|