diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl-ptest.inc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index eef7ce9d40..ca44e98232 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc | |||
@@ -17,7 +17,7 @@ PARALLEL_MAKE = "" | |||
17 | inherit autotools gettext perlnative pkgconfig systemd | 17 | inherit autotools gettext perlnative pkgconfig systemd |
18 | 18 | ||
19 | python () { | 19 | python () { |
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 feb402e75d..1e00249b19 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): | |||
19 | get_gcc_fpu_setting[vardepvalue] = "${@get_gcc_fpu_setting(bb, d)}" | 19 | get_gcc_fpu_setting[vardepvalue] = "${@get_gcc_fpu_setting(bb, d)}" |
20 | 20 | ||
21 | def get_gcc_mips_plt_setting(bb, d): | 21 | def 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 9f87df551e..198e5001af 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc | |||
@@ -17,7 +17,7 @@ do_configure_prepend() { | |||
17 | inherit autotools pkgconfig systemd | 17 | inherit autotools pkgconfig systemd |
18 | 18 | ||
19 | python () { | 19 | python () { |
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 914ca0f4c0..9ef7d0a262 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 | } |