|
|
@@ -1,21 +1,15 @@
|
|
|
diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
|
|
|
-index 9bfbf9ab41a..3064f783d8c 100755
|
|
|
+index 9bfbf9a..3064f78 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
|
|
|
- SYSROOT_ARCH="amd64"
|
|
|
- fi
|
|
|
+@@ -9,2 +9,6 @@ fi
|
|
|
|
|
|
+if [ "$npm_config_arch" == "riscv64" ]; then
|
|
|
+ exit 0
|
|
|
+fi
|
|
|
+
|
|
|
export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots
|
|
|
- SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
|
|
|
-
|
|
|
-@@ -67,4 +71,19 @@ elif [ "$npm_config_arch" == "arm" ]; then
|
|
|
- export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
|
|
|
- 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"
|
|
|
+@@ -69,2 +73,17 @@ elif [ "$npm_config_arch" == "arm" ]; then
|
|
|
fi
|
|
|
+elif [ "$npm_config_arch" == "ppc64" ]; then
|
|
|
+ if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then
|
|
|
@@ -34,43 +28,31 @@ index 9bfbf9ab41a..3064f783d8c 100755
|
|
|
+
|
|
|
fi
|
|
|
diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
|
|
|
-index f07c0ba71b0..1cb257b33ec 100755
|
|
|
+index 19482c2..f49d910 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
|
|
|
- TRIPLE="aarch64-linux-gnu"
|
|
|
- elif [ "$VSCODE_ARCH" == "armhf" ]; then
|
|
|
+@@ -9,2 +9,4 @@ elif [ "$VSCODE_ARCH" == "armhf" ]; then
|
|
|
TRIPLE="arm-rpi-linux-gnueabihf"
|
|
|
+elif [ "$VSCODE_ARCH" == "ppc64le" ]; then
|
|
|
+ TRIPLE="powerpc64le-linux-gnu"
|
|
|
fi
|
|
|
-
|
|
|
- # 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..9f3b02beee3 100644
|
|
|
+index 0b5f38c..9f3b02b 100644
|
|
|
--- a/build/checksums/vscode-sysroot.txt
|
|
|
+++ b/build/checksums/vscode-sysroot.txt
|
|
|
-@@ -4,3 +4,4 @@
|
|
|
- 7aea163f7fad8cc50000c86b5108be880121d35e2f55d016ef8c96bbe54129eb arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz
|
|
|
- 5aae21115f1d284c3cdf32c83db15771b59bc80793f1423032abf5a823c0d658 x86_64-linux-gnu-glibc-2.17.tar.gz
|
|
|
+@@ -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 c2b81d0cf7c..fa5de83a076 100644
|
|
|
+index a6cfbe5..96840f2 100644
|
|
|
--- a/build/gulpfile.reh.js
|
|
|
+++ b/build/gulpfile.reh.js
|
|
|
-@@ -44,6 +44,8 @@ const BUILD_TARGETS = [
|
|
|
- { platform: 'linux', arch: 'x64' },
|
|
|
- { platform: 'linux', arch: 'armhf' },
|
|
|
+@@ -46,2 +46,4 @@ const BUILD_TARGETS = [
|
|
|
{ platform: 'linux', arch: 'arm64' },
|
|
|
+ { platform: 'linux', arch: 'ppc64le' },
|
|
|
+ { platform: 'linux', arch: 'riscv64' },
|
|
|
{ platform: 'alpine', arch: 'arm64' },
|
|
|
- // legacy: we use to ship only one alpine so it was put in the arch, but now we ship
|
|
|
- // multiple alpine images and moved to a better model (alpine as the platform)
|
|
|
-@@ -210,6 +212,14 @@ function nodejs(platform, arch) {
|
|
|
- .pipe(rename('node.exe'));
|
|
|
- case 'darwin':
|
|
|
+@@ -213,2 +215,10 @@ function nodejs(platform, arch) {
|
|
|
case 'linux':
|
|
|
+ if (arch === 'riscv64') {
|
|
|
+ return fetchUrls(`/download/release/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`,
|
|
|
@@ -81,28 +63,20 @@ index c2b81d0cf7c..fa5de83a076 100644
|
|
|
+ .pipe(rename('node'));
|
|
|
+ }
|
|
|
return (product.nodejsRepository !== 'https://nodejs.org' ?
|
|
|
- fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}${glibcPrefix}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
|
|
|
- fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
|
|
|
diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
|
|
|
-index 6f8144b0954..8a8195e9b66 100644
|
|
|
+index 6f8144b..8a8195e 100644
|
|
|
--- a/build/gulpfile.scan.js
|
|
|
+++ b/build/gulpfile.scan.js
|
|
|
-@@ -24,6 +24,8 @@ const BUILD_TARGETS = [
|
|
|
- { platform: 'linux', arch: 'x64' },
|
|
|
- { platform: 'linux', arch: 'armhf' },
|
|
|
+@@ -26,2 +26,4 @@ const BUILD_TARGETS = [
|
|
|
{ platform: 'linux', arch: 'arm64' },
|
|
|
+ { platform: 'linux', arch: 'ppc64le' },
|
|
|
+ { platform: 'linux', arch: 'riscv64' },
|
|
|
];
|
|
|
-
|
|
|
- BUILD_TARGETS.forEach(buildTarget => {
|
|
|
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
|
|
|
-index 3b1aeafd080..8363dae382c 100644
|
|
|
+index c6202c7..d68bd8c 100644
|
|
|
--- a/build/gulpfile.vscode.js
|
|
|
+++ b/build/gulpfile.vscode.js
|
|
|
-@@ -339,11 +339,21 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
|
|
|
- all = es.merge(all, shortcut);
|
|
|
- }
|
|
|
+@@ -341,2 +341,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
|
|
|
|
|
|
+ const electronOverride = {};
|
|
|
+ if (process.env.VSCODE_ELECTRON_REPO) {
|
|
|
@@ -115,61 +89,40 @@ index 3b1aeafd080..8363dae382c 100644
|
|
|
+ }
|
|
|
+
|
|
|
let result = all
|
|
|
- .pipe(util.skipDirectories())
|
|
|
- .pipe(util.fixWin32DirectoryPermissions())
|
|
|
+@@ -345,3 +355,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 }));
|
|
|
-
|
|
|
- if (platform === 'linux') {
|
|
|
-@@ -432,6 +442,8 @@ const BUILD_TARGETS = [
|
|
|
- { platform: 'linux', arch: 'x64' },
|
|
|
- { platform: 'linux', arch: 'armhf' },
|
|
|
+@@ -434,2 +444,4 @@ const BUILD_TARGETS = [
|
|
|
{ platform: 'linux', arch: 'arm64' },
|
|
|
+ { platform: 'linux', arch: 'ppc64le' },
|
|
|
+ { platform: 'linux', arch: 'riscv64' },
|
|
|
];
|
|
|
- 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..2ddc1226f49 100644
|
|
|
+index 28ddfb0..cb3169c 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);
|
|
|
- * @param {string} arch
|
|
|
- */
|
|
|
+@@ -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];
|
|
|
}
|
|
|
-
|
|
|
- function prepareDebPackage(arch) {
|
|
|
-@@ -134,7 +134,7 @@ function getRpmBuildPath(rpmArch) {
|
|
|
- * @param {string} 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];
|
|
|
}
|
|
|
-
|
|
|
- /**
|
|
|
-@@ -295,6 +295,8 @@ const BUILD_TARGETS = [
|
|
|
- { arch: 'x64' },
|
|
|
- { arch: 'armhf' },
|
|
|
+@@ -301,2 +301,4 @@ const BUILD_TARGETS = [
|
|
|
{ arch: 'arm64' },
|
|
|
+ { arch: 'ppc64le' },
|
|
|
+ { arch: 'riscv64' },
|
|
|
];
|
|
|
-
|
|
|
- BUILD_TARGETS.forEach(({ arch }) => {
|
|
|
diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js
|
|
|
-index bbcb6bfc3de..d00158f3de4 100644
|
|
|
+index bbcb6bf..d00158f 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`);
|
|
|
+@@ -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`);
|
|
|
@@ -178,15 +131,11 @@ index bbcb6bfc3de..d00158f3de4 100644
|
|
|
+ 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..b86b4dba2b8 100644
|
|
|
+index 92f8065..b86b4db 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`);
|
|
|
+@@ -61,2 +61,14 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
|
|
|
break;
|
|
|
+ case 'ppc64el':
|
|
|
+ cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`,
|
|
|
@@ -201,15 +150,11 @@ index 92f8065f262..b86b4dba2b8 100644
|
|
|
+ `-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/dep-lists.js b/build/linux/debian/dep-lists.js
|
|
|
-index d843c090063..3b869cbbe6d 100644
|
|
|
+index d843c09..3b869cb 100644
|
|
|
--- a/build/linux/debian/dep-lists.js
|
|
|
+++ b/build/linux/debian/dep-lists.js
|
|
|
-@@ -139,6 +139,85 @@ exports.referenceGeneratedDepsByArch = {
|
|
|
- 'libxkbfile1 (>= 1:1.1.0)',
|
|
|
- 'libxrandr2',
|
|
|
+@@ -141,2 +141,81 @@ exports.referenceGeneratedDepsByArch = {
|
|
|
'xdg-utils (>= 1.0.2)'
|
|
|
+ ],
|
|
|
+ 'ppc64el': [
|
|
|
@@ -291,16 +236,11 @@ index d843c090063..3b869cbbe6d 100644
|
|
|
+ '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 4028370cd02..ff4df2f08cb 100644
|
|
|
+index 4028370..ff4df2f 100644
|
|
|
--- a/build/linux/debian/dep-lists.ts
|
|
|
+++ b/build/linux/debian/dep-lists.ts
|
|
|
-@@ -139,5 +139,84 @@ export const referenceGeneratedDepsByArch = {
|
|
|
- 'libxkbfile1 (>= 1:1.1.0)',
|
|
|
- 'libxrandr2',
|
|
|
+@@ -141,2 +141,81 @@ export const referenceGeneratedDepsByArch = {
|
|
|
'xdg-utils (>= 1.0.2)'
|
|
|
+ ],
|
|
|
+ 'ppc64el': [
|
|
|
@@ -382,14 +322,11 @@ index 4028370cd02..ff4df2f08cb 100644
|
|
|
+ 'libxrandr2',
|
|
|
+ 'xdg-utils (>= 1.0.2)'
|
|
|
]
|
|
|
- };
|
|
|
diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
|
|
|
-index feca7d3fa9d..f075ebcba75 100644
|
|
|
+index feca7d3..f075ebc 100644
|
|
|
--- a/build/linux/debian/install-sysroot.js
|
|
|
+++ b/build/linux/debian/install-sysroot.js
|
|
|
-@@ -70,7 +70,10 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
|
|
|
- const timeout = setTimeout(() => controller.abort(), 30 * 1000);
|
|
|
- const version = '20240129-253798';
|
|
|
+@@ -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
|
|
|
@@ -397,20 +334,12 @@ index feca7d3fa9d..f075ebcba75 100644
|
|
|
+ const actualVersion = process.env['VSCODE_SYSROOT_VERSION'] ?? version;
|
|
|
+ const response = await fetch(`https://api.github.com/repos/${repo}/releases/tags/v${actualVersion}`, {
|
|
|
headers: ghApiHeaders,
|
|
|
- signal: controller.signal /* Typings issue with lib.dom.d.ts */
|
|
|
- });
|
|
|
-@@ -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);
|
|
|
+@@ -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}`);
|
|
|
}
|
|
|
- console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
|
|
|
- const assetResponse = await fetch(asset.url, {
|
|
|
-@@ -134,6 +137,14 @@ async function getVSCodeSysroot(arch) {
|
|
|
- expectedName = `arm-rpi-linux-gnueabihf${prefix}.tar.gz`;
|
|
|
- triple = 'arm-rpi-linux-gnueabihf';
|
|
|
+@@ -136,2 +139,10 @@ async function getVSCodeSysroot(arch) {
|
|
|
break;
|
|
|
+ case 'ppc64le':
|
|
|
+ expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`;
|
|
|
@@ -421,15 +350,11 @@ index feca7d3fa9d..f075ebcba75 100644
|
|
|
+ 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..58f0eeefeff 100644
|
|
|
+index aa417dc..58f0eee 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';
|
|
|
+@@ -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
|
|
|
@@ -437,20 +362,12 @@ index aa417dcc722..58f0eeefeff 100644
|
|
|
+ const actualVersion = process.env['VSCODE_SYSROOT_VERSION'] ?? version;
|
|
|
+ const response = await fetch(`https://api.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);
|
|
|
+@@ -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}`);
|
|
|
}
|
|
|
- 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<string>
|
|
|
- expectedName = `arm-rpi-linux-gnueabihf${prefix}.tar.gz`;
|
|
|
- triple = 'arm-rpi-linux-gnueabihf';
|
|
|
+@@ -153,2 +156,10 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string>
|
|
|
break;
|
|
|
+ case 'ppc64el':
|
|
|
+ expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`;
|
|
|
@@ -461,28 +378,20 @@ index aa417dcc722..58f0eeefeff 100644
|
|
|
+ triple = 'riscv64-linux-gnu';
|
|
|
+ break;
|
|
|
}
|
|
|
- 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
|
|
|
+index ce21d50..cadefc2 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;
|
|
|
+@@ -8,3 +8,3 @@ 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..24fe452f7fe 100644
|
|
|
+index e97485e..24fe452 100644
|
|
|
--- a/build/linux/debian/types.ts
|
|
|
+++ b/build/linux/debian/types.ts
|
|
|
-@@ -3,8 +3,8 @@
|
|
|
- * Licensed under the MIT License. See License.txt in the project root for license information.
|
|
|
- *--------------------------------------------------------------------------------------------*/
|
|
|
+@@ -5,6 +5,6 @@
|
|
|
|
|
|
-export type DebianArchString = 'amd64' | 'armhf' | 'arm64';
|
|
|
+export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el' | 'riscv64';
|
|
|
@@ -492,12 +401,10 @@ index e97485ef128..24fe452f7fe 100644
|
|
|
+ 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 8be477290bb..5841d4769de 100644
|
|
|
+index 8be4772..5841d47 100644
|
|
|
--- a/build/linux/rpm/dep-lists.js
|
|
|
+++ b/build/linux/rpm/dep-lists.js
|
|
|
-@@ -314,6 +314,106 @@ exports.referenceGeneratedDepsByArch = {
|
|
|
- 'rpmlib(FileDigests) <= 4.6.0-1',
|
|
|
- 'rtld(GNU_HASH)',
|
|
|
+@@ -316,2 +316,102 @@ exports.referenceGeneratedDepsByArch = {
|
|
|
'xdg-utils'
|
|
|
+ ],
|
|
|
+ "ppc64le": [
|
|
|
@@ -600,16 +507,11 @@ index 8be477290bb..5841d4769de 100644
|
|
|
+ '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 24b18d504c8..924e62666f9 100644
|
|
|
+index 24b18d5..924e626 100644
|
|
|
--- a/build/linux/rpm/dep-lists.ts
|
|
|
+++ b/build/linux/rpm/dep-lists.ts
|
|
|
-@@ -313,5 +313,105 @@ export const referenceGeneratedDepsByArch = {
|
|
|
- 'rpmlib(FileDigests) <= 4.6.0-1',
|
|
|
- 'rtld(GNU_HASH)',
|
|
|
+@@ -315,2 +315,102 @@ export const referenceGeneratedDepsByArch = {
|
|
|
'xdg-utils'
|
|
|
+ ],
|
|
|
+ "ppc64le": [
|
|
|
@@ -712,27 +614,20 @@ index 24b18d504c8..924e62666f9 100644
|
|
|
+ 'rtld(GNU_HASH)',
|
|
|
+ 'xdg-utils'
|
|
|
]
|
|
|
- };
|
|
|
diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js
|
|
|
-index a20b9c2fe02..99a8cff7856 100644
|
|
|
+index a20b9c2..99a8cff 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;
|
|
|
+@@ -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);
|
|
|
}
|
|
|
- //# 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
|
|
|
+index c6a01da..d94537e 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.
|
|
|
- *--------------------------------------------------------------------------------------------*/
|
|
|
+@@ -5,6 +5,6 @@
|
|
|
|
|
|
-export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64';
|
|
|
+export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le' | 'riscv64';
|
|
|
@@ -742,131 +637,85 @@ index c6a01da1cf5..d94537e0c49 100644
|
|
|
+ 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
|
|
|
+index 4bec13d..3debda1 100644
|
|
|
--- a/cli/src/update_service.rs
|
|
|
+++ b/cli/src/update_service.rs
|
|
|
-@@ -214,6 +214,9 @@ pub enum Platform {
|
|
|
- LinuxARM64Legacy,
|
|
|
- LinuxARM32,
|
|
|
+@@ -216,2 +216,5 @@ pub enum Platform {
|
|
|
LinuxARM32Legacy,
|
|
|
+ LinuxPPC64LE,
|
|
|
+ LinuxPPC64LELegacy,
|
|
|
+ LinuxRISCV64,
|
|
|
DarwinX64,
|
|
|
- DarwinARM64,
|
|
|
- WindowsX64,
|
|
|
-@@ -227,6 +230,8 @@ impl Platform {
|
|
|
- Platform::LinuxX64 => Some("linux-x64".to_owned()),
|
|
|
- Platform::LinuxARM64 => Some("linux-arm64".to_owned()),
|
|
|
+@@ -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()),
|
|
|
- Platform::DarwinARM64 => Some("darwin-arm64".to_owned()),
|
|
|
- Platform::WindowsX64 => Some("win32-x64-archive".to_owned()),
|
|
|
-@@ -245,6 +250,9 @@ impl Platform {
|
|
|
- Platform::LinuxARM64Legacy => "server-linux-legacy-arm64",
|
|
|
- Platform::LinuxARM32 => "server-linux-armhf",
|
|
|
+@@ -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",
|
|
|
- Platform::DarwinARM64 => "server-darwin-arm64",
|
|
|
- Platform::WindowsX64 => "server-win32-x64",
|
|
|
-@@ -264,6 +272,9 @@ impl Platform {
|
|
|
- Platform::LinuxARM64Legacy => "cli-linux-arm64",
|
|
|
- Platform::LinuxARM32 => "cli-linux-armhf",
|
|
|
+@@ -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",
|
|
|
- Platform::DarwinARM64 => "cli-darwin-arm64",
|
|
|
- Platform::WindowsARM64 => "cli-win32-arm64",
|
|
|
-@@ -296,6 +307,10 @@ impl Platform {
|
|
|
- Some(Platform::LinuxARM32)
|
|
|
- } else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
|
|
|
+@@ -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")) {
|
|
|
- Some(Platform::DarwinX64)
|
|
|
- } else if cfg!(all(target_os = "macos", target_arch = "aarch64")) {
|
|
|
-@@ -323,6 +338,9 @@ impl fmt::Display for Platform {
|
|
|
- Platform::LinuxARM64Legacy => "LinuxARM64Legacy",
|
|
|
- Platform::LinuxARM32 => "LinuxARM32",
|
|
|
+@@ -325,2 +340,5 @@ impl fmt::Display for Platform {
|
|
|
Platform::LinuxARM32Legacy => "LinuxARM32Legacy",
|
|
|
+ Platform::LinuxPPC64LE => "LinuxPPC64LE",
|
|
|
+ Platform::LinuxPPC64LELegacy => "LinuxPPC64LELegacy",
|
|
|
+ Platform::LinuxRISCV64 => "LinuxRISCV64",
|
|
|
Platform::DarwinX64 => "DarwinX64",
|
|
|
- Platform::DarwinARM64 => "DarwinARM64",
|
|
|
- Platform::WindowsX64 => "WindowsX64",
|
|
|
diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
|
|
|
-index 5d4953acbb2..f22ff60e391 100644
|
|
|
+index 5d4953a..f22ff60 100644
|
|
|
--- a/cli/src/util/prereqs.rs
|
|
|
+++ b/cli/src/util/prereqs.rs
|
|
|
-@@ -74,6 +74,10 @@ impl PreReqChecker {
|
|
|
- Platform::LinuxX64
|
|
|
- } else if cfg!(target_arch = "arm") {
|
|
|
+@@ -76,2 +76,6 @@ impl PreReqChecker {
|
|
|
Platform::LinuxARM32
|
|
|
+ } else if cfg!(target_arch = "ppc64le") {
|
|
|
+ Platform::LinuxPPC64LE
|
|
|
+ } else if cfg!(target_arch = "riscv64") {
|
|
|
+ Platform::LinuxRISCV64
|
|
|
} else {
|
|
|
- Platform::LinuxARM64
|
|
|
- });
|
|
|
-@@ -83,6 +87,8 @@ impl PreReqChecker {
|
|
|
- Platform::LinuxX64Legacy
|
|
|
- } else if cfg!(target_arch = "arm") {
|
|
|
+@@ -85,2 +89,4 @@ impl PreReqChecker {
|
|
|
Platform::LinuxARM32Legacy
|
|
|
+ } else if cfg!(target_arch = "ppc64le") {
|
|
|
+ Platform::LinuxPPC64LELegacy
|
|
|
} else {
|
|
|
- Platform::LinuxARM64Legacy
|
|
|
- });
|
|
|
diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
|
|
|
-index 079557869e3..c057746b870 100644
|
|
|
+index 0795578..c057746 100644
|
|
|
--- a/resources/server/bin/helpers/check-requirements-linux.sh
|
|
|
+++ b/resources/server/bin/helpers/check-requirements-linux.sh
|
|
|
-@@ -50,6 +50,8 @@ case $ARCH in
|
|
|
- LDCONFIG_ARCH="AArch64"
|
|
|
- fi
|
|
|
+@@ -52,2 +52,4 @@ case $ARCH in
|
|
|
;;
|
|
|
+ ppc64el) LDCONFIG_ARCH="64bit";;
|
|
|
+ riscv64) LDCONFIG_ARCH="RISC-V";;
|
|
|
esac
|
|
|
-
|
|
|
- if [ "$OS_ID" != "alpine" ]; then
|
|
|
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
|
|
|
-index 183f2582871..e13fe72513c 100644
|
|
|
+index 68f2198..1c15fe4 100644
|
|
|
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
|
|
|
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
|
|
|
-@@ -39,6 +39,8 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
|
|
|
- case TargetPlatform.LINUX_X64: return 'Linux 64 bit';
|
|
|
- case TargetPlatform.LINUX_ARM64: return 'Linux ARM 64';
|
|
|
+@@ -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';
|
|
|
|
|
|
- case TargetPlatform.ALPINE_X64: return 'Alpine Linux 64 bit';
|
|
|
- case TargetPlatform.ALPINE_ARM64: return 'Alpine ARM 64';
|
|
|
-@@ -62,6 +64,8 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
|
|
|
- case TargetPlatform.LINUX_X64: return TargetPlatform.LINUX_X64;
|
|
|
- case TargetPlatform.LINUX_ARM64: return TargetPlatform.LINUX_ARM64;
|
|
|
+@@ -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;
|
|
|
|
|
|
- case TargetPlatform.ALPINE_X64: return TargetPlatform.ALPINE_X64;
|
|
|
- case TargetPlatform.ALPINE_ARM64: return TargetPlatform.ALPINE_ARM64;
|
|
|
-@@ -97,6 +101,12 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
|
|
|
- if (arch === 'arm') {
|
|
|
- return TargetPlatform.LINUX_ARMHF;
|
|
|
+@@ -99,2 +103,8 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
|
|
|
}
|
|
|
+ if (arch === 'ppc64le') {
|
|
|
+ return TargetPlatform.LINUX_PPC64LE;
|
|
|
@@ -875,18 +724,12 @@ index 183f2582871..e13fe72513c 100644
|
|
|
+ return TargetPlatform.LINUX_RISCV64;
|
|
|
+ }
|
|
|
return TargetPlatform.UNKNOWN;
|
|
|
-
|
|
|
- case 'alpine':
|
|
|
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
|
|
|
-index cfe5313b905..fe14a21f0e8 100644
|
|
|
+index 4dd080d..e154312 100644
|
|
|
--- a/src/vs/platform/extensions/common/extensions.ts
|
|
|
+++ b/src/vs/platform/extensions/common/extensions.ts
|
|
|
-@@ -304,6 +304,8 @@ export const enum TargetPlatform {
|
|
|
- LINUX_X64 = 'linux-x64',
|
|
|
- LINUX_ARM64 = 'linux-arm64',
|
|
|
+@@ -306,2 +306,4 @@ export const enum TargetPlatform {
|
|
|
LINUX_ARMHF = 'linux-armhf',
|
|
|
+ LINUX_PPC64LE = 'linux-ppc64le',
|
|
|
+ LINUX_RISCV64 = 'linux-riscv64',
|
|
|
|
|
|
- ALPINE_X64 = 'alpine-x64',
|
|
|
- ALPINE_ARM64 = 'alpine-arm64',
|
Baptiste Augrain