From nobody Sun May 19 22:19:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+52578+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+52578+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1577412304; cv=none; d=zohomail.com; s=zohoarc; b=ad7kUaRIE8BEGtKZnUdla1idCEoCvc22cnKEHlSp1LqsVtq9zrT0xcUc4OQKLg1aTCplVsFXIulcvQ6r5ETNZzva4Z/qqlkwckG3FbtvFcKh4ySvmQFxdPWzFR0A6VbWC5+PerjhNXQpr3FADZcG5rSWCR5cvuhsl0HGlG7r8dw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577412304; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=4H5ey3g7biyVyT/BqFRXMIGm22oIaF0j7Z3yPFzYvhI=; b=ksOCmTeg5N2PbqOQlpeG+UenPevJcIkQF/arqfXRTavzML8/ypA5YxR4PyBmk3Qfd07rjtf7h17x8MAPu7ImubzMQkWRsY2THv/w0SsQgwOYMx6kOnQMbabimsdMu5eHYy+PumgNJk0q3I83jLh/B3IAOfWfAHgLkHn9Wm/+YQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+52578+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1577412304846134.42247392122363; Thu, 26 Dec 2019 18:05:04 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1AE8YY1788612xh3Ne75Tx8N; Thu, 26 Dec 2019 18:05:04 -0800 X-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 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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" X-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-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,nathaniel.l.desimone@intel.com X-Gm-Message-State: P8HqICiBAbqJhpOY9mFQq4X3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1577412304; bh=hrcU75PhVYCCwZY+Wql+5clqsDWsk2M0q42WruCDMGw=; h=Cc:Date:From:Reply-To:Subject:To; b=cU3v9BEl49WjQW4Db1g46I78cPR8xp8B5H0rMwuKLH+zJnXudJwjUb/Z7/zG9NwA09D KnSBEtI10iAao29f49335FtWl6eJbaa2ZTqk9Gw+2LEhBhZ89KgKnGWPRNxTRgsp0majQ jjzAEQkzk3kANLcWxgn1hju0NqRE72xTS1c= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Ashley 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 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#52578): https://edk2.groups.io/g/devel/message/52578 Mute This Topic: https://groups.io/mt/69280773/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-