timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-22 02:50:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: move misplaced code (#2092)

Browse Source
This commit is contained in:
Baptiste Augrain
2024-11-05 16:52:48 +01:00
committed by GitHub
parent ccec55599b
commit d598450d02
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patch.sh
View File

@@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
echo "$#" echo "$#"
cd vscode || { echo "'vscode' dir not found"; exit 1; } cd vscode || { echo "'vscode' dir not found"; exit 1; }
@@ -27,7 +29,7 @@ while [ $# -gt 1 ]; do
done done
git add . git add .
git commit -q -m "VSCODIUM HELPER" git commit -q -m "VSCODIUM HELPER" --no-verify
if [[ "${1}" == *patch ]]; then if [[ "${1}" == *patch ]]; then
FILE="../patches/${1}" FILE="../patches/${1}"

6
patches/linux/arch-1-ppc64le.patch
View File

@@ -1,5 +1,5 @@
diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
index d836fb7..540890f 100755 index fbe67b0..5b2f5d8 100755
--- a/build/azure-pipelines/linux/setup-env.sh --- a/build/azure-pipelines/linux/setup-env.sh
+++ b/build/azure-pipelines/linux/setup-env.sh +++ b/build/azure-pipelines/linux/setup-env.sh
@@ -74,2 +74,14 @@ elif [ "$npm_config_arch" == "arm" ]; then @@ -74,2 +74,14 @@ elif [ "$npm_config_arch" == "arm" ]; then
@@ -191,7 +191,7 @@ index 9f29943..aa769ad 100644
+ ], + ],
}; };
diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
index 2cd8f2d..3dcd5c1 100644 index 2cd8f2d..aef739c 100644
--- a/build/linux/debian/install-sysroot.js --- a/build/linux/debian/install-sysroot.js
+++ b/build/linux/debian/install-sysroot.js +++ b/build/linux/debian/install-sysroot.js
@@ -137,2 +137,6 @@ async function getVSCodeSysroot(arch) { @@ -137,2 +137,6 @@ async function getVSCodeSysroot(arch) {
@@ -202,7 +202,7 @@ index 2cd8f2d..3dcd5c1 100644
+ break; + break;
} }
diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
index d8de38e..52b3422 100644 index d8de38e..53b4866 100644
--- a/build/linux/debian/install-sysroot.ts --- a/build/linux/debian/install-sysroot.ts
+++ b/build/linux/debian/install-sysroot.ts +++ b/build/linux/debian/install-sysroot.ts
@@ -154,2 +154,6 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string> @@ -154,2 +154,6 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string>

7
patches/linux/arch-2-riscv64.patch
View File

@@ -270,7 +270,7 @@ index 00dd3e2..91c9d20 100644
+ riscv64) LDCONFIG_ARCH="RISC-V";; + riscv64) LDCONFIG_ARCH="RISC-V";;
esac esac
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 004df84..9eea6e2 100644 index 004df84..fb2acc7 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -42,2 +42,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) { @@ -42,2 +42,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
@@ -281,11 +281,8 @@ index 004df84..9eea6e2 100644
case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE; case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE;
+ case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64; + case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64;
@@ -104,2 +106,8 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string | @@ -104,2 +106,5 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
} }
+ if (arch === 'ppc64le') {
+ return TargetPlatform.LINUX_PPC64LE;
+ }
+ if (arch === 'riscv64') { + if (arch === 'riscv64') {
+ return TargetPlatform.LINUX_RISCV64; + return TargetPlatform.LINUX_RISCV64;
+ } + }