From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.27219.1577412302936968514 for ; Thu, 26 Dec 2019 18:05:03 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Dec 2019 18:05:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,361,1571727600"; d="scan'208";a="219994267" Received: from jlendah-mobl1.amr.corp.intel.com ([10.254.188.175]) by orsmga006.jf.intel.com with ESMTP; 26 Dec 2019 18:05:01 -0800 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Ashley DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: build_linux_installer.py path fixes Date: Thu, 26 Dec 2019 18:04:52 -0800 Message-Id: <20191227020452.9085-1-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nate DeSimone Make path handling in build_linux_installer.py more platform agnostic Cc: Ashley DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Signed-off-by: Nate DeSimone --- build-scripts/build_linux_installer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/build_linux_installer.py b/build-scripts/build_linux_installer.py index 84ccf79..df316b9 100755 --- a/build-scripts/build_linux_installer.py +++ b/build-scripts/build_linux_installer.py @@ -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('..{0}dist{0}self_extract'.format(os.sep)) 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('..{0}edkrepo_installer'.format(os.sep)) 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('.{0}final_copy.py'.format(os.sep), 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('.{0}final_copy.py'.format(os.sep)) return 0 -- 2.20.1