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>,
"Philippe Mathieu-Daudé" <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 [thread overview]
Message-ID: <20200110010344.11935-1-nathaniel.l.desimone@intel.com> (raw)
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
next reply other threads:[~2020-01-10 1:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 1:03 Nate DeSimone [this message]
2020-01-10 18:49 ` [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: build_linux_installer.py path fixes Bjorge, Erik C
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200110010344.11935-1-nathaniel.l.desimone@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox