From nobody Thu Apr 18 18:43:09 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+53104+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+53104+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1578618252; cv=none; d=zohomail.com; s=zohoarc; b=FAJFcgJT/vPL+xJn5fbd/S9nPzrtGfEPPQr+ZhSDem0/sdFGZskr1ZFq6EhkhO/N/Xmm7TwNfPkO3qv+Ow8esuXqlEe2rWnJrRT/9RTVMgqWsJoQf988V9GBoNKmFaSdx7/ViSxYjXZkzhf/NqAViQR1pLIufIg9KTr4dhGVuFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578618252; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=NKHy9OvGKkXhPBcIglgOgoJhCb3Vzlie3a34fJ/xsTs=; b=Qz2wXWNmeNNM4Q7TZYa1bmL663U7bJKatSq56dNt9Jb8tDI96jp4pKjCzAcCA4mSrDIz7ilqZHf93JdXMTyK0ATCN+XzxXi/rP6jyYs8ch4+31ZE734s6AqLNg6C7IGyS+MOL41tj6B5BLPUHTbSOhmVZpH2cqsni1IQthxpGQY= 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+53104+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 1578618252681770.0440399490492; Thu, 9 Jan 2020 17:04:12 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id DcvtYY1788612x4GPs1chLks; Thu, 09 Jan 2020 17:04:12 -0800 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.3775.1578618251705644191 for ; Thu, 09 Jan 2020 17:04:11 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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" X-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" To: devel@edk2.groups.io Cc: Ashley DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [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> 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: mqPVDvepQZSRpYK8Ai9Ho8k7x1787277AA= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1578618252; bh=0MzQWy5JxPRFNMPo+YR0kQLawLwE4KhrvJbDSe45iIc=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=W9WOskrBQkF+9ayaXGzXT4cJbqTdTG6i1ALs6t67CfdAACYSn1fE5SMp1ljc2/xfUoN 7c/CEeNkft6gFv6HY3vXy9lSmlEX7npQZxC7N0U0VeNoWDdlEzidUZMJjKrLayeKWtSze hMOMfKSImSRQOzshRCp+2cFMM/XMQDDTOno= X-ZohoMail-DKIM: pass (identity @groups.io) Make path handling in build_linux_installer.py more platform agnostic Cc: Ashley DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Nate DeSimone Reviewed-by: Erik Bjorge --- 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_l= inux_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.
+# Copyright (c) 2018 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -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(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 =3D os.path.abspath('../edkrepo_installer') + inst_root =3D os.path.abspath(os.path.join('..', 'edkrepo_installer')) 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('final_copy.py', 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('final_copy.py') 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 (#53104): https://edk2.groups.io/g/devel/message/53104 Mute This Topic: https://groups.io/mt/69592199/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-