diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-09-29 12:18:34 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-09-29 17:10:41 +0100 |
commit | 7f7c185cf1ed2bd02c9a98e694cb74cc89a15daf (patch) | |
tree | e3ac55e588a75491cf066cf591ba2d3c3658c98e /meta/classes/sanity.bbclass | |
parent | 62fe6dc755d83a4d394cb8a3751fc6172715ee37 (diff) | |
download | poky-7f7c185cf1ed2bd02c9a98e694cb74cc89a15daf.tar.gz |
Revert "Drop vm_mmap_min_addr checks from scripts and sanity class"
This reverts commit 138df217efe850528f88d340acf864c38780c2b0.
We still need the vm_mmap_min_addr set to 0 to run locale generation for
qemu-arm
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r-- | meta/classes/sanity.bbclass | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index ef1020b215..f963f280e0 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -120,6 +120,17 @@ def check_sanity(e): | |||
120 | if not check_app_exists("qemu-arm", e.data): | 120 | if not check_app_exists("qemu-arm", e.data): |
121 | messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" | 121 | messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" |
122 | 122 | ||
123 | if data.getVar('TARGET_ARCH', e.data, True) == "arm": | ||
124 | # This path is no longer user-readable in modern (very recent) Linux | ||
125 | try: | ||
126 | if os.path.exists("/proc/sys/vm/mmap_min_addr"): | ||
127 | f = file("/proc/sys/vm/mmap_min_addr", "r") | ||
128 | if (f.read().strip() != "0"): | ||
129 | 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" | ||
130 | f.close() | ||
131 | except: | ||
132 | pass | ||
133 | |||
123 | for util in required_utilities.split(): | 134 | for util in required_utilities.split(): |
124 | if not check_app_exists( util, e.data ): | 135 | if not check_app_exists( util, e.data ): |
125 | missing = missing + "%s," % util | 136 | missing = missing + "%s," % util |