From c07bfd8e93f7c7d5fd97c18ecf0da91c480308db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Fri, 24 Sep 2021 09:42:40 +0200
Subject: [PATCH] package_release: Store some variables as env file for usage
in later jobs
---
package_release.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/package_release.py b/package_release.py
index c80c9bc2..338781e8 100755
--- a/package_release.py
+++ b/package_release.py
@@ -108,9 +108,9 @@ def main():
# Get bitbake variables from testdata.json file
testdata_files = []
if args.images_dir is not None:
- testdata_files += glob.glob(args.images_dir + "/*.testdata.json")
+ testdata_files += glob.glob(os.path.join(args.images_dir, "*.testdata.json"))
if args.sdk_dir is not None:
- testdata_files += glob.glob(args.sdk_dir + "/*.testdata.json")
+ testdata_files += glob.glob(os.path.join(args.sdk_dir, "*.testdata.json"))
# Debug stuff
if not testdata_files:
@@ -156,7 +156,7 @@ def main():
outlocal_dir = None
if args.doc_dir is not None:
- doc_files = glob.glob(args.doc_dir + "/*.md")
+ doc_files = glob.glob(os.path.join(args.doc_dir, "*.md"))
copy_files(doc_files, "", "", output_dir, outlocal_dir)
if args.images_dir is not None:
@@ -169,9 +169,15 @@ def main():
# Handle SDK if available
if args.sdk_dir is not None:
- sdkfiles = glob.glob(args.sdk_dir + sdkname + "*")
+ sdkfiles = glob.glob(os.path.join(args.sdk_dir, sdkname + "*"))
copy_files(sdkfiles, "", os.path.join(machine, "sdk"), None, outlocal_dir)
+ # Store pathes and other stuff in environment variable file
+ with open("package.env", "w") as env_file:
+ env_file.write("VERSION={}\n".format(version))
+ env_file.write("MACHINE={}\n".format(machine))
+ env_file.write("LOCALDIR={}\n".format(outlocal_dir))
+
if __name__ == "__main__":
main()
--
GitLab