diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2018-11-23 19:04:52 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-23 23:35:19 +0000 |
| commit | fec5323dba7e23a42073995020c7336f3e6a7de1 (patch) | |
| tree | ea3788c90c0d1dcd2993d1a855cc590455ab5f56 | |
| parent | 00379e95894de195788b80b7dec9ba5dfe3ad1bd (diff) | |
| download | poky-fec5323dba7e23a42073995020c7336f3e6a7de1.tar.gz | |
recipes: Remove tab indentations in python code
Use 4 spaces to replace a tab.
(From OE-Core rev: cbb6743d46752481782789fa1a0dfade11057114)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 42 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.30.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-core/images/build-appliance-image_15.0.0.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3_3.5.6.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 8 |
5 files changed, 33 insertions, 33 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index b8d8858e5c..6abbb5492f 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
| @@ -55,35 +55,35 @@ inherit cml1 systemd update-rc.d ptest | |||
| 55 | 55 | ||
| 56 | # internal helper | 56 | # internal helper |
| 57 | def busybox_cfg(feature, tokens, cnf, rem): | 57 | def busybox_cfg(feature, tokens, cnf, rem): |
| 58 | if type(tokens) == type(""): | 58 | if type(tokens) == type(""): |
| 59 | tokens = [tokens] | 59 | tokens = [tokens] |
| 60 | rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens]) | 60 | rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens]) |
| 61 | if feature: | 61 | if feature: |
| 62 | cnf.extend([token + '=y' for token in tokens]) | 62 | cnf.extend([token + '=y' for token in tokens]) |
| 63 | else: | 63 | else: |
| 64 | cnf.extend(['# ' + token + ' is not set' for token in tokens]) | 64 | cnf.extend(['# ' + token + ' is not set' for token in tokens]) |
| 65 | 65 | ||
| 66 | # Map distro features to config settings | 66 | # Map distro features to config settings |
| 67 | def features_to_busybox_settings(d): | 67 | def features_to_busybox_settings(d): |
| 68 | cnf, rem = ([], []) | 68 | cnf, rem = ([], []) |
| 69 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem) | 69 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem) |
| 70 | busybox_cfg(True, 'CONFIG_LFS', cnf, rem) | 70 | busybox_cfg(True, 'CONFIG_LFS', cnf, rem) |
| 71 | busybox_cfg(True, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) | 71 | busybox_cfg(True, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) |
| 72 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) | 72 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) |
| 73 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) | 73 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) |
| 74 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) | 74 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) |
| 75 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) | 75 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) |
| 76 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) | 76 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) |
| 77 | return "\n".join(cnf), "\n".join(rem) | 77 | return "\n".join(cnf), "\n".join(rem) |
| 78 | 78 | ||
| 79 | # X, Y = ${@features_to_busybox_settings(d)} | 79 | # X, Y = ${@features_to_busybox_settings(d)} |
| 80 | # unfortunately doesn't seem to work with bitbake, workaround: | 80 | # unfortunately doesn't seem to work with bitbake, workaround: |
| 81 | def features_to_busybox_conf(d): | 81 | def features_to_busybox_conf(d): |
| 82 | cnf, rem = features_to_busybox_settings(d) | 82 | cnf, rem = features_to_busybox_settings(d) |
| 83 | return cnf | 83 | return cnf |
| 84 | def features_to_busybox_del(d): | 84 | def features_to_busybox_del(d): |
| 85 | cnf, rem = features_to_busybox_settings(d) | 85 | cnf, rem = features_to_busybox_settings(d) |
| 86 | return rem | 86 | return rem |
| 87 | 87 | ||
| 88 | configmangle = '/CONFIG_EXTRA_CFLAGS/d; \ | 88 | configmangle = '/CONFIG_EXTRA_CFLAGS/d; \ |
| 89 | ' | 89 | ' |
diff --git a/meta/recipes-core/coreutils/coreutils_8.30.bb b/meta/recipes-core/coreutils/coreutils_8.30.bb index 205ba4a0aa..8f4ee55712 100644 --- a/meta/recipes-core/coreutils/coreutils_8.30.bb +++ b/meta/recipes-core/coreutils/coreutils_8.30.bb | |||
| @@ -129,11 +129,11 @@ ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" | |||
| 129 | ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" | 129 | ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" |
| 130 | 130 | ||
| 131 | python __anonymous() { | 131 | python __anonymous() { |
| 132 | for prog in d.getVar('base_bindir_progs').split(): | 132 | for prog in d.getVar('base_bindir_progs').split(): |
| 133 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) | 133 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) |
| 134 | 134 | ||
| 135 | for prog in d.getVar('sbindir_progs').split(): | 135 | for prog in d.getVar('sbindir_progs').split(): |
| 136 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) | 136 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | BBCLASSEXTEND = "native nativesdk" | 139 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index f03ef969ad..e88eed90ca 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb | |||
| @@ -116,9 +116,9 @@ IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; " | |||
| 116 | addtask rootfs after do_unpack | 116 | addtask rootfs after do_unpack |
| 117 | 117 | ||
| 118 | python () { | 118 | python () { |
| 119 | # Ensure we run these usually noexec tasks | 119 | # Ensure we run these usually noexec tasks |
| 120 | d.delVarFlag("do_fetch", "noexec") | 120 | d.delVarFlag("do_fetch", "noexec") |
| 121 | d.delVarFlag("do_unpack", "noexec") | 121 | d.delVarFlag("do_unpack", "noexec") |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | create_bundle_files () { | 124 | create_bundle_files () { |
diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb index 31f8eada11..5408e3f9fc 100644 --- a/meta/recipes-devtools/python/python3_3.5.6.bb +++ b/meta/recipes-devtools/python/python3_3.5.6.bb | |||
| @@ -285,7 +285,7 @@ python(){ | |||
| 285 | for value in python_manifest[key]['files']: | 285 | for value in python_manifest[key]['files']: |
| 286 | d.appendVar('FILES_' + pypackage, ' ' + value) | 286 | d.appendVar('FILES_' + pypackage, ' ' + value) |
| 287 | 287 | ||
| 288 | # Add cached files | 288 | # Add cached files |
| 289 | if include_pycs == '1': | 289 | if include_pycs == '1': |
| 290 | for value in python_manifest[key]['cached']: | 290 | for value in python_manifest[key]['cached']: |
| 291 | d.appendVar('FILES_' + pypackage, ' ' + value) | 291 | d.appendVar('FILES_' + pypackage, ' ' + value) |
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index a4e3285cdb..b565fd0932 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb | |||
| @@ -121,10 +121,10 @@ ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" | |||
| 121 | ALTERNATIVE_PRIORITY[hostname.1] = "10" | 121 | ALTERNATIVE_PRIORITY[hostname.1] = "10" |
| 122 | 122 | ||
| 123 | python __anonymous() { | 123 | python __anonymous() { |
| 124 | for prog in d.getVar('base_sbindir_progs').split(): | 124 | for prog in d.getVar('base_sbindir_progs').split(): |
| 125 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) | 125 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) |
| 126 | for prog in d.getVar('base_bindir_progs').split(): | 126 | for prog in d.getVar('base_bindir_progs').split(): |
| 127 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) | 127 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) |
| 128 | } | 128 | } |
| 129 | ALTERNATIVE_PRIORITY = "100" | 129 | ALTERNATIVE_PRIORITY = "100" |
| 130 | 130 | ||
