diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-10-05 15:31:39 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-10-05 15:31:39 +0000 |
| commit | 5731ad06007b17aa25da00f99776de4c1bc16512 (patch) | |
| tree | c098b80c1c5c9235e368508063f1391f29b9afe2 /classes | |
| parent | 6265c89321d13996212881744128bd4ee25b202b (diff) | |
| parent | 5e3b01d1b067e80b5e731c6cb384994e28d5f18d (diff) | |
merge of 'ae8724641e6c8131ac3706e49cd36a7e993fc697'
and 'e74e0c0ff5084d996f1c4b3b2c87244159a057ee'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 2 | ||||
| -rw-r--r-- | classes/distutils-base.bbclass | 3 | ||||
| -rw-r--r-- | classes/insane.bbclass | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 540b891669..ac73e909f8 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -909,7 +909,7 @@ def get_subpkgedata_fn(pkg, d): import bb, os archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ") archs.reverse() - pkgdata = bb.data.expand('${STAGING_DIR}/pkgdata/', d) + pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d) targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d) for arch in archs: fn = pkgdata + arch + targetdir + pkg diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index c4551ace83..70155619b3 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -2,6 +2,9 @@ EXTRA_OEMAKE = "" DEPENDS += "${@["python-native python", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" RDEPENDS += "python-core" +export STAGING_INCDIR +export STAGING_LIBDIR + def python_dir(d): import os, bb staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index a599689e8c..6608666e4d 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -60,6 +60,8 @@ def package_qa_get_machine_dict(): "i686": ( 3, 0, 0, True, True), "mipsel": ( 8, 0, 0, True, True), "avr32": (6317, 0, 0, False, True), + "sh4": (42, 0, 0, True, True), + }, "uclinux-uclibc" : { "bfin": ( 106, 0, 0, True, True), |