mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
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. (From OE-Core rev: d881ec6136255fd0f4a8cf36f9ce148ade02c103) Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
bf7364ec9b
commit
8387f1f000
@@ -60,23 +60,6 @@ def verify_build_env():
|
|||||||
return True
|
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):
|
def find_artifacts(image_name):
|
||||||
"""
|
"""
|
||||||
Gather the build artifacts for the current image (the image_name
|
Gather the build artifacts for the current image (the image_name
|
||||||
|
|||||||
@@ -126,6 +126,22 @@ def set_bitbake_env_lines(bitbake_env_lines):
|
|||||||
def get_bitbake_env_lines():
|
def get_bitbake_env_lines():
|
||||||
return __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):
|
def get_line_val(line, key):
|
||||||
"""
|
"""
|
||||||
Extract the value from the VAR="val" string
|
Extract the value from the VAR="val" string
|
||||||
|
|||||||
Reference in New Issue
Block a user