summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:19 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit08a38a7865c41ec60f4b993b964f8d477ea0f680 (patch)
treebfbf9bface6e748f3ab50d4a86046fc850b0c153 /meta/lib
parentf11e9e295d7f8a1e0219fb7a45a5a134a773aae2 (diff)
downloadpoky-08a38a7865c41ec60f4b993b964f8d477ea0f680.tar.gz
Globally replace oe.utils.contains to bb.utils.contains
BitBake has the exact same code as oe.utils.contains so there's no reason to duplicate it. We now rely on the bb.utils.contains code for metadata. (From OE-Core rev: 93499ebc46547f5bf6dcecd5a786ead9f726de28) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/rootfs.py7
-rw-r--r--meta/lib/oe/utils.py13
2 files changed, 3 insertions, 17 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index dddbef4d64..3d1111a40a 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -1,6 +1,5 @@
1from abc import ABCMeta, abstractmethod 1from abc import ABCMeta, abstractmethod
2from oe.utils import execute_pre_post_process 2from oe.utils import execute_pre_post_process
3from oe.utils import contains as base_contains
4from oe.package_manager import * 3from oe.package_manager import *
5from oe.manifest import * 4from oe.manifest import *
6import oe.path 5import oe.path
@@ -42,7 +41,7 @@ class Rootfs(object):
42 pass 41 pass
43 42
44 def _insert_feed_uris(self): 43 def _insert_feed_uris(self):
45 if base_contains("IMAGE_FEATURES", "package-management", 44 if bb.utils.contains("IMAGE_FEATURES", "package-management",
46 True, False, self.d): 45 True, False, self.d):
47 self.pm.insert_feeds_uris() 46 self.pm.insert_feeds_uris()
48 47
@@ -108,7 +107,7 @@ class Rootfs(object):
108 107
109 execute_pre_post_process(self.d, post_process_cmds) 108 execute_pre_post_process(self.d, post_process_cmds)
110 109
111 if base_contains("IMAGE_FEATURES", "read-only-rootfs", 110 if bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs",
112 True, False, self.d): 111 True, False, self.d):
113 delayed_postinsts = self._get_delayed_postinsts() 112 delayed_postinsts = self._get_delayed_postinsts()
114 if delayed_postinsts is not None: 113 if delayed_postinsts is not None:
@@ -130,7 +129,7 @@ class Rootfs(object):
130 self._cleanup() 129 self._cleanup()
131 130
132 def _uninstall_uneeded(self): 131 def _uninstall_uneeded(self):
133 if base_contains("IMAGE_FEATURES", "package-management", 132 if bb.utils.contains("IMAGE_FEATURES", "package-management",
134 True, False, self.d): 133 True, False, self.d):
135 return 134 return
136 135
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index defa53679b..0a1d1080c9 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -41,19 +41,6 @@ def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
41 else: 41 else:
42 return falsevalue 42 return falsevalue
43 43
44def contains(variable, checkvalues, truevalue, falsevalue, d):
45 val = d.getVar(variable, True)
46 if not val:
47 return falsevalue
48 val = set(val.split())
49 if isinstance(checkvalues, basestring):
50 checkvalues = set(checkvalues.split())
51 else:
52 checkvalues = set(checkvalues)
53 if checkvalues.issubset(val):
54 return truevalue
55 return falsevalue
56
57def both_contain(variable1, variable2, checkvalue, d): 44def both_contain(variable1, variable2, checkvalue, d):
58 if d.getVar(variable1,1).find(checkvalue) != -1 and d.getVar(variable2,1).find(checkvalue) != -1: 45 if d.getVar(variable1,1).find(checkvalue) != -1 and d.getVar(variable2,1).find(checkvalue) != -1:
59 return checkvalue 46 return checkvalue