diff --git a/build/gulpfile.reh.ts b/build/gulpfile.reh.ts index f986b4e..557990e 100644 --- a/build/gulpfile.reh.ts +++ b/build/gulpfile.reh.ts @@ -53,2 +53,3 @@ const BUILD_TARGETS = [ { platform: 'linux', arch: 'ppc64le' }, + { platform: 'linux', arch: 'riscv64' }, { platform: 'alpine', arch: 'arm64' }, diff --git a/build/gulpfile.scan.ts b/build/gulpfile.scan.ts index 47b25cf..dd5bb56 100644 --- a/build/gulpfile.scan.ts +++ b/build/gulpfile.scan.ts @@ -25,2 +25,3 @@ const BUILD_TARGETS = [ { platform: 'linux', arch: 'ppc64le' }, + { platform: 'linux', arch: 'riscv64' }, ]; diff --git a/build/gulpfile.vscode.linux.ts b/build/gulpfile.vscode.linux.ts index da4fc1f..b64dd9a 100644 --- a/build/gulpfile.vscode.linux.ts +++ b/build/gulpfile.vscode.linux.ts @@ -33,2 +33,3 @@ function getDebPackageArch(arch: string): string { case 'ppc64le': return 'ppc64el'; + case 'riscv64': return 'riscv64'; default: throw new Error(`Unknown arch: ${arch}`); @@ -144,2 +145,3 @@ function getRpmPackageArch(arch: string): string { case 'ppc64le': return 'ppc64le'; + case 'riscv64': return 'riscv64'; default: throw new Error(`Unknown arch: ${arch}`); @@ -289,2 +291,3 @@ const BUILD_TARGETS = [ { arch: 'ppc64le' }, + { arch: 'riscv64' }, ]; diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts index 1d7e9d5..3a5a9ca 100644 --- a/build/gulpfile.vscode.ts +++ b/build/gulpfile.vscode.ts @@ -518,2 +518,3 @@ const BUILD_TARGETS = [ { platform: 'linux', arch: 'ppc64le' }, + { platform: 'linux', arch: 'riscv64' }, ]; diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts index 6c6bbf5..5ee005e 100644 --- a/build/linux/debian/calculate-deps.ts +++ b/build/linux/debian/calculate-deps.ts @@ -68,2 +68,8 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi 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.ts b/build/linux/debian/dep-lists.ts index 73d451f..7ea5910 100644 --- a/build/linux/debian/dep-lists.ts +++ b/build/linux/debian/dep-lists.ts @@ -181,2 +181,42 @@ export const referenceGeneratedDepsByArch = { ], + '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.ts b/build/linux/debian/install-sysroot.ts index 3086928..6e5246c 100644 --- a/build/linux/debian/install-sysroot.ts +++ b/build/linux/debian/install-sysroot.ts @@ -162,2 +162,6 @@ export async function getVSCodeSysroot(arch: DebianArchString, isMusl: boolean = break; + case 'riscv64': + expectedName = `riscv64-linux-gnu${prefix}.tar.gz`; + triple = 'riscv64-linux-gnu'; + break; } diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts index c56d067..5d63ed2 100644 --- a/build/linux/debian/types.ts +++ b/build/linux/debian/types.ts @@ -5,6 +5,6 @@ -export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el' | 'ppc64le'; +export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el' | 'ppc64le' | 'riscv64'; export function isDebianArchString(s: string): s is DebianArchString { - return ['amd64', 'armhf', 'arm64', 'ppc64el', 'ppc64le'].includes(s); + return ['amd64', 'armhf', 'arm64', 'ppc64el', 'ppc64le', 'riscv64'].includes(s); } diff --git a/build/linux/rpm/types.ts b/build/linux/rpm/types.ts index 3f3c3f5..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' | 'ppc64le'; +export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le' | 'riscv64'; export function isRpmArchString(s: string): s is RpmArchString { - return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le'].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 ec97760..de9ca72 100644 --- a/cli/src/update_service.rs +++ b/cli/src/update_service.rs @@ -184,2 +184,3 @@ pub enum Platform { LinuxPPC64LE, + LinuxRISCV64, DarwinX64, @@ -203,2 +204,3 @@ impl Platform { Platform::LinuxPPC64LE => "ppc64le", + Platform::LinuxRISCV64 => "riscv64", Platform::DarwinX64 => "x64", @@ -223,2 +225,3 @@ impl Platform { Platform::LinuxPPC64LE => "linux", + Platform::LinuxRISCV64 => "linux", Platform::DarwinX64 => "darwin", @@ -253,2 +256,4 @@ impl Platform { 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")) { @@ -281,2 +286,3 @@ impl fmt::Display for Platform { Platform::LinuxPPC64LE => "LinuxPPC64LE", + Platform::LinuxRISCV64 => "LinuxRISCV64", Platform::DarwinX64 => "DarwinX64", diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs index 679aacb..1a37552 100644 --- a/cli/src/util/prereqs.rs +++ b/cli/src/util/prereqs.rs @@ -84,2 +84,4 @@ impl PreReqChecker { Platform::LinuxPPC64LE + } else if cfg!(target_arch = "riscv64") { + Platform::LinuxRISCV64 } else { diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh index 94028e3..c41cce7 100644 --- a/resources/server/bin/helpers/check-requirements-linux.sh +++ b/resources/server/bin/helpers/check-requirements-linux.sh @@ -56,2 +56,3 @@ case $ARCH in ppc64le) 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 a754ff3..b607327 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts @@ -49,2 +49,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) { case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC64'; + case TargetPlatform.LINUX_RISCV64: return 'Linux RISC-V 64'; @@ -73,2 +74,3 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform { case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE; + case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64; @@ -111,2 +113,5 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string | } + 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 b605be0..22d2206 100644 --- a/src/vs/platform/extensions/common/extensions.ts +++ b/src/vs/platform/extensions/common/extensions.ts @@ -332,2 +332,3 @@ export const enum TargetPlatform { LINUX_PPC64LE = 'linux-ppc64le', + LINUX_RISCV64 = 'linux-riscv64',