From 7728e2ee564cbf7f6a11daf202d6b409e780fe39 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 5 Nov 2024 16:52:48 +0100
Subject: [PATCH] fix: move misplaced code (#2092)

---
 patch.sh                           | 4 +++-
 patches/linux/arch-1-ppc64le.patch | 6 +++---
 patches/linux/arch-2-riscv64.patch | 7 ++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/patch.sh b/patch.sh
index 072f9dd197b..fadc0148548 100755
--- a/patch.sh
+++ b/patch.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 echo "$#"
 
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
@@ -27,7 +29,7 @@ while [ $# -gt 1 ]; do
 done
 
 git add .
-git commit -q -m "VSCODIUM HELPER"
+git commit -q -m "VSCODIUM HELPER" --no-verify
 
 if [[ "${1}" == *patch ]]; then
   FILE="../patches/${1}"
diff --git a/patches/linux/arch-1-ppc64le.patch b/patches/linux/arch-1-ppc64le.patch
index 28866ecddbd..72ff5407071 100644
--- a/patches/linux/arch-1-ppc64le.patch
+++ b/patches/linux/arch-1-ppc64le.patch
@@ -1,5 +1,5 @@
 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
 +++ b/build/azure-pipelines/linux/setup-env.sh
 @@ -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
-index 2cd8f2d..3dcd5c1 100644
+index 2cd8f2d..aef739c 100644
 --- a/build/linux/debian/install-sysroot.js
 +++ b/build/linux/debian/install-sysroot.js
 @@ -137,2 +137,6 @@ async function getVSCodeSysroot(arch) {
@@ -202,7 +202,7 @@ index 2cd8f2d..3dcd5c1 100644
 +            break;
      }
 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
 +++ b/build/linux/debian/install-sysroot.ts
 @@ -154,2 +154,6 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string>
diff --git a/patches/linux/arch-2-riscv64.patch b/patches/linux/arch-2-riscv64.patch
index 7c194231412..3642c37660a 100644
--- a/patches/linux/arch-2-riscv64.patch
+++ b/patches/linux/arch-2-riscv64.patch
@@ -270,7 +270,7 @@ index 00dd3e2..91c9d20 100644
 +	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 004df84..9eea6e2 100644
+index 004df84..fb2acc7 100644
 --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
 +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
 @@ -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_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') {
 +				return TargetPlatform.LINUX_RISCV64;
 +			}