From 95ca523949e838850b5afa090ba16f91b8557c12 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 3 Feb 2014 19:16:54 -0600 Subject: wic: Move some common items to oe.misc Move a couple items into a more common location since they're going to need to be accessible from source plugins. Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/image/engine.py | 11 ----------- scripts/lib/mic/kickstart/custom_commands/partition.py | 2 -- scripts/lib/mic/utils/oe/misc.py | 12 ++++++++++++ 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index b3a9c7486e..0e8b89e5f1 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -60,17 +60,6 @@ def verify_build_env(): return True -def get_line_val(line, key): - """ - Extract the value from the VAR="val" string - """ - if line.startswith(key + "="): - stripped_line = line.split('=')[1] - stripped_line = stripped_line.replace('\"', '') - return stripped_line - return None - - def find_artifacts(image_name): """ Gather the build artifacts for the current image (the image_name diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py index 4b11195160..fe8e55a376 100644 --- a/scripts/lib/mic/kickstart/custom_commands/partition.py +++ b/scripts/lib/mic/kickstart/custom_commands/partition.py @@ -31,8 +31,6 @@ from mic.utils.oe.misc import * from mic.kickstart.custom_commands import * -BOOTDD_EXTRA_SPACE = 16384 - class Wic_PartData(Mic_PartData): removedKeywords = Mic_PartData.removedKeywords removedAttrs = Mic_PartData.removedAttrs diff --git a/scripts/lib/mic/utils/oe/misc.py b/scripts/lib/mic/utils/oe/misc.py index 9edaa230e4..097d44c057 100644 --- a/scripts/lib/mic/utils/oe/misc.py +++ b/scripts/lib/mic/utils/oe/misc.py @@ -106,3 +106,15 @@ def get_wks_var(key): def add_wks_var(key, val): wks_vars[key] = val + +BOOTDD_EXTRA_SPACE = 16384 + +def get_line_val(line, key): + """ + Extract the value from the VAR="val" string + """ + if line.startswith(key + "="): + stripped_line = line.split('=')[1] + stripped_line = stripped_line.replace('\"', '') + return stripped_line + return None -- cgit 1.2.3-korg