summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-02-03 19:16:54 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-04 12:57:35 +0000
commit534d9ba70a44ad601a242ed09093d21cd3f032f1 (patch)
tree83fd50472d4136c6e9ab28e73cfe08ffc7e4f08d
parent1ddc10565934f3a46a1ab139bbc4a7a9a26cac7c (diff)
downloadpoky-534d9ba70a44ad601a242ed09093d21cd3f032f1.tar.gz
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. (From OE-Core rev: 95ca523949e838850b5afa090ba16f91b8557c12) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/image/engine.py11
-rw-r--r--scripts/lib/mic/kickstart/custom_commands/partition.py2
-rw-r--r--scripts/lib/mic/utils/oe/misc.py12
3 files changed, 12 insertions, 13 deletions
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():
60 return True 60 return True
61 61
62 62
63def get_line_val(line, key):
64 """
65 Extract the value from the VAR="val" string
66 """
67 if line.startswith(key + "="):
68 stripped_line = line.split('=')[1]
69 stripped_line = stripped_line.replace('\"', '')
70 return stripped_line
71 return None
72
73
74def find_artifacts(image_name): 63def find_artifacts(image_name):
75 """ 64 """
76 Gather the build artifacts for the current image (the image_name 65 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 *
31 31
32from mic.kickstart.custom_commands import * 32from mic.kickstart.custom_commands import *
33 33
34BOOTDD_EXTRA_SPACE = 16384
35
36class Wic_PartData(Mic_PartData): 34class Wic_PartData(Mic_PartData):
37 removedKeywords = Mic_PartData.removedKeywords 35 removedKeywords = Mic_PartData.removedKeywords
38 removedAttrs = Mic_PartData.removedAttrs 36 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):
106 106
107def add_wks_var(key, val): 107def add_wks_var(key, val):
108 wks_vars[key] = val 108 wks_vars[key] = val
109
110BOOTDD_EXTRA_SPACE = 16384
111
112def get_line_val(line, key):
113 """
114 Extract the value from the VAR="val" string
115 """
116 if line.startswith(key + "="):
117 stripped_line = line.split('=')[1]
118 stripped_line = stripped_line.replace('\"', '')
119 return stripped_line
120 return None