From 700341f9cc07ddac89ba8c7d9c98346561b60fd9 Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Thu, 17 Jan 2019 10:49:38 +0100 Subject: [PATCH 1/8] Fix error with OSX XCode build Change-type: patch Signed-off-by: Lorenzo Alberto Maria Ambrosi --- binding.gyp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/binding.gyp b/binding.gyp index 4209a5de..048a5746 100644 --- a/binding.gyp +++ b/binding.gyp @@ -17,8 +17,18 @@ "libraries": [ "-lShell32.lib", ], - } ] + } ], + [ 'OS=="mac"', { + "xcode_settings": { + "OTHER_CPLUSPLUSFLAGS": [ + "-stdlib=libc++" + ], + "OTHER_LDFLAGS": [ + "-stdlib=libc++" + ] + } + } ] ], } ], From 8cc33b46bbb950f18f775fbd6f8186be3609ab1b Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Thu, 17 Jan 2019 10:51:11 +0100 Subject: [PATCH 2/8] Make winusb-driver-generator optional (win only) Change-type: patch Signed-off-by: Lorenzo Alberto Maria Ambrosi --- npm-shrinkwrap.json | 8 +++++--- package.json | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 66a2112c..740dfebd 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -8794,12 +8794,14 @@ "dev": true }, "winusb-driver-generator": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/winusb-driver-generator/-/winusb-driver-generator-1.2.1.tgz", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/winusb-driver-generator/-/winusb-driver-generator-1.2.3.tgz", + "optional": true, "dependencies": { "nan": { "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz" + "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", + "optional": true } } }, diff --git a/package.json b/package.json index 5e788b04..94d5cf78 100644 --- a/package.json +++ b/package.json @@ -98,12 +98,14 @@ "unbzip2-stream": "github:resin-io-modules/unbzip2-stream#core-streams", "usb": "github:resin-io/node-usb#1.3.5", "uuid": "3.0.1", - "winusb-driver-generator": "1.2.1", "xml2js": "0.4.17", "xxhash": "0.2.4", "yargs": "11.0.0", "yauzl": "2.6.0" }, + "optionalDependencies": { + "winusb-driver-generator": "1.2.3" + }, "devDependencies": { "angular-mocks": "1.6.3", "asar": "0.14.2", From c37270ea081c83d628b2204c97428cb65f6b390e Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Thu, 17 Jan 2019 10:52:34 +0100 Subject: [PATCH 3/8] Switch to fork of xxhash with XCode build fix Change-type: patch Signed-off-by: Lorenzo Alberto Maria Ambrosi --- npm-shrinkwrap.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 740dfebd..8185c0b4 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -8874,7 +8874,7 @@ }, "xxhash": { "version": "0.2.4", - "resolved": "https://registry.npmjs.org/xxhash/-/xxhash-0.2.4.tgz" + "resolved": "git://github.com/balena-io-modules/node-xxhash.git#70ac31da1a41c6f8c53d931b5802c6c93f7b6b83" }, "y18n": { "version": "3.2.1", diff --git a/package.json b/package.json index 94d5cf78..281d4d04 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "usb": "github:resin-io/node-usb#1.3.5", "uuid": "3.0.1", "xml2js": "0.4.17", - "xxhash": "0.2.4", + "xxhash": "github:balena-io-modules/node-xxhash#70ac31da1a41c6f8c53d931b5802c6c93f7b6b83", "yargs": "11.0.0", "yauzl": "2.6.0" }, From 73e4827249f52107e4138f9575d8f469de901d27 Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Thu, 17 Jan 2019 10:54:29 +0100 Subject: [PATCH 4/8] Bump mountutils to v1.3.16 for XCode build fix Change-type: patch Signed-off-by: Lorenzo Alberto Maria Ambrosi --- npm-shrinkwrap.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 8185c0b4..29e19d90 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -5305,12 +5305,12 @@ "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.2.2.tgz" }, "mountutils": { - "version": "1.3.15", - "resolved": "https://registry.npmjs.org/mountutils/-/mountutils-1.3.15.tgz", + "version": "1.3.16", + "resolved": "https://registry.npmjs.org/mountutils/-/mountutils-1.3.16.tgz", "dependencies": { "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz" } } }, diff --git a/package.json b/package.json index 281d4d04..3cf96b51 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "lzma-native": "1.5.2", "mbr": "1.1.2", "mime-types": "2.1.15", - "mountutils": "1.3.15", + "mountutils": "1.3.16", "nan": "2.9.2", "node-ipc": "9.1.1", "node-stream-zip": "1.3.7", From e85251d2e37a317d1a0fae64a8eb1447640fc443 Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Thu, 17 Jan 2019 10:56:03 +0100 Subject: [PATCH 5/8] Bump drivelist to v6.4.6 Change-type: patch Changelog-entry: Fix incorrect drives list on Linux Signed-off-by: Lorenzo Alberto Maria Ambrosi --- npm-shrinkwrap.json | 16 ++++++++++++---- package.json | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 29e19d90..8365c7f0 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2371,12 +2371,12 @@ "dev": true }, "drivelist": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-6.4.2.tgz", + "version": "6.4.6", + "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-6.4.6.tgz", "dependencies": { "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz" } } }, @@ -6880,6 +6880,10 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz" }, + "drivelist": { + "version": "6.4.6", + "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-6.4.6.tgz" + }, "figures": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" @@ -6910,6 +6914,10 @@ "version": "3.10.1", "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" }, + "nan": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz" + }, "onetime": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz" diff --git a/package.json b/package.json index 3cf96b51..53427dfe 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "color": "2.0.1", "command-join": "2.0.0", "debug": "3.1.0", - "drivelist": "6.4.2", + "drivelist": "6.4.6", "electron-is-running-in-asar": "1.0.0", "file-type": "4.1.0", "flexboxgrid": "6.3.0", From 8c8a0bf8eb64bd9a8bd5019ac6337665ee5e9959 Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Thu, 17 Jan 2019 11:29:47 +0100 Subject: [PATCH 6/8] Fix linting error for winusb-driver-generator Change-type: patch Signed-off-by: Lorenzo Alberto Maria Ambrosi --- lib/sdk/adapters/usbboot/usb.js | 2 ++ npm-shrinkwrap.json | 12 ------------ package.json | 5 +++-- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/lib/sdk/adapters/usbboot/usb.js b/lib/sdk/adapters/usbboot/usb.js index df5460d9..7cf78930 100644 --- a/lib/sdk/adapters/usbboot/usb.js +++ b/lib/sdk/adapters/usbboot/usb.js @@ -80,7 +80,9 @@ exports.listDevices = () => { // due to C Runtime issues on Windows; // see https://github.com/resin-io/etcher/issues/1956 try { + /* eslint-disable node/no-missing-require */ const winusbDriverGenerator = require('winusb-driver-generator') + /* eslint-enable node/no-missing-require */ for (const device of winusbDriverGenerator.listDriverlessDevices()) { devices.push({ accessible: false, diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 8365c7f0..19a68553 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -8801,18 +8801,6 @@ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", "dev": true }, - "winusb-driver-generator": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/winusb-driver-generator/-/winusb-driver-generator-1.2.3.tgz", - "optional": true, - "dependencies": { - "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", - "optional": true - } - } - }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", diff --git a/package.json b/package.json index 53427dfe..83da951f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,8 @@ "7zip-bin-mac", "7zip-bin-win", "7zip-bin-linux", - "fsevents" + "fsevents", + "winusb-driver-generator" ], "dependencies": { "@fortawesome/fontawesome-free-webfonts": "^1.0.9", @@ -99,7 +100,7 @@ "usb": "github:resin-io/node-usb#1.3.5", "uuid": "3.0.1", "xml2js": "0.4.17", - "xxhash": "github:balena-io-modules/node-xxhash#70ac31da1a41c6f8c53d931b5802c6c93f7b6b83", + "xxhash": "git://github.com/balena-io-modules/node-xxhash.git#70ac31da1a41c6f8c53d931b5802c6c93f7b6b83", "yargs": "11.0.0", "yauzl": "2.6.0" }, From 7ca3e2b5199bf79ec33f17828a96b89d410a071b Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Fri, 18 Jan 2019 16:51:20 +0100 Subject: [PATCH 7/8] Update build scripts for electron-builder unresolved dependencies Change-type: patch Signed-off-by: Lorenzo Alberto Maria Ambrosi --- scripts/resin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/resin b/scripts/resin index 5961434e..1ef25962 160000 --- a/scripts/resin +++ b/scripts/resin @@ -1 +1 @@ -Subproject commit 5961434ebe3e24df23110333abffcbe02a69be49 +Subproject commit 1ef259620d0b51cb7865104c949c8fb682bfa742 From c16fbb5b474ae8364ba648897b5176f81b799cff Mon Sep 17 00:00:00 2001 From: Lorenzo Alberto Maria Ambrosi Date: Fri, 18 Jan 2019 16:54:35 +0100 Subject: [PATCH 8/8] Rename resin-io modules to balena-io Change-type: patch Signed-off-by: Lorenzo Alberto Maria Ambrosi --- npm-shrinkwrap.json | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 19a68553..9cc2d4ec 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -8164,8 +8164,8 @@ }, "unbzip2-stream": { "version": "1.2.5", - "from": "resin-io-modules/unbzip2-stream#core-streams", - "resolved": "git://github.com/resin-io-modules/unbzip2-stream.git#942fc218013c14adab01cf693b0500cf6ac83193" + "from": "balena-io-modules/unbzip2-stream#core-streams", + "resolved": "git://github.com/balena-io-modules/unbzip2-stream.git#942fc218013c14adab01cf693b0500cf6ac83193" }, "unc-path-regex": { "version": "0.1.2", @@ -8314,8 +8314,8 @@ }, "usb": { "version": "1.3.5", - "from": "resin-io/node-usb#1.3.5", - "resolved": "git://github.com/resin-io/node-usb.git#1521d10bdfe09ef2ca1f259972dee27c6c35f821" + "from": "balena-io/node-usb#1.3.5", + "resolved": "git://github.com/balena-io/node-usb.git#1521d10bdfe09ef2ca1f259972dee27c6c35f821" }, "use": { "version": "3.1.1", diff --git a/package.json b/package.json index 83da951f..05a0482e 100644 --- a/package.json +++ b/package.json @@ -96,8 +96,8 @@ "styled-system": "3.1.11", "sudo-prompt": "8.2.3", "udif": "0.13.0", - "unbzip2-stream": "github:resin-io-modules/unbzip2-stream#core-streams", - "usb": "github:resin-io/node-usb#1.3.5", + "unbzip2-stream": "github:balena-io-modules/unbzip2-stream#core-streams", + "usb": "github:balena-io/node-usb#1.3.5", "uuid": "3.0.1", "xml2js": "0.4.17", "xxhash": "git://github.com/balena-io-modules/node-xxhash.git#70ac31da1a41c6f8c53d931b5802c6c93f7b6b83",