summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 18:59:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 16:19:19 (GMT)
commit08a38a7865c41ec60f4b993b964f8d477ea0f680 (patch)
treebfbf9bface6e748f3ab50d4a86046fc850b0c153
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>
-rw-r--r--meta/classes/libc-package.bbclass6
-rw-r--r--meta/classes/systemd.bbclass12
-rw-r--r--meta/classes/update-rc.d.bbclass2
-rw-r--r--meta/classes/utils.bbclass2
-rw-r--r--meta/lib/oe/rootfs.py7
-rw-r--r--meta/lib/oe/utils.py13
-rw-r--r--meta/recipes-core/dbus/dbus.inc2
-rw-r--r--meta/recipes-core/systemd/systemd-serialgetty.bb2
-rw-r--r--meta/recipes-core/systemd/systemd_211.bb4
-rw-r--r--meta/recipes-core/udev/udev.inc2
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc4
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc2
-rw-r--r--meta/recipes-devtools/perl/perl-ptest.inc2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb2
15 files changed, 25 insertions, 39 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 0af42a0..c1bc399 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -37,9 +37,9 @@ python __anonymous () {
37 break 37 break
38 38
39 # try to fix disable charsets/locales/locale-code compile fail 39 # try to fix disable charsets/locales/locale-code compile fail
40 if oe.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) and \ 40 if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) and \
41 oe.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d) and \ 41 bb.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d) and \
42 oe.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d): 42 bb.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d):
43 d.setVar('PACKAGE_NO_GCONV', '0') 43 d.setVar('PACKAGE_NO_GCONV', '0')
44 else: 44 else:
45 d.setVar('PACKAGE_NO_GCONV', '1') 45 d.setVar('PACKAGE_NO_GCONV', '1')
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 2bd63a4..a6ad723 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -15,9 +15,9 @@ python __anonymous() {
15 # If the distro features have systemd but not sysvinit, inhibit update-rcd 15 # If the distro features have systemd but not sysvinit, inhibit update-rcd
16 # from doing any work so that pure-systemd images don't have redundant init 16 # from doing any work so that pure-systemd images don't have redundant init
17 # files. 17 # files.
18 if oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): 18 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
19 d.appendVar("DEPENDS", " systemd-systemctl-native") 19 d.appendVar("DEPENDS", " systemd-systemctl-native")
20 if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 20 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
21 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") 21 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
22} 22}
23 23
@@ -57,7 +57,7 @@ fi
57systemd_populate_packages[vardeps] += "systemd_prerm systemd_postinst" 57systemd_populate_packages[vardeps] += "systemd_prerm systemd_postinst"
58 58
59python systemd_populate_packages() { 59python systemd_populate_packages() {
60 if not oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): 60 if not bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
61 return 61 return
62 62
63 def get_package_var(d, var, pkg): 63 def get_package_var(d, var, pkg):
@@ -172,7 +172,7 @@ PACKAGESPLITFUNCS_prepend = "systemd_populate_packages "
172 172
173python rm_systemd_unitdir (){ 173python rm_systemd_unitdir (){
174 import shutil 174 import shutil
175 if not oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): 175 if not bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
176 systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True)) 176 systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True))
177 if os.path.exists(systemd_unitdir): 177 if os.path.exists(systemd_unitdir):
178 shutil.rmtree(systemd_unitdir) 178 shutil.rmtree(systemd_unitdir)
@@ -186,8 +186,8 @@ python rm_sysvinit_initddir (){
186 import shutil 186 import shutil
187 sysv_initddir = oe.path.join(d.getVar("D", True), (d.getVar('INIT_D_DIR', True) or "/etc/init.d")) 187 sysv_initddir = oe.path.join(d.getVar("D", True), (d.getVar('INIT_D_DIR', True) or "/etc/init.d"))
188 188
189 if oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \ 189 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \
190 not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ 190 not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \
191 os.path.exists(sysv_initddir): 191 os.path.exists(sysv_initddir):
192 systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True), "system") 192 systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True), "system")
193 193
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 0ac2af7..81cc976 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -117,7 +117,7 @@ python populate_packages_updatercd () {
117 117
118 # Check that this class isn't being inhibited (generally, by 118 # Check that this class isn't being inhibited (generally, by
119 # systemd.bbclass) before doing any work. 119 # systemd.bbclass) before doing any work.
120 if oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ 120 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \
121 not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True): 121 not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True):
122 pkgs = d.getVar('INITSCRIPT_PACKAGES', True) 122 pkgs = d.getVar('INITSCRIPT_PACKAGES', True)
123 if pkgs == None: 123 if pkgs == None:
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 89ad8c5..0ee13e0 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -24,7 +24,7 @@ def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
24 return oe.utils.version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d) 24 return oe.utils.version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d)
25 25
26def base_contains(variable, checkvalues, truevalue, falsevalue, d): 26def base_contains(variable, checkvalues, truevalue, falsevalue, d):
27 return oe.utils.contains(variable, checkvalues, truevalue, falsevalue, d) 27 return bb.utils.contains(variable, checkvalues, truevalue, falsevalue, d)
28 28
29def base_both_contain(variable1, variable2, checkvalue, d): 29def base_both_contain(variable1, variable2, checkvalue, d):
30 return oe.utils.both_contain(variable1, variable2, checkvalue, d) 30 return oe.utils.both_contain(variable1, variable2, checkvalue, d)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index dddbef4..3d1111a 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 defa536..0a1d108 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
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 5727ae7..8d348f8 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -25,7 +25,7 @@ INITSCRIPT_NAME = "dbus-1"
25INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." 25INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
26 26
27python __anonymous() { 27python __anonymous() {
28 if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 28 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
29 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") 29 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
30} 30}
31 31
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 13b2dba..1c34d5c 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -44,6 +44,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
44 44
45# As this package is tied to systemd, only build it when we're also building systemd. 45# As this package is tied to systemd, only build it when we're also building systemd.
46python () { 46python () {
47 if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): 47 if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
48 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") 48 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
49} 49}
diff --git a/meta/recipes-core/systemd/systemd_211.bb b/meta/recipes-core/systemd/systemd_211.bb
index 44b1965..278de9f 100644
--- a/meta/recipes-core/systemd/systemd_211.bb
+++ b/meta/recipes-core/systemd/systemd_211.bb
@@ -295,7 +295,7 @@ INITSCRIPT_NAME_udev = "systemd-udevd"
295INITSCRIPT_PARAMS_udev = "start 03 S ." 295INITSCRIPT_PARAMS_udev = "start 03 S ."
296 296
297python __anonymous() { 297python __anonymous() {
298 if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 298 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
299 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") 299 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
300} 300}
301 301
@@ -348,6 +348,6 @@ pkg_prerm_udev-hwdb () {
348# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so 348# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so
349# that we don't build both udev and systemd in world builds. 349# that we don't build both udev and systemd in world builds.
350python () { 350python () {
351 if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): 351 if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
352 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") 352 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
353} 353}
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 1b22525..f9d544e 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -99,7 +99,7 @@ do_install_append () {
99 99
100# As systemd also builds udev, skip this package if we're doing a systemd build. 100# As systemd also builds udev, skip this package if we're doing a systemd build.
101python () { 101python () {
102 if oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): 102 if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
103 raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES") 103 raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
104} 104}
105do_compile_ptest() { 105do_compile_ptest() {
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index eef7ce9..ca44e98 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -17,7 +17,7 @@ PARALLEL_MAKE = ""
17inherit autotools gettext perlnative pkgconfig systemd 17inherit autotools gettext perlnative pkgconfig systemd
18 18
19python () { 19python () {
20 if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 20 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
21 pn = d.getVar('PN', True) 21 pn = d.getVar('PN', True)
22 d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'dpkg-configure.service') 22 d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'dpkg-configure.service')
23} 23}
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index feb402e..1e00249 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -19,7 +19,7 @@ def get_gcc_fpu_setting(bb, d):
19get_gcc_fpu_setting[vardepvalue] = "${@get_gcc_fpu_setting(bb, d)}" 19get_gcc_fpu_setting[vardepvalue] = "${@get_gcc_fpu_setting(bb, d)}"
20 20
21def get_gcc_mips_plt_setting(bb, d): 21def get_gcc_mips_plt_setting(bb, d):
22 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'mips', 'mipsel' ] and oe.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d): 22 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'mips', 'mipsel' ] and bb.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d):
23 return "--with-mips-plt" 23 return "--with-mips-plt"
24 return "" 24 return ""
25 25
@@ -32,7 +32,7 @@ def get_gcc_multiarch_setting(bb, d):
32 "sparc": "--enable-targets=all", 32 "sparc": "--enable-targets=all",
33 } 33 }
34 34
35 if oe.utils.contains('DISTRO_FEATURES', 'multiarch', True, False, d): 35 if bb.utils.contains('DISTRO_FEATURES', 'multiarch', True, False, d):
36 if target_arch in multiarch_options : 36 if target_arch in multiarch_options :
37 return multiarch_options[target_arch] 37 return multiarch_options[target_arch]
38 return "" 38 return ""
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 9f87df5..198e500 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -17,7 +17,7 @@ do_configure_prepend() {
17inherit autotools pkgconfig systemd 17inherit autotools pkgconfig systemd
18 18
19python () { 19python () {
20 if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 20 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
21 pn = d.getVar('PN', True) 21 pn = d.getVar('PN', True)
22 d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'opkg-configure.service') 22 d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'opkg-configure.service')
23} 23}
diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc
index 914ca0f..9ef7d0a 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/meta/recipes-devtools/perl/perl-ptest.inc
@@ -42,7 +42,7 @@ python populate_packages_prepend() {
42 # Put all *.t files from the lib dir in the ptest package 42 # Put all *.t files from the lib dir in the ptest package
43 # do_split_packages requires a pair of () in the regex, but we have nothing 43 # do_split_packages requires a pair of () in the regex, but we have nothing
44 # to match, so use an empty pair. 44 # to match, so use an empty pair.
45 if oe.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): 45 if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d):
46 do_split_packages(d, d.expand('${libdir}/perl/${PV}'), '.*\.t()', 46 do_split_packages(d, d.expand('${libdir}/perl/${PV}'), '.*\.t()',
47 '${PN}-ptest%s', '%s', recursive=True, match_path=True) 47 '${PN}-ptest%s', '%s', recursive=True, match_path=True)
48} 48}
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
index 97941ec..454d0a1 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
@@ -42,7 +42,7 @@ do_compile_prepend_armv7a () {
42} 42}
43 43
44python () { 44python () {
45 if not oe.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d): 45 if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d):
46 raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES") 46 raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES")
47} 47}
48 48