Patchwork [1/3] wic: Move find_bitbake_env_line() to oe.misc

login
register
mail settings
Submitter João Henrique Freitas
Date April 5, 2014, 2:14 a.m.
Message ID <1396664051-11430-2-git-send-email-joaohf@gmail.com>
Download mbox | patch
Permalink /patch/70173/
State New
Headers show

Comments

João Henrique Freitas - April 5, 2014, 2:14 a.m.
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>
---
 scripts/lib/image/engine.py      | 17 -----------------
 scripts/lib/mic/utils/oe/misc.py | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

Patch

diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 0643780..311737a 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 7ad3aa9..5436a0a 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