aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-04-04 23:14:09 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-13 19:35:06 +0100
commitd881ec6136255fd0f4a8cf36f9ce148ade02c103 (patch)
tree96976554dad97ddd928ae28182bfbf7f61a6512c
parent4d2a7f47a9830788455afe00a7c6a857cebbcb81 (diff)
downloadopenembedded-core-contrib-d881ec6136255fd0f4a8cf36f9ce148ade02c103.tar.gz
openembedded-core-contrib-d881ec6136255fd0f4a8cf36f9ce148ade02c103.tar.bz2
openembedded-core-contrib-d881ec6136255fd0f4a8cf36f9ce148ade02c103.zip
wic: Move find_bitbake_env_line() to oe.misc
Move find_bitbake_env_line() since they're going to need to be accessible from source plugins. Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/image/engine.py17
-rw-r--r--scripts/lib/mic/utils/oe/misc.py16
2 files changed, 16 insertions, 17 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 0643780f1a1..311737a5c08 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -60,23 +60,6 @@ def verify_build_env():
return True
-def find_bitbake_env_lines(image_name):
- """
- If image_name is empty, plugins might still be able to use the
- environment, so set it regardless.
- """
- if image_name:
- bitbake_env_cmd = "bitbake -e %s" % image_name
- else:
- bitbake_env_cmd = "bitbake -e"
- rc, bitbake_env_lines = exec_cmd(bitbake_env_cmd)
- if rc != 0:
- print "Couldn't get '%s' output." % bitbake_env_cmd
- return None
-
- return bitbake_env_lines
-
-
def find_artifacts(image_name):
"""
Gather the build artifacts for the current image (the image_name
diff --git a/scripts/lib/mic/utils/oe/misc.py b/scripts/lib/mic/utils/oe/misc.py
index 7ad3aa96850..5436a0a1fe3 100644
--- a/scripts/lib/mic/utils/oe/misc.py
+++ b/scripts/lib/mic/utils/oe/misc.py
@@ -126,6 +126,22 @@ def set_bitbake_env_lines(bitbake_env_lines):
def get_bitbake_env_lines():
return __bitbake_env_lines
+def find_bitbake_env_lines(image_name):
+ """
+ If image_name is empty, plugins might still be able to use the
+ environment, so set it regardless.
+ """
+ if image_name:
+ bitbake_env_cmd = "bitbake -e %s" % image_name
+ else:
+ bitbake_env_cmd = "bitbake -e"
+ rc, bitbake_env_lines = exec_cmd(bitbake_env_cmd)
+ if rc != 0:
+ print "Couldn't get '%s' output." % bitbake_env_cmd
+ return None
+
+ return bitbake_env_lines
+
def get_line_val(line, key):
"""
Extract the value from the VAR="val" string