Reviewed-by: Erik Bjorge <erik.c.bjo...@intel.com>
-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desim...@intel.com>
Sent: Thursday, January 9, 2020 5:04 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desim...@intel.com>; Pandya, Puja
<puja.pan...@intel.com>; Bjorge, Erik C <erik.c.bjo...@intel.com>; Bret
Barkelew <bret.barke...@microsoft.com>; Philippe Mathieu-Daudé
<phi...@redhat.com>
Subject: [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: build_linux_installer.py
path fixes
Make path handling in build_linux_installer.py more platform agnostic
Cc: Ashley DeSimone <ashley.e.desim...@intel.com>
Cc: Puja Pandya <puja.pan...@intel.com>
Cc: Erik Bjorge <erik.c.bjo...@intel.com>
Cc: Bret Barkelew <bret.barke...@microsoft.com>
Cc: Philippe Mathieu-Daudé <phi...@redhat.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desim...@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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#53167): https://edk2.groups.io/g/devel/message/53167
Mute This Topic: https://groups.io/mt/69592199/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
