From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.886.1577992921516308421 for ; Thu, 02 Jan 2020 11:22:01 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: ashley.e.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jan 2020 11:22:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,387,1571727600"; d="scan'208";a="419808870" Received: from orsmsx108.amr.corp.intel.com ([10.22.240.6]) by fmsmga005.fm.intel.com with ESMTP; 02 Jan 2020 11:22:01 -0800 Received: from orsmsx116.amr.corp.intel.com ([169.254.7.30]) by ORSMSX108.amr.corp.intel.com ([169.254.2.134]) with mapi id 14.03.0439.000; Thu, 2 Jan 2020 11:22:00 -0800 From: "Desimone, Ashley E" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Pandya, Puja" , "Bjorge, Erik C" , Bret Barkelew Subject: Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: build_linux_installer.py path fixes Thread-Topic: [edk2-staging/EdkRepo] [PATCH] EdkRepo: build_linux_installer.py path fixes Thread-Index: AQHVvFoScKlNPJd+zEyGM1pFNkC+gKfXywKQ Date: Thu, 2 Jan 2020 19:22:00 +0000 Message-ID: <4CF3A9EB60ABDA47BE7821A4DA3A0A3353CCB72A@ORSMSX116.amr.corp.intel.com> References: <20191227020452.9085-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20191227020452.9085-1-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ashley DeSimone -----Original Message----- From: Desimone, Nathaniel L=20 Sent: Thursday, December 26, 2019 6:05 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Desimone, Ashle= y E ; Pandya, Puja ; Bj= orge, Erik C ; Bret Barkelew Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: build_linux_installer.py p= ath fixes 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_l= inux_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'] =3D args.build # Step 1: Create required directory structure - dist_root =3D os.path.abspath('../dist/self_extract') + dist_root =3D 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 =3D os.path.abspath('../edkrepo_installer') + inst_root =3D os.path.abspath('..{0}edkrepo_installer'.format(os.sep)) ven_root =3D os.path.join(inst_root, 'Vendor') linux_root =3D 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=3DTrue) + subprocess.run('.{0}final_copy.py'.format(os.sep), check=3DTrue) except: print('Failed to generate installer package') return 1 @@ -65,7 +65,7 @@ def main(): shutil.rmtree(dist_root, ignore_errors=3DTrue) 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