From 7c5e136c31ced24376a14bebc6815b9b74162a6a Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sat, 23 Apr 2022 14:05:44 +0530 Subject: [PATCH 1/7] Update build-native.js --- scripts/build-native.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index ba14f9e1..33f9f49a 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,10 +3,9 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') -if (process.platform === 'win32' || process.platform === 'linux') { - process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch -} else { - process.env.ARCH ??= process.arch +process.env.ARCH = process.env.ARCH || process.arch +if (process.env.ARCH === 'arm') { + process.env.ARCH = 'armv7l' } let lifecycles = [] From 8dba1bf5cd2e157e352766dfef2e625886f9ba52 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sat, 23 Apr 2022 14:06:29 +0530 Subject: [PATCH 2/7] Update build-linux.js --- scripts/build-linux.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index e2215a62..dbfa28a4 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -4,7 +4,10 @@ const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') -process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch +process.env.ARCH = process.env.ARCH || process.arch +if (process.env.ARCH === 'arm') { + process.env.ARCH = 'armv7l' +} builder({ dir: true, From 2af4714d66ebfc3f13f75a24cd2c41c0ee77f96e Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sun, 24 Apr 2022 11:49:46 +0530 Subject: [PATCH 3/7] Update build-linux.js --- scripts/build-linux.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index dbfa28a4..de4f7610 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -12,7 +12,7 @@ if (process.env.ARCH === 'arm') { builder({ dir: true, linux: ['deb', 'tar.gz', 'rpm', 'pacman'], - armv7l: process.env.ARCH === 'armv7l', + armv7l: process.env.ARCH === 'armv7l' || process.env.ARCH === 'arm', arm64: process.env.ARCH === 'arm64', config: { extraMetadata: { From 5e217cf65419792d8e1029de77825a11b85a36e6 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Mon, 25 Apr 2022 11:19:30 +0530 Subject: [PATCH 4/7] Update build-linux.js --- scripts/build-linux.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index de4f7610..2596eef1 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -4,15 +4,12 @@ const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') -process.env.ARCH = process.env.ARCH || process.arch -if (process.env.ARCH === 'arm') { - process.env.ARCH = 'armv7l' -} +process.env.ARCH = ((process.env.ARCH || process.arch) === 'arm') ? 'armv7l' : process.env.ARCH || process.arch builder({ dir: true, linux: ['deb', 'tar.gz', 'rpm', 'pacman'], - armv7l: process.env.ARCH === 'armv7l' || process.env.ARCH === 'arm', + armv7l: process.env.ARCH === 'armv7l', arm64: process.env.ARCH === 'arm64', config: { extraMetadata: { From 66fad228fc74a96c2dc03f10781fd841aece7f92 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Mon, 25 Apr 2022 11:20:35 +0530 Subject: [PATCH 5/7] Update build-native.js --- scripts/build-native.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index 33f9f49a..2745a34e 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,9 +3,10 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') -process.env.ARCH = process.env.ARCH || process.arch -if (process.env.ARCH === 'arm') { - process.env.ARCH = 'armv7l' +if (process.platform === 'win32' || process.platform === 'linux') { + process.env.ARCH = ((process.env.ARCH || process.arch) === 'arm') ? 'armv7l' : process.env.ARCH || process.arch +} else { + process.env.ARCH ??= process.arch } let lifecycles = [] From c7a72da0ab8b018a1b07a3ded5f9cd6a6075c27b Mon Sep 17 00:00:00 2001 From: Jai A P Date: Mon, 25 Apr 2022 15:07:49 +0530 Subject: [PATCH 6/7] Add files via upload --- patches/builder-util+23.0.3.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 patches/builder-util+23.0.3.patch diff --git a/patches/builder-util+23.0.3.patch b/patches/builder-util+23.0.3.patch new file mode 100644 index 00000000..a649fd0e --- /dev/null +++ b/patches/builder-util+23.0.3.patch @@ -0,0 +1,12 @@ +diff --git a/node_modules/builder-util/out/arch.js b/node_modules/builder-util/out/arch.js +index eabcf47..e1ac595 100644 +--- a/node_modules/builder-util/out/arch.js ++++ b/node_modules/builder-util/out/arch.js +@@ -40,6 +40,7 @@ function archFromString(name) { + return Arch.ia32; + case "arm64": + return Arch.arm64; ++ case "arm": + case "armv7l": + return Arch.armv7l; + case "universal": From 2ba4036275ff930de258fce8013638865d74851f Mon Sep 17 00:00:00 2001 From: Jai A P Date: Mon, 25 Apr 2022 15:58:58 +0530 Subject: [PATCH 7/7] Rename builder-util+23.0.3.patch to builder-util+23.0.8.patch --- patches/{builder-util+23.0.3.patch => builder-util+23.0.8.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename patches/{builder-util+23.0.3.patch => builder-util+23.0.8.patch} (100%) diff --git a/patches/builder-util+23.0.3.patch b/patches/builder-util+23.0.8.patch similarity index 100% rename from patches/builder-util+23.0.3.patch rename to patches/builder-util+23.0.8.patch