diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-04-16 16:41:33 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-04-27 16:58:42 +0100 |
| commit | d1f413ff30bb854d34e2bf3be2bcbe01170a9814 (patch) | |
| tree | 1e84220be4ae89b104bd4fcdd824877e412b6bbf | |
| parent | 6763d7506f0afdd1c66a7ab226bccdde205923ee (diff) | |
| download | poky-d1f413ff30bb854d34e2bf3be2bcbe01170a9814.tar.gz | |
sanity.bbclass: handle lack of permission to read /proc/sys/vm/mmap_min_addr
Patch from OE.dev by Martin Jansa to workaround that we on modern Linux we can
no longer read this file.
We need a better fix but best option will be to update to a newer, relocatable,
QEMU release.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
| -rw-r--r-- | meta/classes/sanity.bbclass | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index c2f57a3837..67a5f52de3 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
| @@ -95,11 +95,15 @@ def check_sanity(e): | |||
| 95 | messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" | 95 | messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" |
| 96 | 96 | ||
| 97 | if data.getVar('TARGET_ARCH', e.data, True) == "arm": | 97 | if data.getVar('TARGET_ARCH', e.data, True) == "arm": |
| 98 | if os.path.exists("/proc/sys/vm/mmap_min_addr"): | 98 | # This path is no longer user-readable in modern (very recent) Linux |
| 99 | f = file("/proc/sys/vm/mmap_min_addr", "r") | 99 | try: |
| 100 | if (f.read().strip() != "0"): | 100 | if os.path.exists("/proc/sys/vm/mmap_min_addr"): |
| 101 | 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" | 101 | f = file("/proc/sys/vm/mmap_min_addr", "r") |
| 102 | f.close() | 102 | if (f.read().strip() != "0"): |
| 103 | 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" | ||
| 104 | f.close() | ||
| 105 | except: | ||
| 106 | pass | ||
| 103 | 107 | ||
| 104 | for util in required_utilities.split(): | 108 | for util in required_utilities.split(): |
| 105 | if not check_app_exists( util, e.data ): | 109 | if not check_app_exists( util, e.data ): |
