jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-29 14:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move patches back to patches folder

Browse Source 
Change-type: patch
This commit is contained in:
Alexis Svinartchouk 2019-01-28 14:53:29 +01:00
parent d4f29bd2af
commit d5c9e6b054
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -92,14 +92,7 @@ TARGET_ARCH ?= $(HOST_ARCH)
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# Electron # Electron
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
patches: node_modules_patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch node_modules/node-pre-gyp/lib/util/versioning.js electron-develop: | $(BUILD_TEMPORARY_DIRECTORY)
# 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)
$(RESIN_SCRIPTS)/electron/install.sh \ $(RESIN_SCRIPTS)/electron/install.sh \
-b $(shell pwd) \ -b $(shell pwd) \
-r $(TARGET_ARCH) \ -r $(TARGET_ARCH) \
@ -107,7 +100,7 @@ electron-develop: patches | $(BUILD_TEMPORARY_DIRECTORY)
-n $(BUILD_TEMPORARY_DIRECTORY)/npm \ -n $(BUILD_TEMPORARY_DIRECTORY)/npm \
-a $(S3_BUCKET) -a $(S3_BUCKET)
electron-test: patches electron-test:
$(RESIN_SCRIPTS)/electron/test.sh \ $(RESIN_SCRIPTS)/electron/test.sh \
-b $(shell pwd) \ -b $(shell pwd) \
-s $(PLATFORM) -s $(PLATFORM)
@ -115,7 +108,7 @@ electron-test: patches
assets/dmg/background.tiff: assets/dmg/background.png assets/dmg/background@2x.png assets/dmg/background.tiff: assets/dmg/background.png assets/dmg/background@2x.png
tiffutil -cathidpicheck $^ -out $@ 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 \ $(RESIN_SCRIPTS)/electron/build.sh \
-b $(shell pwd) \ -b $(shell pwd) \
-r $(TARGET_ARCH) \ -r $(TARGET_ARCH) \

0
node_modules_patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch → patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch
View File