From 2fd18add50730b037f9128776146354d6f467896 Mon Sep 17 00:00:00 2001
From: Court Ewing <court@epixa.com>
Date: Thu, 16 Jun 2016 10:18:40 -0400
Subject: [PATCH 1/2] Build task for creating os packages creates target

The target directory is created by the archives task, but it is not
created by the ospackages task, so if you do not have a target
directory and try to skip archives, the build will fail.

Backport 3d546336b15d5cb370ff79ca97f5cc1cb61d9867
---
 tasks/build/osPackages.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasks/build/osPackages.js b/tasks/build/osPackages.js
index 3a04c3f7ce8df..c19d40d96bf9c 100644
--- a/tasks/build/osPackages.js
+++ b/tasks/build/osPackages.js
@@ -10,6 +10,8 @@ export default (grunt) => {
   const fpm = args => exec('fpm', args);
 
   grunt.registerTask('_build:osPackages', function () {
+    grunt.file.mkdir('target');
+
     grunt.config.get('platforms')
     .filter(({ name }) => /linux-x(86|64)$/.test(name))
     .map(({ name, buildDir }) => {

From a61e91f9b4fcc83219f2c0cbfb45cf457f5e1da0 Mon Sep 17 00:00:00 2001
From: Court Ewing <court@epixa.com>
Date: Thu, 16 Jun 2016 10:36:06 -0400
Subject: [PATCH 2/2] Target directory created from config value

The target directory was being created based on a hardcoded string
rather from the target directory configuration value.

Backport f6196cf6623f39fd1223c938c5958dcbcb92177d
---
 tasks/build/archives.js   | 3 ++-
 tasks/build/osPackages.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tasks/build/archives.js b/tasks/build/archives.js
index 2639ab86e28fc..538a18a721fc5 100644
--- a/tasks/build/archives.js
+++ b/tasks/build/archives.js
@@ -4,6 +4,7 @@ module.exports = function createPackages(grunt) {
   let { execFile } = require('child_process');
   let { all, fromNode } = require('bluebird');
 
+  const targetDir = config.get('target');
   let buildPath = resolve(config.get('root'), 'build');
   let exec = async (cmd, args) => {
     grunt.log.writeln(` > ${cmd} ${args.join(' ')}`);
@@ -29,7 +30,7 @@ module.exports = function createPackages(grunt) {
       grunt.config.get('platforms')
       .map(async platform => {
 
-        grunt.file.mkdir('target');
+        grunt.file.mkdir(targetDir);
         await archives(platform);
       })
     )
diff --git a/tasks/build/osPackages.js b/tasks/build/osPackages.js
index c19d40d96bf9c..7f9f8f71c6bc9 100644
--- a/tasks/build/osPackages.js
+++ b/tasks/build/osPackages.js
@@ -10,7 +10,7 @@ export default (grunt) => {
   const fpm = args => exec('fpm', args);
 
   grunt.registerTask('_build:osPackages', function () {
-    grunt.file.mkdir('target');
+    grunt.file.mkdir(targetDir);
 
     grunt.config.get('platforms')
     .filter(({ name }) => /linux-x(86|64)$/.test(name))