[PATCH 1/3] sanity.bbclass: make indenting consistent

[PATCH 1/3] sanity.bbclass: make indenting consistent

[Paul Eggleton]

Use four spaces throughout the file

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/sanity.bbclass |  432 +++++++++++++++++++++---------------------
 1 files changed, 216 insertions(+), 216 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index bc02a82..6dc4716 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -3,240 +3,240 @@
 #
 
 def raise_sanity_error(msg):
-	bb.fatal(""" Poky's config sanity checker detected a potential misconfiguration.
-	Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
-	Following is the list of potential problems / advisories:
-	
-	%s""" % msg)
+    bb.fatal(""" Poky's config sanity checker detected a potential misconfiguration.
+    Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
+    Following is the list of potential problems / advisories:
+    
+    %s""" % msg)
 
 def check_conf_exists(fn, data):
-	bbpath = []
-	fn = bb.data.expand(fn, data)
-	vbbpath = bb.data.getVar("BBPATH", data)
-	if vbbpath:
-		bbpath += vbbpath.split(":")
-	for p in bbpath:
-		currname = os.path.join(bb.data.expand(p, data), fn)
-		if os.access(currname, os.R_OK):
-			return True
-	return False
+    bbpath = []
+    fn = bb.data.expand(fn, data)
+    vbbpath = bb.data.getVar("BBPATH", data)
+    if vbbpath:
+        bbpath += vbbpath.split(":")
+    for p in bbpath:
+        currname = os.path.join(bb.data.expand(p, data), fn)
+        if os.access(currname, os.R_OK):
+            return True
+    return False
 
 def check_sanity(e):
-	from bb import note, error, data, __version__
-
-	try:
-		from distutils.version import LooseVersion
-	except ImportError:
-		def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
-	import commands
-
-	# Check the bitbake version meets minimum requirements
-	minversion = data.getVar('BB_MIN_VERSION', e.data , True)
-	if not minversion:
-		# Hack: BB_MIN_VERSION hasn't been parsed yet so return 
-		# and wait for the next call
-		print "Foo %s" % minversion
-		return
-
-	if 0 == os.getuid():
-		raise_sanity_error("Do not use Bitbake as root.")
-
-	messages = ""
-
-	# Check the Python version, we now use Python 2.6 features in
-	# various classes
-	import sys
-	if sys.hexversion < 0x020600F0:
-		messages = messages + 'Poky requires at least Python 2.6 to run. Please update your Python interpreter.\n'
-
-	if (LooseVersion(__version__) < LooseVersion(minversion)):
-		messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__)
-
-	# Check TARGET_ARCH is set
-	if data.getVar('TARGET_ARCH', e.data, True) == 'INVALID':
-		messages = messages + 'Please set TARGET_ARCH directly, or choose a MACHINE or DISTRO that does so.\n'
-	
-	# Check TARGET_OS is set
-	if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
-		messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n'
+    from bb import note, error, data, __version__
+
+    try:
+        from distutils.version import LooseVersion
+    except ImportError:
+        def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
+    import commands
+
+    # Check the bitbake version meets minimum requirements
+    minversion = data.getVar('BB_MIN_VERSION', e.data , True)
+    if not minversion:
+        # Hack: BB_MIN_VERSION hasn't been parsed yet so return 
+        # and wait for the next call
+        print "Foo %s" % minversion
+        return
+
+    if 0 == os.getuid():
+        raise_sanity_error("Do not use Bitbake as root.")
+
+    messages = ""
+
+    # Check the Python version, we now use Python 2.6 features in
+    # various classes
+    import sys
+    if sys.hexversion < 0x020600F0:
+        messages = messages + 'Poky requires at least Python 2.6 to run. Please update your Python interpreter.\n'
+
+    if (LooseVersion(__version__) < LooseVersion(minversion)):
+        messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__)
+
+    # Check TARGET_ARCH is set
+    if data.getVar('TARGET_ARCH', e.data, True) == 'INVALID':
+        messages = messages + 'Please set TARGET_ARCH directly, or choose a MACHINE or DISTRO that does so.\n'
+    
+    # Check TARGET_OS is set
+    if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
+        messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n'
 
         # Check we are using a valid lacal.conf
         current_conf  = data.getVar('CONF_VERSION', e.data, True)
         conf_version =  data.getVar('POKY_CONF_VERSION', e.data, True)
 
         if current_conf != conf_version:
-                messages = messages + "Poky has noticed your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes.\n"
+            messages = messages + "Poky has noticed your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes.\n"
 
         # Check bblayers.conf is valid
         current_lconf = data.getVar('LCONF_VERSION', e.data, True)
         lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True)
         if current_lconf != lconf_version:
-                messages = messages + "Poky has noticed your version of bblayers.conf was generated from an older version of bblayers.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/bblayers.conf conf/bblayers.conf.sample\" is a good way to visualise the changes.\n"
+            messages = messages + "Poky has noticed your version of bblayers.conf was generated from an older version of bblayers.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/bblayers.conf conf/bblayers.conf.sample\" is a good way to visualise the changes.\n"
 
         # If we have a site.conf, check it's valid
         if check_conf_exists("conf/site.conf", e.data):
-                current_sconf = data.getVar('SCONF_VERSION', e.data, True)
-                sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True)
-                if current_sconf != sconf_version:
-                        messages = messages + "Poky has noticed your version of site.conf was generated from an older version of site.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/site.conf conf/site.conf.sample\" is a good way to visualise the changes.\n"
-
-	assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
-	# Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
-	if "diffstat-native" not in assume_provided:
-		messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
-	
-	# Check that the MACHINE is valid, if it is set
-	if data.getVar('MACHINE', e.data, True):
-		if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
-			messages = messages + 'Please set a valid MACHINE in your local.conf\n'
-	
-	# Check that the DISTRO is valid
-	# need to take into account DISTRO renaming DISTRO
-	if not ( check_conf_exists("conf/distro/${DISTRO}.conf", e.data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", e.data) ):
-		messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", e.data, True )
-
-	missing = ""
-
-	if not check_app_exists("${MAKE}", e.data):
-		missing = missing + "GNU make,"
-
-	if not check_app_exists('${BUILD_PREFIX}gcc', e.data):
-		missing = missing + "C Compiler (%sgcc)," % data.getVar("BUILD_PREFIX", e.data, True)
-
-	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
-		missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True)
-
-	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg chrpath wget"
-
-	# qemu-native needs gcc 3.x
-	if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided:
-		gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
-
-		if not check_gcc3(e.data) and gcc_version[0] != '3':
-			messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH"
-			missing = missing + "gcc-3.x (needed for qemu-native),"
-
-	if "qemu-native" in assume_provided:
-		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 data.getVar('TARGET_ARCH', e.data, True) == "arm":
-                # This path is no longer user-readable in modern (very recent) Linux
-                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 ):
-			missing = missing + "%s," % util
-
-	if missing != "":
-		missing = missing.rstrip(',')
-		messages = messages + "Please install following missing utilities: %s\n" % missing
-
-	# Check if DISPLAY is set if IMAGETEST is set
-	if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
-		messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
-
-	# Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating
-	termcmd = data.getVar("TERMCMD", e.data, True)
-	term = termcmd.split()[0]
-	if not check_app_exists(term, e.data):
-	   messages = messages + "The console for use in patch error resolution is not available, please install %s or set TERMCMD and TERMCMDRUN (as documented in local.conf).\n" % term
-
-	if os.path.basename(os.readlink('/bin/sh')) == 'dash':
-		messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n"
-
-	omask = os.umask(022)
-	if omask & 0755:
-		messages = messages + "Please use a umask which allows a+rx and u+rwx\n"
-	os.umask(omask)
-
-	oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
-	if not oes_bb_conf:
-		messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf. This means your environment is misconfigured, in particular check BBPATH.\n'
-
-	if data.getVar('SDK_ARCH', e.data, True) == 'i686':
-		messages = messages + '"Please set SDKMACHINE to i586. It is currently defaulting to the build machine architecture of i686 and this is known to have issues (see local.conf).\n'
-
-	nolibs = data.getVar('NO32LIBS', e.data, True)
-	if not nolibs:
-		lib32path = '/lib'
-		if os.path.exists('/lib64') and os.path.islink('/lib64'):
-		   lib32path = '/lib32'
-
-		if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
-			messages = messages + "You have a 32-bit libc, but no 32-bit headers.  You must install the 32-bit libc headers.\n"
-
-	#
-	# Check that TMPDIR hasn't changed location since the last time we were run
-	#
-	tmpdir = data.getVar('TMPDIR', e.data, True)
-	checkfile = os.path.join(tmpdir, "saved_tmpdir")
-	if os.path.exists(checkfile):
-		f = file(checkfile, "r")
-		saved_tmpdir = f.read().strip()
-		if (saved_tmpdir != tmpdir):
-			messages = messages + "Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % saved_tmpdir
-	else:
-		f = file(checkfile, "w")
-		f.write(tmpdir)
-	f.close()
-
-	#
-	# Check the 'ABI' of TMPDIR
-	#
-	current_abi = data.getVar('OELAYOUT_ABI', e.data, True)
-	abifile = data.getVar('SANITY_ABIFILE', e.data, True)
-	if os.path.exists(abifile):
-		f = file(abifile, "r")
-		abi = f.read().strip()
-		if not abi.isdigit():
-			f = file(abifile, "w")
-			f.write(current_abi)
-		elif abi == "2" and current_abi == "3":
-			bb.note("Converting staging from layout version 2 to layout version 3")
-			os.system(bb.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots", e.data))
-			os.system(bb.data.expand("ln -s sysroots ${TMPDIR}/staging", e.data))
-			os.system(bb.data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done", e.data))
-			f = file(abifile, "w")
-			f.write(current_abi)
-		elif abi == "3" and current_abi == "4":
-                        bb.note("Converting staging layout from version 3 to layout version 4")
-                        if os.path.exists(bb.data.expand("${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}", e.data)):
-                            os.system(bb.data.expand("mv ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS} ${STAGING_BINDIR_CROSS}", e.data))
-                            os.system(bb.data.expand("ln -s ${STAGING_BINDIR_CROSS} ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}", e.data))
-
-                        f = file(abifile, "w")
-                        f.write(current_abi)
-                elif abi == "4":
-                        messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"
-                elif abi == "5" and current_abi == "6":
-                        bb.note("Converting staging layout from version 5 to layout version 6")
-                        os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${TMPDIR}/sstate-control", e.data))
-                        f = file(abifile, "w")
-                        f.write(current_abi)
-		elif (abi != current_abi):
-			# Code to convert from one ABI to another could go here if possible.
-			messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
-	else:
-		f = file(abifile, "w")
-		f.write(current_abi)
-	f.close()
-
-	oeroot = data.getVar('POKYBASE', e.data)
-	if oeroot.find ('+') != -1:
-		messages = messages + "Error, you have an invalid character (+) in your POKYBASE directory path. Please more Poky to a directory which doesn't include a +."
-	elif oeroot.find (' ') != -1:
-		messages = messages + "Error, you have a space in your POKYBASE directory path. Please move Poky to a directory which doesn't include a space."
-
-	if messages != "":
-		raise_sanity_error(messages)
+            current_sconf = data.getVar('SCONF_VERSION', e.data, True)
+            sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True)
+            if current_sconf != sconf_version:
+                messages = messages + "Poky has noticed your version of site.conf was generated from an older version of site.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/site.conf conf/site.conf.sample\" is a good way to visualise the changes.\n"
+
+    assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
+    # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
+    if "diffstat-native" not in assume_provided:
+        messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
+    
+    # Check that the MACHINE is valid, if it is set
+    if data.getVar('MACHINE', e.data, True):
+        if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+            messages = messages + 'Please set a valid MACHINE in your local.conf\n'
+    
+    # Check that the DISTRO is valid
+    # need to take into account DISTRO renaming DISTRO
+    if not ( check_conf_exists("conf/distro/${DISTRO}.conf", e.data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", e.data) ):
+        messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", e.data, True )
+
+    missing = ""
+
+    if not check_app_exists("${MAKE}", e.data):
+        missing = missing + "GNU make,"
+
+    if not check_app_exists('${BUILD_PREFIX}gcc', e.data):
+        missing = missing + "C Compiler (%sgcc)," % data.getVar("BUILD_PREFIX", e.data, True)
+
+    if not check_app_exists('${BUILD_PREFIX}g++', e.data):
+        missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True)
+
+    required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg chrpath wget"
+
+    # qemu-native needs gcc 3.x
+    if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided:
+        gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
+
+        if not check_gcc3(e.data) and gcc_version[0] != '3':
+            messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH"
+            missing = missing + "gcc-3.x (needed for qemu-native),"
+
+    if "qemu-native" in assume_provided:
+        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 data.getVar('TARGET_ARCH', e.data, True) == "arm":
+        # This path is no longer user-readable in modern (very recent) Linux
+        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 ):
+            missing = missing + "%s," % util
+
+    if missing != "":
+        missing = missing.rstrip(',')
+        messages = messages + "Please install following missing utilities: %s\n" % missing
+
+    # Check if DISPLAY is set if IMAGETEST is set
+    if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
+        messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
+
+    # Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating
+    termcmd = data.getVar("TERMCMD", e.data, True)
+    term = termcmd.split()[0]
+    if not check_app_exists(term, e.data):
+       messages = messages + "The console for use in patch error resolution is not available, please install %s or set TERMCMD and TERMCMDRUN (as documented in local.conf).\n" % term
+
+    if os.path.basename(os.readlink('/bin/sh')) == 'dash':
+        messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n"
+
+    omask = os.umask(022)
+    if omask & 0755:
+        messages = messages + "Please use a umask which allows a+rx and u+rwx\n"
+    os.umask(omask)
+
+    oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
+    if not oes_bb_conf:
+        messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf. This means your environment is misconfigured, in particular check BBPATH.\n'
+
+    if data.getVar('SDK_ARCH', e.data, True) == 'i686':
+        messages = messages + '"Please set SDKMACHINE to i586. It is currently defaulting to the build machine architecture of i686 and this is known to have issues (see local.conf).\n'
+
+    nolibs = data.getVar('NO32LIBS', e.data, True)
+    if not nolibs:
+        lib32path = '/lib'
+        if os.path.exists('/lib64') and os.path.islink('/lib64'):
+           lib32path = '/lib32'
+
+        if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
+            messages = messages + "You have a 32-bit libc, but no 32-bit headers.  You must install the 32-bit libc headers.\n"
+
+    #
+    # Check that TMPDIR hasn't changed location since the last time we were run
+    #
+    tmpdir = data.getVar('TMPDIR', e.data, True)
+    checkfile = os.path.join(tmpdir, "saved_tmpdir")
+    if os.path.exists(checkfile):
+        f = file(checkfile, "r")
+        saved_tmpdir = f.read().strip()
+        if (saved_tmpdir != tmpdir):
+            messages = messages + "Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % saved_tmpdir
+    else:
+        f = file(checkfile, "w")
+        f.write(tmpdir)
+    f.close()
+
+    #
+    # Check the 'ABI' of TMPDIR
+    #
+    current_abi = data.getVar('OELAYOUT_ABI', e.data, True)
+    abifile = data.getVar('SANITY_ABIFILE', e.data, True)
+    if os.path.exists(abifile):
+        f = file(abifile, "r")
+        abi = f.read().strip()
+        if not abi.isdigit():
+            f = file(abifile, "w")
+            f.write(current_abi)
+        elif abi == "2" and current_abi == "3":
+            bb.note("Converting staging from layout version 2 to layout version 3")
+            os.system(bb.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots", e.data))
+            os.system(bb.data.expand("ln -s sysroots ${TMPDIR}/staging", e.data))
+            os.system(bb.data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done", e.data))
+            f = file(abifile, "w")
+            f.write(current_abi)
+        elif abi == "3" and current_abi == "4":
+            bb.note("Converting staging layout from version 3 to layout version 4")
+            if os.path.exists(bb.data.expand("${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}", e.data)):
+                os.system(bb.data.expand("mv ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS} ${STAGING_BINDIR_CROSS}", e.data))
+                os.system(bb.data.expand("ln -s ${STAGING_BINDIR_CROSS} ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}", e.data))
+
+            f = file(abifile, "w")
+            f.write(current_abi)
+        elif abi == "4":
+            messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"
+        elif abi == "5" and current_abi == "6":
+            bb.note("Converting staging layout from version 5 to layout version 6")
+            os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${TMPDIR}/sstate-control", e.data))
+            f = file(abifile, "w")
+            f.write(current_abi)
+        elif (abi != current_abi):
+            # Code to convert from one ABI to another could go here if possible.
+            messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
+    else:
+        f = file(abifile, "w")
+        f.write(current_abi)
+    f.close()
+
+    oeroot = data.getVar('POKYBASE', e.data)
+    if oeroot.find ('+') != -1:
+        messages = messages + "Error, you have an invalid character (+) in your POKYBASE directory path. Please more Poky to a directory which doesn't include a +."
+    elif oeroot.find (' ') != -1:
+        messages = messages + "Error, you have a space in your POKYBASE directory path. Please move Poky to a directory which doesn't include a space."
+
+    if messages != "":
+        raise_sanity_error(messages)
 
 addhandler check_sanity_eventhandler
 python check_sanity_eventhandler() {
-- 
1.7.1

[PATCH 2/3] sanity.bbclass: allow minimisation of impact of more invasive sanity checks

[Paul Eggleton]

Add a mechanism to avoid running more invasive checks every time bitbake is
invoked. Adds a file in conf/ (i.e. under user's build directory) that
tracks a new variable SANITY_VERSION (set in sanity.conf) as well as TMPDIR
and SSTATE_DIR, allowing checks to be run when these are changed.

Fixes [BUGID #562]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/sanity.bbclass |   48 ++++++++++++++++++++++++++++++++++++++++++-
 meta/conf/sanity.conf       |    1 +
 2 files changed, 48 insertions(+), 1 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 6dc4716..969cc2e 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -21,6 +21,18 @@ def check_conf_exists(fn, data):
             return True
     return False
 
+def check_sanity_sstate_dir_change():
+    # Sanity checks to be done when the value of SSTATE_DIR changes
+    return ""
+
+def check_sanity_tmpdir_change():
+    # Sanity checks to be done when the value of TMPDIR changes
+    return ""
+        
+def check_sanity_version_change():
+    # Sanity checks to be done when SANITY_VERSION changes
+    return ""
+    
 def check_sanity(e):
     from bb import note, error, data, __version__
 
@@ -173,10 +185,44 @@ def check_sanity(e):
         if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
             messages = messages + "You have a 32-bit libc, but no 32-bit headers.  You must install the 32-bit libc headers.\n"
 
+    tmpdir = data.getVar('TMPDIR', e.data, True)
+    sstate_dir = data.getVar('SSTATE_DIR', e.data, True)
+
+    # Check saved sanity info
+    last_sanity_version = 0
+    last_tmpdir = ""
+    last_sstate_dir = ""
+    sanityverfile = 'conf/sanity_info'
+    if os.path.exists(sanityverfile):
+        f = file(sanityverfile, 'r')
+        for line in f:
+            if line.startswith('SANITY_VERSION'):
+                last_sanity_version = int(line.split()[1])
+            if line.startswith('TMPDIR'):
+                last_tmpdir = line.split()[1]
+            if line.startswith('SSTATE_DIR'):
+                last_sstate_dir = line.split()[1]
+    
+    sanity_version = int(data.getVar('SANITY_VERSION', e.data, True) or 1)
+    if last_sanity_version < sanity_version: 
+        messages = messages + check_sanity_version_change()
+        messages = messages + check_sanity_tmpdir_change()
+        messages = messages + check_sanity_sstate_dir_change()
+    else: 
+        if last_tmpdir != tmpdir:
+            messages = messages + check_sanity_tmpdir_change()
+        if last_sstate_dir != sstate_dir:
+            messages = messages + check_sanity_sstate_dir_change()
+
+    if os.path.exists("conf"):
+        f = file(sanityverfile, 'w')
+        f.write("SANITY_VERSION %s\n" % sanity_version) 
+        f.write("TMPDIR %s\n" % tmpdir) 
+        f.write("SSTATE_DIR %s\n" % sstate_dir) 
+
     #
     # Check that TMPDIR hasn't changed location since the last time we were run
     #
-    tmpdir = data.getVar('TMPDIR', e.data, True)
     checkfile = os.path.join(tmpdir, "saved_tmpdir")
     if os.path.exists(checkfile):
         f = file(checkfile, "r")
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index eab7619..1fbeb61 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -7,6 +7,7 @@ BB_MIN_VERSION = "1.8.10"
 
 SANITY_ABIFILE = "${TMPDIR}/abi_version"
 
+SANITY_VERSION = "1"
 POKY_CONF_VERSION  = "1"
 LAYER_CONF_VERSION = "3"
 SITE_CONF_VERSION  = "1"
-- 
1.7.1

[PATCH 3/3] sanity.bbclass: add check for creation of long filenames

[Paul Eggleton]

Detect and fail if filesystem in use for TMPDIR or SSTATE_DIR has an
unreasonably short file name length limit (eg. eCryptFS). This can cause
"file name too long" errors during poky builds (e.g. when writing sstate
files for packages with a git revision as the version).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/sanity.bbclass |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 969cc2e..fce0cbd 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -23,16 +23,40 @@ def check_conf_exists(fn, data):
 
 def check_sanity_sstate_dir_change():
     # Sanity checks to be done when the value of SSTATE_DIR changes
-    return ""
+    # Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS)
+    #
+    testmsg = ""
+    sstatedir = data.getVar('SSTATE_DIR', e.data, True) or ''
+    if sstatedir != "":
+        testmsg = check_create_long_filename(sstatedir, "SSTATE_DIR")
+    return testmsg
 
 def check_sanity_tmpdir_change():
     # Sanity checks to be done when the value of TMPDIR changes
-    return ""
+
+    # Check that TMPDIR isn't on a filesystem with limited filename length (eg. eCryptFS)
+    testmsg = check_create_long_filename(tmpdir, "TMPDIR")
+    return testmsg
         
 def check_sanity_version_change():
     # Sanity checks to be done when SANITY_VERSION changes
     return ""
     
+def check_create_long_filename(filepath, pathname):
+    testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)]))
+    try:
+        if not os.path.exists(filepath):
+            bb.utils.mkdirhier(filepath)
+        f = file(testfile, "w")
+        f.close()
+        os.remove(testfile)
+    except IOError as (errno, strerror):
+        if errno == 36: # ENAMETOOLONG
+            return "Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n" % pathname
+        else:
+            return "Failed to create a file in %s: %s" % (pathname, strerror)
+    return ""
+
 def check_sanity(e):
     from bb import note, error, data, __version__
 
-- 
1.7.1

[PATCH 0/3] sanity checking improvements

[Paul Eggleton]

These changes fix indenting in sanity.bbclass, provide a fix for bug #562
and introduce the (previously posted) check for filename length on top.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: paule/sanity-checks
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/sanity-checks

Thanks,
    Paul Eggleton <paul.eggleton@linux.intel.com>
---


Paul Eggleton (3):
  sanity.bbclass: make indenting consistent
  sanity.bbclass: allow minimisation of impact of more invasive sanity
    checks
  sanity.bbclass: add check for creation of long filenames

 meta/classes/sanity.bbclass |  502 ++++++++++++++++++++++++-------------------
 meta/conf/sanity.conf       |    1 +
 2 files changed, 287 insertions(+), 216 deletions(-)

Re: [PATCH 3/3] sanity.bbclass: add check for creation of long filenames

[Paul Eggleton]

[-- Attachment #1: Type: Text/Plain, Size: 204 bytes --]

It seems that in my haste yesterday I neglected to commit some changes before posting the 3rd patch. Correct patch is attached (and contrib branch paule/sanity-checks has been updated).

Cheers,
Paul

[-- Attachment #2: sanity-filename-length.patch --]
[-- Type: text/x-patch, Size: 3449 bytes --]

commit c028532cdf98f310cb043fa3770a2f5b9b4a10bb
Author: Paul Eggleton <paul.eggleton@linux.intel.com>
Date:   Thu Dec 16 17:35:31 2010 +0000

    sanity.bbclass: add check for creation of long filenames
    
    Detect and fail if filesystem in use for TMPDIR or SSTATE_DIR has an
    unreasonably short file name length limit (eg. eCryptFS). This can cause
    "file name too long" errors during poky builds (e.g. when writing sstate
    files for packages with a git revision as the version).
    
    Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 969cc2e..9d183e3 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -21,18 +21,41 @@ def check_conf_exists(fn, data):
             return True
     return False
 
-def check_sanity_sstate_dir_change():
+def check_sanity_sstate_dir_change(sstate_dir):
     # Sanity checks to be done when the value of SSTATE_DIR changes
-    return ""
 
-def check_sanity_tmpdir_change():
+    # Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS)
+    testmsg = ""
+    if sstate_dir != "":
+        testmsg = check_create_long_filename(sstate_dir, "SSTATE_DIR")
+    return testmsg
+
+def check_sanity_tmpdir_change(tmpdir):
     # Sanity checks to be done when the value of TMPDIR changes
-    return ""
+
+    # Check that TMPDIR isn't on a filesystem with limited filename length (eg. eCryptFS)
+    testmsg = check_create_long_filename(tmpdir, "TMPDIR")
+    return testmsg
         
 def check_sanity_version_change():
     # Sanity checks to be done when SANITY_VERSION changes
     return ""
     
+def check_create_long_filename(filepath, pathname):
+    testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)]))
+    try:
+        if not os.path.exists(filepath):
+            bb.utils.mkdirhier(filepath)
+        f = file(testfile, "w")
+        f.close()
+        os.remove(testfile)
+    except IOError as (errno, strerror):
+        if errno == 36: # ENAMETOOLONG
+            return "Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n" % pathname
+        else:
+            return "Failed to create a file in %s: %s" % (pathname, strerror)
+    return ""
+
 def check_sanity(e):
     from bb import note, error, data, __version__
 
@@ -206,13 +229,13 @@ def check_sanity(e):
     sanity_version = int(data.getVar('SANITY_VERSION', e.data, True) or 1)
     if last_sanity_version < sanity_version: 
         messages = messages + check_sanity_version_change()
-        messages = messages + check_sanity_tmpdir_change()
-        messages = messages + check_sanity_sstate_dir_change()
+        messages = messages + check_sanity_tmpdir_change(tmpdir)
+        messages = messages + check_sanity_sstate_dir_change(sstate_dir)
     else: 
         if last_tmpdir != tmpdir:
-            messages = messages + check_sanity_tmpdir_change()
+            messages = messages + check_sanity_tmpdir_change(tmpdir)
         if last_sstate_dir != sstate_dir:
-            messages = messages + check_sanity_sstate_dir_change()
+            messages = messages + check_sanity_sstate_dir_change(sstate_dir)
 
     if os.path.exists("conf"):
         f = file(sanityverfile, 'w')

Re: [PATCH 0/3] sanity checking improvements

[Richard Purdie]

On Thu, 2010-12-16 at 18:12 +0000, Paul Eggleton wrote:
> These changes fix indenting in sanity.bbclass, provide a fix for bug #562
> and introduce the (previously posted) check for filename length on top.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: paule/sanity-checks
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/sanity-checks
> 
> Thanks,
>     Paul Eggleton <paul.eggleton@linux.intel.com>

Merged into master, thanks!

Richard