[oe-commits] Tom Zanussi : wic: Move some common items to oe.misc
git at git.openembedded.org
git at git.openembedded.org
Tue Feb 4 13:00:42 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 95ca523949e838850b5afa090ba16f91b8557c12
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=95ca523949e838850b5afa090ba16f91b8557c12
Author: Tom Zanussi <tom.zanussi at linux.intel.com>
Date: Mon Feb 3 19:16:54 2014 -0600
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 <tom.zanussi at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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(-)
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index b3a9c74..0e8b89e 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 4b11195..fe8e55a 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 9edaa23..097d44c 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
More information about the Openembedded-commits
mailing list