jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-22 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: encode complete paths to patched file in patches/ (#1987)

Browse Source 
So that the build system doesn't need to know in advance at which
directory the paths needs to be applied.

This will make it easier to add patches support to the Concourse
pipelines.

Change-Type: patch
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
This commit is contained in:
Juan Cruz Viotti 2018-01-23 18:48:35 -04:00 committed by GitHub
parent f932e947e0
commit b357047e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -214,7 +214,7 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(
-x $@ \ -x $@ \
-t node \ -t node \
-s "$(PLATFORM)" -s "$(PLATFORM)"
git apply --directory $@/node_modules/lzma-native patches/cli/lzma-native-index-static-addon-require.patch patch --directory=$@ --force --strip=1 --ignore-whitespace < patches/lzma-native-index-static-addon-require.patch
cp -r lib $@ cp -r lib $@
cp package.json $@ cp package.json $@

6
patches/cli/lzma-native-index-static-addon-require.patch → patches/lzma-native-index-static-addon-require.patch
View File

@ -1,7 +1,5 @@
diff --git a/index.js b/index.js --- b/node_modules/lzma-native/index.js 2018-01-23 14:37:50.000000000 -0400
index 1e7c766..e42c513 100644 +++ a/node_modules/lzma-native/index.js 2018-01-23 14:37:00.000000000 -0400
--- a/index.js
+++ b/index.js
@@ -7,11 +7,8 @@ var extend = require('util-extend'); @@ -7,11 +7,8 @@ var extend = require('util-extend');
var assert = require('assert'); var assert = require('assert');
var fs = require('fs'); var fs = require('fs');