From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
 by mx.groups.io with SMTP id smtpd.web11.3775.1578618251705644191
 for <devel@edk2.groups.io>;
 Thu, 09 Jan 2020 17:04:11 -0800
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: nathaniel.l.desimone@intel.com)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga001.jf.intel.com ([10.7.209.18])
  by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jan 2020 17:04:11 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.69,414,1571727600"; 
   d="scan'208";a="304026097"
Received: from nldesimo-mac02.jf.intel.com ([10.24.15.114])
  by orsmga001.jf.intel.com with ESMTP; 09 Jan 2020 17:04:10 -0800
From: "Nate DeSimone" <nathaniel.l.desimone@intel.com>
To: devel@edk2.groups.io
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>,
	Puja Pandya <puja.pandya@intel.com>,
	Erik Bjorge <erik.c.bjorge@intel.com>,
	Bret Barkelew <Bret.Barkelew@microsoft.com>,
	=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
Subject: [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: build_linux_installer.py path fixes
Date: Thu,  9 Jan 2020 17:03:44 -0800
Message-Id: <20200110010344.11935-1-nathaniel.l.desimone@intel.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make path handling in build_linux_installer.py more platform agnostic

Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
 build-scripts/build_linux_installer.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-scripts/build_linux_installer.py b/build-scripts/build_linux_installer.py
index 84ccf79..4501dec 100755
--- a/build-scripts/build_linux_installer.py
+++ b/build-scripts/build_linux_installer.py
@@ -3,7 +3,7 @@
 ## @file
 # build_linux_installer.py
 #
-# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2018 - 2020, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #

@@ -21,7 +21,7 @@ def main():
         os.environ['BUILD_NUMBER'] = args.build

     # Step 1: Create required directory structure
-    dist_root = os.path.abspath('../dist/self_extract')
+    dist_root = os.path.abspath(os.path.join('..', 'dist', 'self_extract'))
     if not os.path.isdir(os.path.join(dist_root, 'wheels')):
         os.makedirs(os.path.join(dist_root, 'wheels'))
     if not os.path.isdir(os.path.join(dist_root, 'config')):
@@ -35,7 +35,7 @@ def main():
         return 1

     # Step 3: Copy required files
-    inst_root = os.path.abspath('../edkrepo_installer')
+    inst_root = os.path.abspath(os.path.join('..', 'edkrepo_installer'))
     ven_root = os.path.join(inst_root, 'Vendor')
     linux_root = os.path.join(inst_root, 'linux-scripts')
     try:
@@ -55,7 +55,7 @@ def main():

     # Step 4: Package installer files
     try:
-        subprocess.run('./final_copy.py', check=True)
+        subprocess.run('final_copy.py', check=True)
     except:
         print('Failed to generate installer package')
         return 1
@@ -65,7 +65,7 @@ def main():
         shutil.rmtree(dist_root, ignore_errors=True)
     except:
         print('Failed to remove temporary files')
-    os.unlink('./final_copy.py')
+    os.unlink('final_copy.py')

     return 0

--
2.20.1