diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-06-11 18:12:56 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-06-11 18:12:56 +0000 |
commit | 4dd539244ec50d3e3374442df1ad58195f1eabd8 (patch) | |
tree | 2eb7a402a3888e7fe5373c75c98d616d5802b11a /classes | |
parent | bc00650a333196197371dfb9dcf7215a08e04c16 (diff) | |
parent | c0f3c16659bb75b2d67a50c245f93cf338ef22fe (diff) |
merge of '954be7b7073966385f751b525d692dfa6eb1a918'
and 'fbec129540c1d0a2c22d3c5bd955a17e6c9b9770'
Diffstat (limited to 'classes')
-rw-r--r-- | classes/insane.bbclass | 3 | ||||
-rw-r--r-- | classes/kernel-arch.bbclass | 5 | ||||
-rw-r--r-- | classes/qmake-base.bbclass | 2 | ||||
-rw-r--r-- | classes/siteinfo.bbclass | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index e6f4f1440d..d983af3f9f 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -58,7 +58,8 @@ def package_qa_get_machine_dict(): "armeb": ( 40, 97, 0, False, True), "powerpc": ( 20, 0, 0, False, True), "mipsel": ( 8, 0, 0, True, True), - "avr32": (6317, 0, 0, False, True), + "avr32": (6317, 0, 0, False, True), + "bfin": ( 0, 0, 0, True, True), }, "linux-gnueabi" : { "arm" : (40, 0, 0, True, True), diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass index 3804cd71b8..9208c3507a 100644 --- a/classes/kernel-arch.bbclass +++ b/classes/kernel-arch.bbclass @@ -12,7 +12,7 @@ valid_archs = "alpha cris ia64 \ m32r mips \ sh sh64 um h8300 \ parisc s390 v850 \ - avr32" + avr32 blackfin" def map_kernel_arch(a, d): import bb, re @@ -24,7 +24,8 @@ def map_kernel_arch(a, d): elif re.match('armeb$', a): return 'arm' elif re.match('mipsel$', a): return 'mips' elif re.match('sh(3|4)$', a): return 'sh' - elif a in valid_archs: return a + elif re.match('bfin', a): return 'blackfin' + elif a in valid_archs: return a else: bb.error("cannot map '%s' to a linux kernel architecture" % a) diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass index 5ca3ee2904..09694e97b8 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake-base.bbclass @@ -23,7 +23,7 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link," # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="${QT_LIBRARY}" +export OE_QMAKE_LIBS_QT="qte" export OE_QMAKE_LIBS_X11="" oe_qmake_mkspecs () { diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 43a9b55b28..db1dbf19b4 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -29,8 +29,9 @@ def get_siteinfo_list(d): "arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\ "arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\ "arm-linux-uclibcgnueabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\ - "avr32-linux": "endian-big bit-32 common-glibc",\ - "avr32-linux-uclibc": "endian-big bit-32 common-uclibc",\ + "avr32-linux": "endian-big bit-32 common-glibc avr32-common",\ + "avr32-linux-uclibc": "endian-big bit-32 common-uclibc avr32-common",\ + "bfin-linux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ "i386-linux": "endian-little bit-32 common-glibc ix86-common",\ "i486-linux": "endian-little bit-32 common-glibc ix86-common",\ "i586-linux": "endian-little bit-32 common-glibc ix86-common",\ |