diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2010-01-21 00:10:31 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2010-01-21 00:10:31 +0000 |
| commit | ca0ab6d91b683266e4aa2aa4f1a174098f6ae788 (patch) | |
| tree | c124c185ff1f1df9a8cd806ac457af73857cc36d /classes | |
| parent | 2154e8eb1a513d0944da59a780f962bacd0bcb8f (diff) | |
| parent | 0b76c230a456f09e7d3704955cc22ebf875eea16 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qt3e.bbclass | 4 | ||||
| -rw-r--r-- | classes/sanity.bbclass | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass index 35958b34ab..d3d4a14e8a 100644 --- a/classes/qt3e.bbclass +++ b/classes/qt3e.bbclass @@ -6,6 +6,6 @@ export QTEDIR="${STAGING_DIR_HOST}/qte3" export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3" export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3" export OE_QMAKE_CXXFLAGS="${CXXFLAGS} " -export OE_QMAKE_INCDIR_QT="${QTEDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib" +export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include" +export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib" export OE_QMAKE_LIBS_QT="qte" diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index f65df61c1d..f57d8e47d0 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -96,11 +96,14 @@ def check_sanity(e): if not check_app_exists("qemu-arm", e.data): messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" - if os.path.exists("/proc/sys/vm/mmap_min_addr"): - f = file("/proc/sys/vm/mmap_min_addr", "r") - if (f.read().strip() != "0"): - messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n" - f.close() + try: + if os.path.exists("/proc/sys/vm/mmap_min_addr"): + f = file("/proc/sys/vm/mmap_min_addr", "r") + if (f.read().strip() != "0"): + messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n" + f.close() + except: + pass for util in required_utilities.split(): if not check_app_exists( util, e.data ): |