diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-12 11:37:45 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-12 11:37:45 +0000 |
| commit | 1c5df3f485ba9992931e06d07f28c57a29d89e5e (patch) | |
| tree | f1f786842f479fcdef015d6bfb430f8ea599fac1 /classes | |
| parent | d6fd6d24ea9cef7d661bed9424f54a7719bea5dc (diff) | |
| parent | 276e2ad3fd901d3fca0291979abc9c10455232ee (diff) | |
propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6c141f8)
to branch 'org.openembedded.dev.avr32' (head 6a2246abf3d894c89fc60280e99b73072b879e02)
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/insane.bbclass | 2 | ||||
| -rw-r--r-- | classes/mono.bbclass | 58 |
2 files changed, 1 insertions, 59 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 83f8c43bba..3fb2d04a81 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -42,7 +42,7 @@ def package_qa_get_machine_dict(): "i486": ( 3, 0, 0, True, True), "i586": ( 3, 0, 0, True, True), "i686": ( 3, 0, 0, True, True), - "x64_64": (62, 0, 0, True, False), + "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), diff --git a/classes/mono.bbclass b/classes/mono.bbclass index c50274ed0c..b7c5439b86 100644 --- a/classes/mono.bbclass +++ b/classes/mono.bbclass @@ -1,61 +1,3 @@ -def mono_get_file_table(packageversion, d): - # The packageversion is currently ignored, but might be used in the future - # if more than one mono version is available and different versions - # need to use different tables - - import bb, sys, os, glob, commands - curdir = os.path.dirname( bb.data.getVar('FILE', d, 1) ) - if curdir not in sys.path: sys.path.append( curdir ) - from mono_files import debian_mono_file_table - - # mono-jay is not being built (for all platforms at least) - IGNORE = ("mono-jay", ) - file_table = [ - # Standard package - {"name": "mono-doc"}, - - # Virtual packages - {"name": "mono"}, - {"name": "mono-runtime"}, - - # Not provided by Debian: - {"name": "libnunit2.2-cil", - "patterns": [ - "/usr/lib/mono/gac/nunit.*/2.2.*", - "/usr/lib/mono/1.0/nunit.*.dll", - "/usr/lib/pkgconfig/mono-nunit.pc", - ], - "assemblies": [ - ("nunit.core", "2.2.0.0"), - ("nunit.framework", "2.2.0.0"), - ("nunit.util", "2.2.0.0"), - ("nunit.mocks", "2.2.8.0"), - ], - }, - {"name": "libmono-cecil0.5-cil", - "patterns": [ - "/usr/lib/mono/gac/Mono.Cecil/0.5.*", - ], - "assemblies": [ - ("Mono.Cecil", "0.5.*"), - ], - }, - {"name": "libmono-db2-1.0-cil", - "patterns": [ - "/usr/lib/mono/gac/IBM.Data.DB2/1.0*", - "/usr/lib/mono/1.0/IBM.Data.DB2.dll", - ], - "assemblies": [ - ("IBM.Data.DB2", "1.0*"), - ], - }, - ] + debian_mono_file_table - - file_table = [e for e in file_table - if not (e.has_key("name") and e["name"] in IGNORE)] - - return file_table - def mono_find_provides_and_requires(files, d): provides = [] requires = [] |