classes/recipes: Remove tab indentations in python code
PATCH 1/2 classes: Remove tab indentations in python code
In reply to Robert YangUse 4 spaces to replace a tab.
Signed-off-by Robert Yang <[email protected]>
--- meta/classes/crosssdk.bbclass | 4 ++-- meta/classes/license.bbclass | 2 +- meta/classes/linux-kernel-base.bbclass | 4 ++-- meta/classes/siteconfig.bbclass | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-)
meta/classes/crosssdk.bbclass +2 -2
@@ -4,8 +4,8 @@ CLASSOVERRIDE = "class-crosssdk" MACHINEOVERRIDES = "" PACKAGE_ARCH = "${SDK_ARCH}" python () { - # set TUNE_PKGARCH to SDK_ARCH - d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) + # set TUNE_PKGARCH to SDK_ARCH + d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) } STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
meta/classes/license.bbclass +1 -1
@@ -309,7 +309,7 @@ def incompatible_license(d, dont_want_licenses, package=None): except oe.license.LicenseError as exc: bb.fatal('%s: %s' % (d.getVar('P'), exc)) return any(not oe.license.license_ok(canonical_license(d, l), \ - dont_want_licenses) for l in licenses) + dont_want_licenses) for l in licenses) def check_license_flags(d): """
meta/classes/linux-kernel-base.bbclass +2 -2
@@ -34,8 +34,8 @@ def get_kernelversion_file(p): return None def linux_module_packages(s, d): - suffix = "" - return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) + suffix = "" + return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) # that's all
meta/classes/siteconfig.bbclass +9 -9
@@ -1,13 +1,13 @@ python siteconfig_do_siteconfig () { - shared_state = sstate_state_fromvars(d) - if shared_state['task'] != 'populate_sysroot': - return - if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME'), 'site_config')): - bb.debug(1, "No site_config directory, skipping do_siteconfig") - return - sstate_install(shared_state, d) - bb.build.exec_func('do_siteconfig_gencache', d) - sstate_clean(shared_state, d) + shared_state = sstate_state_fromvars(d) + if shared_state['task'] != 'populate_sysroot': + return + if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME'), 'site_config')): + bb.debug(1, "No site_config directory, skipping do_siteconfig") + return + sstate_install(shared_state, d) + bb.build.exec_func('do_siteconfig_gencache', d) + sstate_clean(shared_state, d) } EXTRASITECONFIG ?= ""
Signature · 1 line
2.7.4
PATCH 2/2 recipes: Remove tab indentations in python code
In reply to Robert YangUse 4 spaces to replace a tab.
Signed-off-by Robert Yang <[email protected]>
--- meta/recipes-core/busybox/busybox.inc | 42 +++++++++++----------- meta/recipes-core/coreutils/coreutils_8.30.bb | 8 ++--- .../images/build-appliance-image_15.0.0.bb | 6 ++-- meta/recipes-devtools/python/python3_3.5.6.bb | 2 +- .../net-tools/net-tools_1.60-26.bb | 8 ++--- 5 files changed, 33 insertions(+), 33 deletions(-)
meta/recipes-core/busybox/busybox.inc +21 -21
@@ -55,35 +55,35 @@ inherit cml1 systemd update-rc.d ptest # internal helper def busybox_cfg(feature, tokens, cnf, rem): - if type(tokens) == type(""): - tokens = [tokens] - rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens]) - if feature: - cnf.extend([token + '=y' for token in tokens]) - else: - cnf.extend(['# ' + token + ' is not set' for token in tokens]) + if type(tokens) == type(""): + tokens = [tokens] + rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens]) + if feature: + cnf.extend([token + '=y' for token in tokens]) + else: + cnf.extend(['# ' + token + ' is not set' for token in tokens]) # Map distro features to config settings def features_to_busybox_settings(d): - cnf, rem = ([], []) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem) - busybox_cfg(True, 'CONFIG_LFS', cnf, rem) - busybox_cfg(True, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) - return "\n".join(cnf), "\n".join(rem) + cnf, rem = ([], []) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem) + busybox_cfg(True, 'CONFIG_LFS', cnf, rem) + busybox_cfg(True, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) + busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) + return "\n".join(cnf), "\n".join(rem) # X, Y = ${@features_to_busybox_settings(d)} # unfortunately doesn't seem to work with bitbake, workaround: def features_to_busybox_conf(d): - cnf, rem = features_to_busybox_settings(d) - return cnf + cnf, rem = features_to_busybox_settings(d) + return cnf def features_to_busybox_del(d): - cnf, rem = features_to_busybox_settings(d) - return rem + cnf, rem = features_to_busybox_settings(d) + return rem configmangle = '/CONFIG_EXTRA_CFLAGS/d; \ '
meta/recipes-core/coreutils/coreutils_8.30.bb +4 -4
@@ -129,11 +129,11 @@ ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" python __anonymous() { - for prog in d.getVar('base_bindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) - for prog in d.getVar('sbindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) + for prog in d.getVar('sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) } BBCLASSEXTEND = "native nativesdk"
meta/recipes-core/images/build-appliance-image_15.0.0.bb +3 -3
@@ -116,9 +116,9 @@ IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; " addtask rootfs after do_unpack python () { - # Ensure we run these usually noexec tasks - d.delVarFlag("do_fetch", "noexec") - d.delVarFlag("do_unpack", "noexec") + # Ensure we run these usually noexec tasks + d.delVarFlag("do_fetch", "noexec") + d.delVarFlag("do_unpack", "noexec") } create_bundle_files () {
meta/recipes-devtools/python/python3_3.5.6.bb +1 -1
@@ -285,7 +285,7 @@ python(){ for value in python_manifest[key]['files']: d.appendVar('FILES_' + pypackage, ' ' + value) - # Add cached files + # Add cached files if include_pycs == '1': for value in python_manifest[key]['cached']: d.appendVar('FILES_' + pypackage, ' ' + value)
meta/recipes-extended/net-tools/net-tools_1.60-26.bb +4 -4
@@ -121,10 +121,10 @@ ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" ALTERNATIVE_PRIORITY[hostname.1] = "10" python __anonymous() { - for prog in d.getVar('base_sbindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) - for prog in d.getVar('base_bindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) + for prog in d.getVar('base_sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) } ALTERNATIVE_PRIORITY = "100"
Signature · 1 line
2.7.4
cover classes/recipes: Remove tab indentations in python code
The following changes since commit c80972be1f3592d797da9eb0845b739420c6da4a:
maintainers: Add entry for new recipe libdazzle (2018-11-22 10:00:12 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/py
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/py
Robert Yang (2):
classes: Remove tab indentations in python code
recipes: Remove tab indentations in python code
meta/classes/crosssdk.bbclass | 4 +-- meta/classes/license.bbclass | 2 +- meta/classes/linux-kernel-base.bbclass | 4 +-- meta/classes/siteconfig.bbclass | 18 +++++----- meta/recipes-core/busybox/busybox.inc | 42 +++++++++++----------- meta/recipes-core/coreutils/coreutils_8.30.bb | 8 ++--- .../images/build-appliance-image_15.0.0.bb | 6 ++-- meta/recipes-devtools/python/python3_3.5.6.bb | 2 +- .../net-tools/net-tools_1.60-26.bb | 8 ++--- 9 files changed, 47 insertions(+), 47 deletions(-)
Signature · 1 line
2.7.4