uclibc.inc,uclibc-config.inc: Untabify python snippets

To appease bitbake

(From OE-Core rev: cf975073a11c93f4a9fb5bdd72c16dc0ca9c3c54)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2012-08-15 23:18:55 -07:00 committed by Richard Purdie
parent 48df3fe947
commit 9a33e7b9a8
2 changed files with 85 additions and 71 deletions

View File

@ -32,84 +32,98 @@ x86_64 \
xtensa \
"
def map_uclibc_arch(a, d):
"""Return the uClibc architecture for the given TARGET_ARCH."""
import re
"""Return the uClibc architecture for the given TARGET_ARCH."""
import re
valid_archs = d.getVar('valid_archs', True).split()
valid_archs = d.getVar('valid_archs', True).split()
if re.match('^(arm|sa110).*', a): return 'arm'
elif re.match('^(i.86|athlon)$', a): return 'i386'
elif re.match('^mips.*', a): return 'mips'
elif re.match('^parisc.*', a): return 'hppa'
elif re.match('^ppc.*', a): return 'powerpc'
elif re.match('^s390.*', a): return 's390'
elif re.match('^sh.*', a): return 'sh'
elif re.match('^(sun|sparc).*', a): return 'sparc'
elif re.match('^xtensa.*', a): return 'xtensa'
elif a in valid_archs: return a
else:
bb.error("cannot map '%s' to a uClibc architecture" % a)
if re.match('^(arm|sa110).*', a):
return 'arm'
elif re.match('^(i.86|athlon)$', a):
return 'i386'
elif re.match('^mips.*', a):
return 'mips'
elif re.match('^parisc.*', a):
return 'hppa'
elif re.match('^ppc.*', a):
return 'powerpc'
elif re.match('^s390.*', a):
return 's390'
elif re.match('^sh.*', a):
return 'sh'
elif re.match('^(sun|sparc).*', a):
return 'sparc'
elif re.match('^xtensa.*', a):
return 'xtensa'
elif a in valid_archs:
return a
else:
bb.error("cannot map '%s' to a uClibc architecture" % a)
export UCLIBC_ARCH = "${@map_uclibc_arch(d.getVar('TARGET_ARCH', True), d)}"
def map_uclibc_abi(o, d):
"""Return the uClibc ABI for the given TARGET_OS."""
import re
"""Return the uClibc ABI for the given TARGET_OS."""
import re
arch = d.getVar('TARGET_ARCH', True)
if map_uclibc_arch(d.getVar('TARGET_ARCH', True), d) == "arm":
if re.match('.*eabi$', o): return 'ARM_EABI'
else: return 'ARM_OABI'
# FIXME: This is inaccurate! Handle o32, n32, n64
elif re.match('^mips.*64$', arch): return 'MIPS_N64_ABI'
elif re.match('^mips.*', arch): return 'MIPS_O32_ABI'
return ""
arch = d.getVar('TARGET_ARCH', True)
if map_uclibc_arch(d.getVar('TARGET_ARCH', True), d) == "arm":
if re.match('.*eabi$', o):
return 'ARM_EABI'
else:
return 'ARM_OABI'
# FIXME: This is inaccurate! Handle o32, n32, n64
elif re.match('^mips.*64$', arch):
return 'MIPS_N64_ABI'
elif re.match('^mips.*', arch):
return 'MIPS_O32_ABI'
return ""
export UCLIBC_ABI = "${@map_uclibc_abi(d.getVar('TARGET_OS', True), d)}"
def map_uclibc_endian(a, d):
"""Return the uClibc endianess for the given TARGET_ARCH."""
import re
"""Return the uClibc endianess for the given TARGET_ARCH."""
import re
# Always BE
if re.match('^(avr32|e1|frv|(parisc|hppa)|m68k|microblaze|powerpc.*|(sparc|sun).*)$', a):
return 'BIG'
# Possibly BE
elif re.match('^(((arm|sa110).*eb)|h8300.*eb|(parisc|hppa).*eb|mips|mips64|sh.*eb|xtensa.*eb)$', a):
return 'BIG'
return 'LITTLE'
# Always BE
if re.match('^(avr32|e1|frv|(parisc|hppa)|m68k|microblaze|powerpc.*|(sparc|sun).*)$', a):
return 'BIG'
# Possibly BE
elif re.match('^(((arm|sa110).*eb)|h8300.*eb|(parisc|hppa).*eb|mips|mips64|sh.*eb|xtensa.*eb)$', a):
return 'BIG'
return 'LITTLE'
export UCLIBC_ENDIAN = "${@map_uclibc_endian(d.getVar('TARGET_ARCH', True), d)}"
# internal helper
def uclibc_cfg(feature, features, tokens, cnf, rem):
if type(tokens) == type(""):
tokens = [tokens]
rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens])
if type(features) == type([]) and feature in features:
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 type(features) == type([]) and feature in features:
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_uclibc_settings(d):
cnf, rem = ([], [])
distro_features = d.getVar('DISTRO_FEATURES', True).split()
uclibc_cfg('ipv4', distro_features, 'UCLIBC_HAS_IPV4', cnf, rem)
uclibc_cfg('ipv6', distro_features, 'UCLIBC_HAS_IPV6', cnf, rem)
uclibc_cfg('largefile', distro_features, 'UCLIBC_HAS_LFS', cnf, rem)
uclibc_cfg('nls', distro_features, 'UCLIBC_HAS_LOCALE', cnf, rem)
uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem)
uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem)
uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem)
uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem)
uclibc_cfg('libc-posix-clang-wchar', distro_features,'UCLIBC_HAS_WCHAR', cnf, rem)
return "\n".join(cnf), "\n".join(rem)
cnf, rem = ([], [])
distro_features = d.getVar('DISTRO_FEATURES', True).split()
uclibc_cfg('ipv4', distro_features, 'UCLIBC_HAS_IPV4', cnf, rem)
uclibc_cfg('ipv6', distro_features, 'UCLIBC_HAS_IPV6', cnf, rem)
uclibc_cfg('largefile', distro_features, 'UCLIBC_HAS_LFS', cnf, rem)
uclibc_cfg('nls', distro_features, 'UCLIBC_HAS_LOCALE', cnf, rem)
uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem)
uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem)
uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem)
uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem)
uclibc_cfg('libc-posix-clang-wchar', distro_features,'UCLIBC_HAS_WCHAR', cnf, rem)
return "\n".join(cnf), "\n".join(rem)
# X, Y = ${@features_to_uclibc_settings(d)}
# unfortunately doesn't seem to work with bitbake, workaround:
def features_to_uclibc_conf(d):
cnf, rem = features_to_uclibc_settings(d)
return cnf
cnf, rem = features_to_uclibc_settings(d)
return cnf
def features_to_uclibc_del(d):
cnf, rem = features_to_uclibc_settings(d)
return rem
cnf, rem = features_to_uclibc_settings(d)
return rem

View File

@ -83,13 +83,13 @@ configmangle = '/^KERNEL_HEADERS/d; \
OE_FEATURES := "${@features_to_uclibc_conf(d)}"
OE_DEL := "${@features_to_uclibc_del(d)}"
python () {
if "${OE_DEL}":
d.setVar('configmangle_append', "${OE_DEL}" + "\n")
if "${OE_FEATURES}":
d.setVar('configmangle_append',
if "${OE_DEL}":
d.setVar('configmangle_append', "${OE_DEL}" + "\n")
if "${OE_FEATURES}":
d.setVar('configmangle_append',
"/^### DISTRO FEATURES$/a\\\n%s\n\n" %
("\\n".join((d.expand("${OE_FEATURES}").split("\n")))))
d.setVar('configmangle_append',
d.setVar('configmangle_append',
"/^### CROSS$/a\\\n%s\n" %
("\\n".join(["CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"",
"UCLIBC_EXTRA_CFLAGS=\"${UCLIBC_EXTRA_CFLAGS}\"",
@ -99,23 +99,23 @@ python () {
"SHARED_LIB_LOADER_PREFIX=\"/lib\"",
])
))
d.setVar('configmangle_append',
d.setVar('configmangle_append',
"/^### TGT$/a\\\nTARGET_ARCH=\"%s\"\\nTARGET_%s=y\n" %
("${UCLIBC_ARCH}", "${UCLIBC_ARCH}"))
d.setVar('configmangle_append',
d.setVar('configmangle_append',
"/^### FPU$/a\\\n%s\n\n" % (["UCLIBC_HAS_FPU=y","# UCLIBC_HAS_FPU is not set"][d.getVar('TARGET_FPU', True) in [ 'soft' ]]))
if "${UCLIBC_ENDIAN}":
d.setVar('configmangle_append',
if "${UCLIBC_ENDIAN}":
d.setVar('configmangle_append',
"/^### ABI$/a\\\nARCH_WANTS_%s_ENDIAN=y\n\n" % ("${UCLIBC_ENDIAN}"))
if "${UCLIBC_ABI}":
d.setVar('configmangle_append',
if "${UCLIBC_ABI}":
d.setVar('configmangle_append',
"/^### ABI$/a\\\nCONFIG_%s=y\n\n" % ("${UCLIBC_ABI}"))
}
python do_patch_append() {
import subprocess
subprocess.call("ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux", shell=True)
subprocess.call("ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm", shell=True)
import subprocess
subprocess.call("ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux", shell=True)
subprocess.call("ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm", shell=True)
}
do_configure() {