From d5c9e6b0546e510105b06e54797ce1032699ac39 Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Mon, 28 Jan 2019 14:53:29 +0100 Subject: [PATCH] Move patches back to patches folder Change-type: patch --- Makefile | 13 +++---------- ...electron-forks-of-modules-that-use-pre-gyp.patch | 0 2 files changed, 3 insertions(+), 10 deletions(-) rename {node_modules_patches => patches}/allow-electron-forks-of-modules-that-use-pre-gyp.patch (100%) diff --git a/Makefile b/Makefile index 12617a38..27183969 100644 --- a/Makefile +++ b/Makefile @@ -92,14 +92,7 @@ TARGET_ARCH ?= $(HOST_ARCH) # --------------------------------------------------------------------- # Electron # --------------------------------------------------------------------- -patches: node_modules_patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch node_modules/node-pre-gyp/lib/util/versioning.js - # patch from https://github.com/mapbox/node-pre-gyp/pull/279/files , required for lzma-native in electron child processes - # we only apply the patch if it hasn't been applied - if ! [ -f node_modules/node-pre-gyp/lib/util/versioning.js.orig ]; \ - then patch --backup --force --strip=1 --ignore-whitespace < node_modules_patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch; \ - fi; - -electron-develop: patches | $(BUILD_TEMPORARY_DIRECTORY) +electron-develop: | $(BUILD_TEMPORARY_DIRECTORY) $(RESIN_SCRIPTS)/electron/install.sh \ -b $(shell pwd) \ -r $(TARGET_ARCH) \ @@ -107,7 +100,7 @@ electron-develop: patches | $(BUILD_TEMPORARY_DIRECTORY) -n $(BUILD_TEMPORARY_DIRECTORY)/npm \ -a $(S3_BUCKET) -electron-test: patches +electron-test: $(RESIN_SCRIPTS)/electron/test.sh \ -b $(shell pwd) \ -s $(PLATFORM) @@ -115,7 +108,7 @@ electron-test: patches assets/dmg/background.tiff: assets/dmg/background.png assets/dmg/background@2x.png tiffutil -cathidpicheck $^ -out $@ -electron-build: patches assets/dmg/background.tiff | $(BUILD_TEMPORARY_DIRECTORY) +electron-build: assets/dmg/background.tiff | $(BUILD_TEMPORARY_DIRECTORY) $(RESIN_SCRIPTS)/electron/build.sh \ -b $(shell pwd) \ -r $(TARGET_ARCH) \ diff --git a/node_modules_patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch b/patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch similarity index 100% rename from node_modules_patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch rename to patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch