6 files changed, 62 insertions, 62 deletions

diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.15.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.15.bb
index 493eb61a7a..422e0bb118 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.15.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.15.bb
@@ -20,7 +20,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h
 S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef"
 
 do_unpack_append() {
-        bb.build.exec_func('do_move_ports', d)
+    bb.build.exec_func('do_move_ports', d)
 }
 
 do_move_ports() {
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb
index 0f870be10c..47f0834003 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb
@@ -20,7 +20,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h
 S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef"
 
 do_unpack_append() {
-        bb.build.exec_func('do_move_ports', d)
+    bb.build.exec_func('do_move_ports', d)
 }
 
 do_move_ports() {
diff --git a/meta/recipes-core/eglibc/eglibc-ld.inc b/meta/recipes-core/eglibc/eglibc-ld.inc
index b3eb46e160..e596b5591f 100644
--- a/meta/recipes-core/eglibc/eglibc-ld.inc
+++ b/meta/recipes-core/eglibc/eglibc-ld.inc
@@ -1,54 +1,54 @@
 def ld_append_if_tune_exists(d, infos, dict):
-        tune = d.getVar("DEFAULTTUNE", True) or ""
-        libdir = d.getVar("base_libdir", True) or ""
-        if dict.has_key(tune):
-                infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }')
-                infos['lddrewrite'].add(libdir+'/'+dict[tune][0])
+    tune = d.getVar("DEFAULTTUNE", True) or ""
+    libdir = d.getVar("base_libdir", True) or ""
+    if dict.has_key(tune):
+        infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }')
+        infos['lddrewrite'].add(libdir+'/'+dict[tune][0])
 
 def eglibc_dl_info(d):
-        ld_info_all = {
-                "mips": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips64": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mipsel": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips64el-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips64el": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips64-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips64-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips64el-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "mips64el-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "powerpc": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "powerpc-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
-                "powerpc64": ["ld64.so.1", "FLAG_ELF_LIBC6"],
-                "powerpc64-nf": ["ld64.so.1", "FLAG_ELF_LIBC6"],
-                "core2": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
-                "core2-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
-                "x86": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
-                "x86-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
-                "i586": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
-        }
+    ld_info_all = {
+        "mips": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips64": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mipsel": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips64el-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips64el": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips64-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips64-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips64el-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mips64el-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "powerpc": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "powerpc-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "powerpc64": ["ld64.so.1", "FLAG_ELF_LIBC6"],
+        "powerpc64-nf": ["ld64.so.1", "FLAG_ELF_LIBC6"],
+        "core2": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
+        "core2-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
+        "x86": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
+        "x86-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
+        "i586": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
+    }
 
-        infos = {'ldconfig':set(), 'lddrewrite':set()}
-        ld_append_if_tune_exists(d, infos, ld_info_all)
+    infos = {'ldconfig':set(), 'lddrewrite':set()}
+    ld_append_if_tune_exists(d, infos, ld_info_all)
 
-        #DEFAULTTUNE_MULTILIB_ORIGINAL
-        original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True)
-        if original_tune:
-                localdata = bb.data.createCopy(d)
-                localdata.setVar("DEFAULTTUNE", original_tune)
-                ld_append_if_tune_exists(localdata, infos, ld_info_all)
+    #DEFAULTTUNE_MULTILIB_ORIGINAL
+    original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True)
+    if original_tune:
+        localdata = bb.data.createCopy(d)
+        localdata.setVar("DEFAULTTUNE", original_tune)
+        ld_append_if_tune_exists(localdata, infos, ld_info_all)
 
-        variants = d.getVar("MULTILIB_VARIANTS", True) or ""
-        for item in variants.split():
-                localdata = bb.data.createCopy(d)
-                overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
-                localdata.setVar("OVERRIDES", overrides)
-                bb.data.update_data(localdata)
-                ld_append_if_tune_exists(localdata, infos, ld_info_all)
-        infos['ldconfig'] = ','.join(infos['ldconfig'])
-        infos['lddrewrite'] = ' '.join(infos['lddrewrite'])
-        return infos
+    variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+    for item in variants.split():
+        localdata = bb.data.createCopy(d)
+        overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
+        localdata.setVar("OVERRIDES", overrides)
+        bb.data.update_data(localdata)
+        ld_append_if_tune_exists(localdata, infos, ld_info_all)
+    infos['ldconfig'] = ','.join(infos['ldconfig'])
+    infos['lddrewrite'] = ' '.join(infos['lddrewrite'])
+    return infos
 
 EGLIBC_KNOWN_INTERPRETER_NAMES = "${@eglibc_dl_info(d)['ldconfig']}"
 RTLDLIST = "${@eglibc_dl_info(d)['lddrewrite']}"
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc
index bd90ee79a2..6009278577 100644
--- a/meta/recipes-core/eglibc/eglibc-options.inc
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -1,14 +1,14 @@
 def eglibc_cfg(feature, features, tokens, cnf):
-        if type(tokens) == type(""):
-                tokens = [tokens]
-        if type(features) == type([]) and feature in features:
-                cnf.extend([token + ' = y' for token in tokens])
-        else:
-                for token in tokens:
-                        cnf.extend([token + ' = n'])
-                        if token == 'OPTION_EGLIBC_NSSWITCH':
-                                cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"])
-                                cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"])
+    if type(tokens) == type(""):
+        tokens = [tokens]
+    if type(features) == type([]) and feature in features:
+        cnf.extend([token + ' = y' for token in tokens])
+    else:
+        for token in tokens:
+            cnf.extend([token + ' = n'])
+            if token == 'OPTION_EGLIBC_NSSWITCH':
+                cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"])
+                cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"])
 
 # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code
 def distro_features_check_deps(distro_features):
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 110febfe52..4d4d2cf2ed 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -78,7 +78,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
 
 do_unpack_append() {
-        bb.build.exec_func('do_move_ports', d)
+    bb.build.exec_func('do_move_ports', d)
 }
 
 do_move_ports() {
@@ -89,8 +89,8 @@ do_move_ports() {
 }
 
 do_patch_append() {
-        bb.build.exec_func('do_fix_ia_headers', d)
-        bb.build.exec_func('do_fix_readlib_c', d)
+    bb.build.exec_func('do_fix_ia_headers', d)
+    bb.build.exec_func('do_fix_readlib_c', d)
 }
 
 # for mips eglibc now builds syscall tables for all abi's
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 23a4130185..7e7d68b87d 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -76,7 +76,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
 
 do_unpack_append() {
-        bb.build.exec_func('do_move_ports', d)
+    bb.build.exec_func('do_move_ports', d)
 }
 
 do_move_ports() {
@@ -87,7 +87,7 @@ do_move_ports() {
 }
 
 do_patch_append() {
-        bb.build.exec_func('do_fix_readlib_c', d)
+    bb.build.exec_func('do_fix_readlib_c', d)
 }
 
 # for mips eglibc now builds syscall tables for all abi's