diff options
105 files changed, 3485 insertions, 389 deletions
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass index d65b5d944a..379defadb2 100644 --- a/classes/cpan-base.bbclass +++ b/classes/cpan-base.bbclass @@ -10,7 +10,7 @@ RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" # Determine the staged version of perl from the perl configuration file def get_perl_version(d): import re - cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d) + cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d) try: f = open(cfg, 'r') except IOError: diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 9ce348ddeb..ce2906159a 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -32,58 +32,57 @@ PACKAGEFUNCS += " do_package_qa " def package_qa_get_machine_dict(): return { "darwin9" : { - "arm" : (40, 0, 0, True, True), + "arm" : ( 40, 0, 0, True, True), }, "linux" : { - "arm" : (40, 97, 0, True, True), - "armeb": (40, 97, 0, False, True), - "powerpc": (20, 0, 0, False, True), - "i386": ( 3, 0, 0, True, True), - "i486": ( 3, 0, 0, True, True), - "i586": ( 3, 0, 0, True, True), - "i686": ( 3, 0, 0, True, True), - "x86_64": (62, 0, 0, True, False), - "ia64": (50, 0, 0, True, False), - "alpha": (36902, 0, 0, True, False), - "hppa": (15, 3, 0, False, True), - "m68k": ( 4, 0, 0, False, True), - "mips": ( 8, 0, 0, False, True), - "mipsel": ( 8, 0, 0, True, True), - "s390": (22, 0, 0, False, True), - "sh4": (42, 0, 0, True, True), - "sparc": ( 2, 0, 0, False, True), + "arm" : ( 40, 97, 0, True, True), + "armeb": ( 40, 97, 0, False, True), + "i386": ( 3, 0, 0, True, True), + "i486": ( 3, 0, 0, True, True), + "i586": ( 3, 0, 0, True, True), + "i686": ( 3, 0, 0, True, True), + "x86_64": ( 62, 0, 0, True, False), + "ia64": ( 50, 0, 0, True, False), + "alpha": (36902, 0, 0, True, False), + "hppa": ( 15, 3, 0, False, True), + "m68k": ( 4, 0, 0, False, True), + "mips": ( 8, 0, 0, False, True), + "mipsel": ( 8, 0, 0, True, True), + "powerpc": ( 20, 0, 0, False, True), + "s390": ( 22, 0, 0, False, True), + "sh4": ( 42, 0, 0, True, True), + "sparc": ( 2, 0, 0, False, True), }, "linux-uclibc" : { - "arm" : ( 40, 97, 0, True, True), - "armeb": ( 40, 97, 0, False, True), - "powerpc": ( 20, 0, 0, False, True), - "i386": ( 3, 0, 0, True, True), - "i486": ( 3, 0, 0, True, True), - "i586": ( 3, 0, 0, True, True), - "i686": ( 3, 0, 0, True, True), - "x86_64": ( 62, 0, 0, True, False), - "mips": ( 8, 0, 0, False, True), - "mipsel": ( 8, 0, 0, True, True), - "avr32": (6317, 0, 0, False, True), - "sh4": (42, 0, 0, True, True), - + "arm" : ( 40, 97, 0, True, True), + "armeb": ( 40, 97, 0, False, True), + "avr32": ( 6317, 0, 0, False, True), + "i386": ( 3, 0, 0, True, True), + "i486": ( 3, 0, 0, True, True), + "i586": ( 3, 0, 0, True, True), + "i686": ( 3, 0, 0, True, True), + "x86_64": ( 62, 0, 0, True, False), + "mips": ( 8, 0, 0, False, True), + "mipsel": ( 8, 0, 0, True, True), + "powerpc": ( 20, 0, 0, False, True), + "sh4": ( 42, 0, 0, True, True), }, "uclinux-uclibc" : { - "bfin": ( 106, 0, 0, True, True), + "bfin": ( 106, 0, 0, True, True), }, "linux-gnueabi" : { - "arm" : (40, 0, 0, True, True), - "armeb" : (40, 0, 0, False, True), + "arm" : ( 40, 0, 0, True, True), + "armeb" : ( 40, 0, 0, False, True), }, "linux-uclibceabi" : { - "arm" : (40, 0, 0, True, True), - "armeb" : (40, 0, 0, False, True), + "arm" : ( 40, 0, 0, True, True), + "armeb" : ( 40, 0, 0, False, True), }, "linux-gnuspe" : { - "powerpc": (20, 0, 0, False, True), + "powerpc": ( 20, 0, 0, False, True), }, "linux-uclibcspe" : { - "powerpc": (20, 0, 0, False, True), + "powerpc": ( 20, 0, 0, False, True), }, } diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass index 8894fa554c..58c8374fa6 100644 --- a/classes/kernel-arch.bbclass +++ b/classes/kernel-arch.bbclass @@ -7,12 +7,12 @@ valid_archs = "alpha cris ia64 \ x86_64 i386 x86 \ m68knommu m68k ppc powerpc ppc64 \ - sparc sparc64 \ + sparc sparc64 \ arm arm26 \ m32r mips \ - sh sh64 um h8300 \ - parisc s390 v850 \ - avr32 blackfin" + sh sh64 um h8300 \ + parisc s390 v850 \ + avr32 blackfin" def map_kernel_arch(a, d): import re @@ -25,7 +25,7 @@ def map_kernel_arch(a, d): elif re.match('mipsel$', a): return 'mips' elif re.match('sh(3|4)$', a): return 'sh' elif re.match('bfin', a): return 'blackfin' - elif a in valid_archs: return a + elif a in valid_archs: return a else: bb.error("cannot map '%s' to a linux kernel architecture" % a) diff --git a/classes/package.bbclass b/classes/package.bbclass index 77a20bf9c5..c3781330bb 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -1029,23 +1029,23 @@ def package_run_hooks(f, d): bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d) line += 1 fp.close() - anonqueue = bb.data.getVar("__anonqueue", d, True) or [] - body = [x['content'] for x in anonqueue] - flag = { 'python' : 1, 'func' : 1 } - bb.data.setVar("__anonfunc", "\n".join(body), d) - bb.data.setVarFlags("__anonfunc", flag, d) - try: - t = bb.data.getVar('T', d) - bb.data.setVar('T', '${TMPDIR}/', d) - bb.build.exec_func("__anonfunc", d) - bb.data.delVar('T', d) - if t: - bb.data.setVar('T', t, d) - except Exception, e: - bb.msg.debug(1, bb |