From 02449e35be034751e00935ebf372b99c38aa83bf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 25 Jun 2013 18:08:01 +0100 Subject: [PATCH] sanity.bbclass: Add check for @ character in build directory name The @ character is not escaped properly in too many places within the system to easily support it so add the character to the list of blacklisted characters. Also tweak the other messages and ensure that all appropriate error messages are disabled in one go. [YOCTO #4772] (From OE-Core rev: 008cb3c501c8313a0a1a0ebce2b0aa61239b548d) Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 622bb41..cf23982 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -589,10 +589,12 @@ def check_sanity_everybuild(status, d): pass oeroot = d.getVar('COREBASE') - if oeroot.find ('+') != -1: - status.addresult("Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include a +.") - elif oeroot.find (' ') != -1: - status.addresult("Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space.") + if oeroot.find('+') != -1: + status.addresult("Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include any + characters.") + if oeroot.find('@') != -1: + status.addresult("Error, you have an invalid character (@) in your COREBASE directory path. Please move the installation to a directory which doesn't include any @ characters.") + if oeroot.find(' ') != -1: + status.addresult("Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space since autotools doesn't support this.") # Check that TMPDIR hasn't changed location since the last time we were run tmpdir = d.getVar('TMPDIR', True) -- 2.7.4