Convert tab indentation in python functions into four-space

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 1465 insertions, 1465 deletions

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index dfd42117c5..a51e955325 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -25,8 +25,8 @@
 #    The data is stores in FILER{PROVIDES,DEPENDS}_file_pkg variables with
 #    a list of affected files in FILER{PROVIDES,DEPENDS}FLIST_pkg
 #
-# h) package_do_shlibs - Look at the shared libraries generated and autotmatically add any 
-#    depenedencies found. Also stores the package name so anyone else using this library 
+# h) package_do_shlibs - Look at the shared libraries generated and autotmatically add any
+#    depenedencies found. Also stores the package name so anyone else using this library
 #    knows which package to depend on.
 #
 # i) package_do_pkgconfig - Keep track of which packages need and provide which .pc files
@@ -35,7 +35,7 @@
 #
 # k) package_depchains - Adds automatic dependencies to -dbg and -dev packages
 #
-# l) emit_pkgdata - saves the packaging data into PKGDATA_DIR for use in later 
+# l) emit_pkgdata - saves the packaging data into PKGDATA_DIR for use in later
 #    packaging steps
 
 inherit packagedata
@@ -52,112 +52,112 @@ ALL_MULTILIB_PACKAGE_ARCHS = "${@all_multilib_tune_values(d, 'PACKAGE_ARCHS')}"
 PACKAGE_DEPENDS += "rpm-native"
 
 def legitimize_package_name(s):
-	"""
-	Make sure package names are legitimate strings
-	"""
-	import re
+    """
+    Make sure package names are legitimate strings
+    """
+    import re
 
-	def fixutf(m):
-		cp = m.group(1)
-		if cp:
-			return ('\u%s' % cp).decode('unicode_escape').encode('utf-8')
+    def fixutf(m):
+        cp = m.group(1)
+        if cp:
+            return ('\u%s' % cp).decode('unicode_escape').encode('utf-8')
 
-	# Handle unicode codepoints encoded as <U0123>, as in glibc locale files.
-	s = re.sub('<U([0-9A-Fa-f]{1,4})>', fixutf, s)
+    # Handle unicode codepoints encoded as <U0123>, as in glibc locale files.
+    s = re.sub('<U([0-9A-Fa-f]{1,4})>', fixutf, s)
 
-	# Remaining package name validity fixes
-	return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-')
+    # Remaining package name validity fixes
+    return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-')
 
 def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None, allow_links=False):
-	"""
-	Used in .bb files to split up dynamically generated subpackages of a 
-	given package, usually plugins or modules.
-	"""
-
-	ml = d.getVar("MLPREFIX", True)
-	if ml:
-		if not output_pattern.startswith(ml):
-			output_pattern = ml + output_pattern
-
-		newdeps = []
-		for dep in (extra_depends or "").split():
-			if dep.startswith(ml):
-				newdeps.append(dep)
-			else:
-				newdeps.append(ml + dep)
-		if newdeps:
-			extra_depends = " ".join(newdeps)
-
-	dvar = d.getVar('PKGD', True)
-
-	packages = d.getVar('PACKAGES', True).split()
-
-	if postinst:
-		postinst = '#!/bin/sh\n' + postinst + '\n'
-	if postrm:
-		postrm = '#!/bin/sh\n' + postrm + '\n'
-	if not recursive:
-		objs = os.listdir(dvar + root)
-	else:
-		objs = []
-		for walkroot, dirs, files in os.walk(dvar + root):
-			for file in files:
-				relpath = os.path.join(walkroot, file).replace(dvar + root + '/', '', 1)
-				if relpath:
-					objs.append(relpath)
-
-	if extra_depends == None:
-		extra_depends = d.getVar("PN", True)
-
-	for o in sorted(objs):
-		import re, stat
-		if match_path:
-			m = re.match(file_regex, o)
-		else:
-			m = re.match(file_regex, os.path.basename(o))
-		
-		if not m:
-			continue
-		f = os.path.join(dvar + root, o)
-		mode = os.lstat(f).st_mode
-		if not (stat.S_ISREG(mode) or (allow_links and stat.S_ISLNK(mode)) or (allow_dirs and stat.S_ISDIR(mode))):
-			continue
-		on = legitimize_package_name(m.group(1))
-		pkg = output_pattern % on
-		if not pkg in packages:
-			if prepend:
-				packages = [pkg] + packages
-			else:
-				packages.append(pkg)
-		oldfiles = d.getVar('FILES_' + pkg, True)
-		if not oldfiles:
-			the_files = [os.path.join(root, o)]
-			if aux_files_pattern:
-				if type(aux_files_pattern) is list:
-					for fp in aux_files_pattern:
-						the_files.append(fp % on)	
-				else:
-					the_files.append(aux_files_pattern % on)
-			if aux_files_pattern_verbatim:
-				if type(aux_files_pattern_verbatim) is list:
-					for fp in aux_files_pattern_verbatim:
-						the_files.append(fp % m.group(1))	
-				else:
-					the_files.append(aux_files_pattern_verbatim % m.group(1))
-			d.setVar('FILES_' + pkg, " ".join(the_files))
-			if extra_depends != '':
-				d.appendVar('RDEPENDS_' + pkg, ' ' + extra_depends)
-			d.setVar('DESCRIPTION_' + pkg, description % on)
-			if postinst:
-				d.setVar('pkg_postinst_' + pkg, postinst)
-			if postrm:
-				d.setVar('pkg_postrm_' + pkg, postrm)
-		else:
-			d.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o))
-		if callable(hook):
-			hook(f, pkg, file_regex, output_pattern, m.group(1))
-
-	d.setVar('PACKAGES', ' '.join(packages))
+    """
+    Used in .bb files to split up dynamically generated subpackages of a
+    given package, usually plugins or modules.
+    """
+
+    ml = d.getVar("MLPREFIX", True)
+    if ml:
+        if not output_pattern.startswith(ml):
+            output_pattern = ml + output_pattern
+
+        newdeps = []
+        for dep in (extra_depends or "").split():
+            if dep.startswith(ml):
+                newdeps.append(dep)
+            else:
+                newdeps.append(ml + dep)
+        if newdeps:
+            extra_depends = " ".join(newdeps)
+
+    dvar = d.getVar('PKGD', True)
+
+    packages = d.getVar('PACKAGES', True).split()
+
+    if postinst:
+        postinst = '#!/bin/sh\n' + postinst + '\n'
+    if postrm:
+        postrm = '#!/bin/sh\n' + postrm + '\n'
+    if not recursive:
+        objs = os.listdir(dvar + root)
+    else:
+        objs = []
+        for walkroot, dirs, files in os.walk(dvar + root):
+            for file in files:
+                relpath = os.path.join(walkroot, file).replace(dvar + root + '/', '', 1)
+                if relpath:
+                    objs.append(relpath)
+
+    if extra_depends == None:
+        extra_depends = d.getVar("PN", True)
+
+    for o in sorted(objs):
+        import re, stat
+        if match_path:
+            m = re.match(file_regex, o)
+        else:
+            m = re.match(file_regex, os.path.basename(o))
+
+        if not m:
+            continue
+        f = os.path.join(dvar + root, o)
+        mode = os.lstat(f).st_mode
+        if not (stat.S_ISREG(mode) or (allow_links and stat.S_ISLNK(mode)) or (allow_dirs and stat.S_ISDIR(mode))):
+            continue
+        on = legitimize_package_name(m.group(1))
+        pkg = output_pattern % on
+        if not pkg in packages:
+            if prepend:
+                packages = [pkg] + packages
+            else:
+                packages.append(pkg)
+        oldfiles = d.getVar('FILES_' + pkg, True)
+        if not oldfiles:
+            the_files = [os.path.join(root, o)]
+            if aux_files_pattern:
+                if type(aux_files_pattern) is list:
+                    for fp in aux_files_pattern:
+                        the_files.append(fp % on)
+                else:
+                    the_files.append(aux_files_pattern % on)
+            if aux_files_pattern_verbatim:
+                if type(aux_files_pattern_verbatim) is list:
+                    for fp in aux_files_pattern_verbatim:
+                        the_files.append(fp % m.group(1))
+                else:
+                    the_files.append(aux_files_pattern_verbatim % m.group(1))
+            d.setVar('FILES_' + pkg, " ".join(the_files))
+            if extra_depends != '':
+                d.appendVar('RDEPENDS_' + pkg, ' ' + extra_depends)
+            d.setVar('DESCRIPTION_' + pkg, description % on)
+            if postinst:
+                d.setVar('pkg_postinst_' + pkg, postinst)
+            if postrm:
+                d.setVar('pkg_postrm_' + pkg, postrm)
+        else:
+            d.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o))
+        if callable(hook):
+            hook(f, pkg, file_regex, output_pattern, m.group(1))
+
+    d.setVar('PACKAGES', ' '.join(packages))
 
 PACKAGE_DEPENDS += "file-native"
 
@@ -195,7 +195,7 @@ def splitfile(file, debugfile, debugsrcdir, d):
 
     # We ignore kernel modules, we don't generate debug info files.
     if file.find("/lib/modules/") != -1 and file.endswith(".ko"):
-	return 1
+        return 1
 
     newmode = None
     if not os.access(file, os.W_OK) or os.access(file, os.R_OK):
@@ -205,7 +205,7 @@ def splitfile(file, debugfile, debugsrcdir, d):
 
     # We need to extract the debug src information here...
     if debugsrcdir:
-	subprocess.call("%s'%s' -b '%s' -d '%s' -i -l '%s' '%s'" % (pathprefix, debugedit, workparentdir, debugsrcdir, sourcefile, file), shell=True)
+        subprocess.call("%s'%s' -b '%s' -d '%s' -i -l '%s' '%s'" % (pathprefix, debugedit, workparentdir, debugsrcdir, sourcefile, file), shell=True)
 
     bb.mkdirhier(os.path.dirname(debugfile))
 
@@ -316,826 +316,826 @@ def runstrip(file, elftype, d):
 #
 
 def get_package_mapping (pkg, d):
-	import oe.packagedata
+    import oe.packagedata
 
-	data = oe.packagedata.read_subpkgdata(pkg, d)
-	key = "PKG_%s" % pkg
+    data = oe.packagedata.read_subpkgdata(pkg, d)
+    key = "PKG_%s" % pkg
 
-	if key in data:
-		return data[key]
+    if key in data:
+        return data[key]
 
-	return pkg
+    return pkg
 
 def runtime_mapping_rename (varname, d):
-	#bb.note("%s before: %s" % (varname, d.getVar(varname, True)))	
+    #bb.note("%s before: %s" % (varname, d.getVar(varname, True)))
 
-	new_depends = []
-	deps = bb.utils.explode_dep_versions(d.getVar(varname, True) or "")
-	for depend in deps:
-		# Have to be careful with any version component of the depend
-		new_depend = get_package_mapping(depend, d)
-		if deps[depend]:
-			new_depends.append("%s (%s)" % (new_depend, deps[depend]))
-		else:
-			new_depends.append(new_depend)
+    new_depends = []
+    deps = bb.utils.explode_dep_versions(d.getVar(varname, True) or "")
+    for depend in deps:
+        # Have to be careful with any version component of the depend
+        new_depend = get_package_mapping(depend, d)
+        if deps[depend]:
+            new_depends.append("%s (%s)" % (new_depend, deps[depend]))
+        else:
+            new_depends.append(new_depend)
 
-	d.setVar(varname, " ".join(new_depends) or None)
+    d.setVar(varname, " ".join(new_depends) or None)
 
-	#bb.note("%s after: %s" % (varname, d.getVar(varname, True)))
+    #bb.note("%s after: %s" % (varname, d.getVar(varname, True)))
 
 #
 # Package functions suitable for inclusion in PACKAGEFUNCS
 #
 
 python package_get_auto_pr() {
-	# per recipe PRSERV_HOST PRSERV_PORT
-	pn = d.getVar('PN', True)
-	host = d.getVar("PRSERV_HOST_" + pn, True)
-	port = d.getVar("PRSERV_PORT_" + pn, True)
-	if not (host is None):
-		d.setVar("PRSERV_HOST", host)
-	if not (port is None):
-		d.setVar("PRSERV_PORT", port)
-	if d.getVar('USE_PR_SERV', True) != "0":
-		try:
-			auto_pr=prserv_get_pr_auto(d)
-		except Exception as e:
-			bb.fatal("Can NOT get PRAUTO, exception %s" %  str(e))
-			return
-		if auto_pr is None:
-			if d.getVar('PRSERV_LOCKDOWN', True):
-				bb.fatal("Can NOT get PRAUTO from lockdown exported file")
-			else:
-				bb.fatal("Can NOT get PRAUTO from remote PR service")
-			return 
-		d.setVar('PRAUTO',str(auto_pr))
+    # per recipe PRSERV_HOST PRSERV_PORT
+    pn = d.getVar('PN', True)
+    host = d.getVar("PRSERV_HOST_" + pn, True)
+    port = d.getVar("PRSERV_PORT_" + pn, True)
+    if not (host is None):
+        d.setVar("PRSERV_HOST", host)
+    if not (port is None):
+        d.setVar("PRSERV_PORT", port)
+    if d.getVar('USE_PR_SERV', True) != "0":
+        try:
+            auto_pr=prserv_get_pr_auto(d)
+        except Exception as e:
+            bb.fatal("Can NOT get PRAUTO, exception %s" %  str(e))
+            return
+        if auto_pr is None:
+            if d.getVar('PRSERV_LOCKDOWN', True):
+                bb.fatal("Can NOT get PRAUTO from lockdown exported file")
+            else:
+                bb.fatal("Can NOT get PRAUTO from remote PR service")
+            return
+        d.setVar('PRAUTO',str(auto_pr))
 }
 
 python package_do_split_locales() {
-	if (d.getVar('PACKAGE_NO_LOCALE', True) == '1'):
-		bb.debug(1, "package requested not splitting locales")
-		return
-
-	packages = (d.getVar('PACKAGES', True) or "").split()
-
-	datadir = d.getVar('datadir', True)
-	if not datadir:
-		bb.note("datadir not defined")
-		return
-
-	dvar = d.getVar('PKGD', True)
-	pn = d.getVar('PN', True)
-
-	if pn + '-locale' in packages:
-		packages.remove(pn + '-locale')
-
-	localedir = os.path.join(dvar + datadir, 'locale')
-
-	if not os.path.isdir(localedir):
-		bb.debug(1, "No locale files in this package")
-		return
-
-	locales = os.listdir(localedir)
-
-	summary = d.getVar('SUMMARY', True) or pn
-	description = d.getVar('DESCRIPTION', True) or "" 
-        locale_section = d.getVar('LOCALE_SECTION', True)
-	mlprefix = d.getVar('MLPREFIX', True) or ""
-	for l in sorted(locales):
-		ln = legitimize_package_name(l)
-		pkg = pn + '-locale-' + ln
-		packages.append(pkg)
-		d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l))
-		d.setVar('RDEPENDS_' + pkg, '%s %svirtual-locale-%s' % (pn, mlprefix, ln))
-		d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
-		d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
-		d.setVar('DESCRIPTION_' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l))
-		if locale_section:
-			d.setVar('SECTION_' + pkg, locale_section)
-
-	d.setVar('PACKAGES', ' '.join(packages))
-
-	# Disabled by RP 18/06/07
-	# Wildcards aren't supported in debian
-	# They break with ipkg since glibc-locale* will mean that 
-	# glibc-localedata-translit* won't install as a dependency
-	# for some other package which breaks meta-toolchain
-	# Probably breaks since virtual-locale- isn't provided anywhere
-	#rdep = (d.getVar('RDEPENDS_%s' % pn, True) or d.getVar('RDEPENDS', True) or "").split()
-	#rdep.append('%s-locale*' % pn)
-	#d.setVar('RDEPENDS_%s' % pn, ' '.join(rdep))
+    if (d.getVar('PACKAGE_NO_LOCALE', True) == '1'):
+        bb.debug(1, "package requested not splitting locales")
+        return
+
+    packages = (d.getVar('PACKAGES', True) or "").split()
+
+    datadir = d.getVar('datadir', True)
+    if not datadir:
+        bb.note("datadir not defined")
+        return
+
+    dvar = d.getVar('PKGD', True)
+    pn = d.getVar('PN', True)
+
+    if pn + '-locale' in packages:
+        packages.remove(pn + '-locale')
+
+    localedir = os.path.join(dvar + datadir, 'locale')
+
+    if not os.path.isdir(localedir):
+        bb.debug(1, "No locale files in this package")
+        return
+
+    locales = os.listdir(localedir)
+
+    summary = d.getVar('SUMMARY', True) or pn
+    description = d.getVar('DESCRIPTION', True) or ""
+    locale_section = d.getVar('LOCALE_SECTION', True)
+    mlprefix = d.getVar('MLPREFIX', True) or ""
+    for l in sorted(locales):
+        ln = legitimize_package_name(l)
+        pkg = pn + '-locale-' + ln
+        packages.append(pkg)
+        d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l))
+        d.setVar('RDEPENDS_' + pkg, '%s %svirtual-locale-%s' % (pn, mlprefix, ln))
+        d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
+        d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
+        d.setVar('DESCRIPTION_' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l))
+        if locale_section:
+            d.setVar('SECTION_' + pkg, locale_section)
+
+    d.setVar('PACKAGES', ' '.join(packages))
+
+    # Disabled by RP 18/06/07
+    # Wildcards aren't supported in debian
+    # They break with ipkg since glibc-locale* will mean that
+    # glibc-localedata-translit* won't install as a dependency
+    # for some other package which breaks meta-toolchain
+    # Probably breaks since virtual-locale- isn't provided anywhere
+    #rdep = (d.getVar('RDEPENDS_%s' % pn, True) or d.getVar('RDEPENDS', True) or "").split()
+    #rdep.append('%s-locale*' % pn)
+    #d.setVar('RDEPENDS_%s' % pn, ' '.join(rdep))
 }
 
 python perform_packagecopy () {
-	import subprocess
-	dest = d.getVar('D', True)
-	dvar = d.getVar('PKGD', True)
+    import subprocess
+    dest = d.getVar('D', True)
+    dvar = d.getVar('PKGD', True)
 
-	bb.mkdirhier(dvar)
+    bb.mkdirhier(dvar)
 
-	# Start by package population by taking a copy of the installed 
-	# files to operate on
-	subprocess.call('rm -rf %s/*' % (dvar), shell=True)
-	# Preserve sparse files and hard links
-	subprocess.call('tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar), shell=True)
+    # Start by package population by taking a copy of the installed
+    # files to operate on
+    subprocess.call('rm -rf %s/*' % (dvar), shell=True)
+    # Preserve sparse files and hard links
+    subprocess.call('tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar), shell=True)
 }
 
 # We generate a master list of directories to process, we start by
 # seeding this list with reasonable defaults, then load from
 # the fs-perms.txt files
 python fixup_perms () {
-	import os, pwd, grp
-
-	# init using a string with the same format as a line as documented in
-	# the fs-perms.txt file
-	# <path> <mode> <uid> <gid> <walk> <fmode> <fuid> <fgid>
-	# <path> link <link target>
-	#
-	# __str__ can be used to print out an entry in the input format
-	#
-	# if fs_perms_entry.path is None:
-	#	an error occured
-	# if fs_perms_entry.link, you can retrieve:
-	#	fs_perms_entry.path = path
-	#	fs_perms_entry.link = target of link
-	# if not fs_perms_entry.link, you can retrieve:
-	#	fs_perms_entry.path = path
-	#	fs_perms_entry.mode = expected dir mode or None
-	#	fs_perms_entry.uid = expected uid or -1
-	#	fs_perms_entry.gid = expected gid or -1
-	#	fs_perms_entry.walk = 'true' or something else
-	#	fs_perms_entry.fmode = expected file mode or None
-	#	fs_perms_entry.fuid = expected file uid or -1
-	#	fs_perms_entry_fgid = expected file gid or -1
-	class fs_perms_entry():
-		def __init__(self, line):
-			lsplit = line.split()
-			if len(lsplit) == 3 and lsplit[1].lower() == "link":
-				self._setlink(lsplit[0], lsplit[2])
-			elif len(lsplit) == 8:
-				self._setdir(lsplit[0], lsplit[1], lsplit[2], lsplit[3], lsplit[4], lsplit[5], lsplit[6], lsplit[7])
-			else:
-				bb.error("Fixup Perms: invalid config line %s" % line)
-				self.path = None
-				self.link = None
-
-		def _setdir(self, path, mode, uid, gid, walk, fmode, fuid, fgid):
-			self.path = os.path.normpath(path)
-			self.link = None
-			self.mode = self._procmode(mode)
-			self.uid  = self._procuid(uid)
-			self.gid  = self._procgid(gid)
-			self.walk = walk.lower()
-			self.fmode = self._procmode(fmode)
-			self.fuid = self._procuid(fuid)
-			self.fgid = self._procgid(fgid)
-
-		def _setlink(self, path, link):
-			self.path = os.path.normpath(path)
-			self.link = link
-
-		def _procmode(self, mode):
-			if not mode or (mode and mode == "-"):
-				return None
-			else:
-				return int(mode,8)
-
-		# Note uid/gid -1 has special significance in os.lchown
-		def _procuid(self, uid):
-			if uid is None or uid == "-":
-				return -1
-			elif uid.isdigit():
-				return int(uid)
-			else:
-				return pwd.getpwnam(uid).pw_uid
-
-		def _procgid(self, gid):
-			if gid is None or gid == "-":
-				return -1
-			elif gid.isdigit():
-				return int(gid)
-			else:
-				return grp.getgrnam(gid).gr_gid
-
-		# Use for debugging the entries
-		def __str__(self):
-			if self.link:
-				return "%s link %s" % (self.path, self.link)
-			else:
-				mode = "-"
-				if self.mode:
-					mode = "0%o" % self.mode
-				fmode = "-"
-				if self.fmode:
-					fmode = "0%o" % self.fmode
-				uid = self._mapugid(self.uid)
-				gid = self._mapugid(self.gid)
-				fuid = self._mapugid(self.fuid)
-				fgid = self._mapugid(self.fgid)
-				return "%s %s %s %s %s %s %s %s" % (self.path, mode, uid, gid, self.walk, fmode, fuid, fgid)
-
-		def _mapugid(self, id):
-			if id is None or id == -1:
-				return "-"
-			else:
-				return "%d" % id
-
-	# Fix the permission, owner and group of path
-	def fix_perms(path, mode, uid, gid, dir):
-		if mode and not os.path.islink(path):
-			#bb.note("Fixup Perms: chmod 0%o %s" % (mode, dir))
-			os.chmod(path, mode)
-		# -1 is a special value that means don't change the uid/gid
-		# if they are BOTH -1, don't bother to lchown
-		if not (uid == -1 and gid == -1):
-			#bb.note("Fixup Perms: lchown %d:%d %s" % (uid, gid, dir))
-			os.lchown(path, uid, gid)
-
-	# Return a list of configuration files based on either the default
-	# files/fs-perms.txt or the contents of FILESYSTEM_PERMS_TABLES
-	# paths are resolved via BBPATH
-	def get_fs_perms_list(d):
-		str = ""
-		fs_perms_tables = d.getVar('FILESYSTEM_PERMS_TABLES', True)
-		if not fs_perms_tables:
-			fs_perms_tables = 'files/fs-perms.txt'
-		for conf_file in fs_perms_tables.split():
-			str += " %s" % bb.which(d.getVar('BBPATH', True), conf_file)
-		return str
-
-
-
-	dvar = d.getVar('PKGD', True)
-
-	fs_perms_table = {}
-
-	# By default all of the standard directories specified in
-	# bitbake.conf will get 0755 root:root.
-	target_path_vars = [	'base_prefix',
-				'prefix',
-				'exec_prefix',
-				'base_bindir',
-				'base_sbindir',
-				'base_libdir',
-				'datadir',
-				'sysconfdir',
-				'servicedir',
-				'sharedstatedir',
-				'localstatedir',
-				'infodir',
-				'mandir',
-				'docdir',
-				'bindir',
-				'sbindir',
-				'libexecdir',
-				'libdir',
-				'includedir',
-				'oldincludedir' ]
-
-	for path in target_path_vars:
-		dir = d.getVar(path, True) or ""
-		if dir == "":
-			continue
-		fs_perms_table[dir] = fs_perms_entry(bb.data.expand("%s 0755 root root false - - -" % (dir), d))
-
-	# Now we actually load from the configuration files
-	for conf in get_fs_perms_list(d).split():
-		if os.path.exists(conf):
-			f = open(conf)
-			for line in f:
-				if line.startswith('#'):
-					continue
-				lsplit = line.split()
-				if len(lsplit) == 0:
-					continue
-				if len(lsplit) != 8 and not (len(lsplit) == 3 and lsplit[1].lower() == "link"):
-					bb.error("Fixup perms: %s invalid line: %s" % (conf, line))
-					continue
-				entry = fs_perms_entry(d.expand(line))
-				if entry and entry.path:
-					fs_perms_table[entry.path] = entry
-			f.close()
-
-	# Debug -- list out in-memory table
-	#for dir in fs_perms_table:
-	#	bb.note("Fixup Perms: %s: %s" % (dir, str(fs_perms_table[dir])))
-
-	# We process links first, so we can go back and fixup directory ownership
-	# for any newly created directories
-	for dir in fs_perms_table:
-		if not fs_perms_table[dir].link:
-			continue
-
-		origin = dvar + dir
-		if not (os.path.exists(origin) and os.path.isdir(origin) and not os.path.islink(origin)):
-			continue
-
-		link = fs_perms_table[dir].link
-		if link[0] == "/":
-			target = dvar + link
-			ptarget = link
-		else:
-			target = os.path.join(os.path.dirname(origin), link)
-			ptarget = os.path.join(os.path.dirname(dir), link)
-		if os.path.exists(target):
-			bb.error("Fixup Perms: Unable to correct directory link, target already exists: %s -> %s" % (dir, ptarget))
-			continue
-
-		# Create path to move directory to, move it, and then setup the symlink
-		bb.mkdirhier(os.path.dirname(target))
-		#bb.note("Fixup Perms: Rename %s -> %s" % (dir, ptarget))
-		os.rename(origin, target)
-		#bb.note("Fixup Perms: Link %s -> %s" % (dir, link))
-		os.symlink(link, origin)
-
-	for dir in fs_perms_table:
-		if fs_perms_table[dir].link:
-			continue
-
-		origin = dvar + dir
-		if not (os.path.exists(origin) and os.path.isdir(origin)):
-			continue
-
-		fix_perms(origin, fs_perms_table[dir].mode, fs_perms_table[dir].uid, fs_perms_table[dir].gid, dir)
-
-		if fs_perms_table[dir].walk == 'true':
-			for root, dirs, files in os.walk(origin):
-				for dr in dirs:
-					each_dir = os.path.join(root, dr)
-					fix_perms(each_dir, fs_perms_table[dir].mode, fs_perms_table[dir].uid, fs_perms_table[dir].gid, dir)
-				for f in files:
-					each_file = os.path.join(root, f)
-					fix_perms(each_file, fs_perms_table[dir].fmode, fs_perms_table[dir].fuid, fs_perms_table[dir].fgid, dir)
+    import os, pwd, grp
+
+    # init using a string with the same format as a line as documented in
+    # the fs-perms.txt file
+    # <path> <mode> <uid> <gid> <walk> <fmode> <fuid> <fgid>
+    # <path> link <link target>
+    #
+    # __str__ can be used to print out an entry in the input format
+    #
+    # if fs_perms_entry.path is None:
+    #    an error occured
+    # if fs_perms_entry.link, you can retrieve:
+    #    fs_perms_entry.path = path
+    #    fs_perms_entry.link = target of link
+    # if not fs_perms_entry.link, you can retrieve:
+    #    fs_perms_entry.path = path
+    #    fs_perms_entry.mode = expected dir mode or None
+    #    fs_perms_entry.uid = expected uid or -1
+    #    fs_perms_entry.gid = expected gid or -1
+    #    fs_perms_entry.walk = 'true' or something else
+    #    fs_perms_entry.fmode = expected file mode or None
+    #    fs_perms_entry.fuid = expected file uid or -1
+    #    fs_perms_entry_fgid = expected file gid or -1
+    class fs_perms_entry():
+        def __init__(self, line):
+            lsplit = line.split()
+            if len(lsplit) == 3 and lsplit[1].lower() == "link":
+                self._setlink(lsplit[0], lsplit[2])
+            elif len(lsplit) == 8:
+                self._setdir(lsplit[0], lsplit[1], lsplit[2], lsplit[3], lsplit[4], lsplit[5], lsplit[6], lsplit[7])
+            else:
+                bb.error("Fixup Perms: invalid config line %s" % line)
+                self.path = None
+                self.link = None
+
+        def _setdir(self, path, mode, uid, gid, walk, fmode, fuid, fgid):
+            self.path = os.path.normpath(path)
+            self.link = None
+            self.mode = self._procmode(mode)
+            self.uid  = self._procuid(uid)
+            self.gid  = self._procgid(gid)
+            self.walk = walk.lower()
+            self.fmode = self._procmode(fmode)
+            self.fuid = self._procuid(fuid)
+            self.fgid = self._procgid(fgid)
+
+        def _setlink(self, path, link):
+            self.path = os.path.normpath(path)
+            self.link = link
+
+        def _procmode(self, mode):
+            if not mode or (mode and mode == "-"):
+                return None
+            else:
+                return int(mode,8)
+
+        # Note uid/gid -1 has special significance in os.lchown
+        def _procuid(self, uid):
+            if uid is None or uid == "-":
+                return -1
+            elif uid.isdigit():
+                return int(uid)
+            else:
+                return pwd.getpwnam(uid).pw_uid
+
+        def _procgid(self, gid):
+            if gid is None or gid == "-":
+                return -1
+            elif gid.isdigit():
+                return int(gid)
+            else:
+                return grp.getgrnam(gid).gr_gid
+
+        # Use for debugging the entries
+        def __str__(self):
+            if self.link:
+                return "%s link %s" % (self.path, self.link)
+            else:
+                mode = "-"
+                if self.mode:
+                    mode = "0%o" % self.mode
+                fmode = "-"
+                if self.fmode:
+                    fmode = "0%o" % self.fmode
+                uid = self._mapugid(self.uid)
+                gid = self._mapugid(self.gid)
+                fuid = self._mapugid(self.fuid)
+                fgid = self._mapugid(self.fgid)
+                return "%s %s %s %s %s %s %s %s" % (self.path, mode, uid, gid, self.walk, fmode, fuid, fgid)
+
+        def _mapugid(self, id):
+            if id is None or id == -1:
+                return "-"
+            else:
+                return "%d" % id
+
+    # Fix the permission, owner and group of path
+    def fix_perms(path, mode, uid, gid, dir):
+        if mode and not os.path.islink(path):
+            #bb.note("Fixup Perms: chmod 0%o %s" % (mode, dir))
+            os.chmod(path, mode)
+        # -1 is a special value that means don't change the uid/gid
+        # if they are BOTH -1, don't bother to lchown
+        if not (uid == -1 and gid == -1):
+            #bb.note("Fixup Perms: lchown %d:%d %s" % (uid, gid, dir))
+            os.lchown(path, uid, gid)
+
+    # Return a list of configuration files based on either the default
+    # files/fs-perms.txt or the contents of FILESYSTEM_PERMS_TABLES
+    # paths are resolved via BBPATH
+    def get_fs_perms_list(d):
+        str = ""
+        fs_perms_tables = d.getVar('FILESYSTEM_PERMS_TABLES', True)
+        if not fs_perms_tables:
+            fs_perms_tables = 'files/fs-perms.txt'
+        for conf_file in fs_perms_tables.split():
+            str += " %s" % bb.which(d.getVar('BBPATH', True), conf_file)
+        return str
+
+
+
+    dvar = d.getVar('PKGD', True)
+
+    fs_perms_table = {}
+
+    # By default all of the standard directories specified in
+    # bitbake.conf will get 0755 root:root.
+    target_path_vars = [    'base_prefix',
+                'prefix',
+                'exec_prefix',
+                'base_bindir',
+                'base_sbindir',
+                'base_libdir',
+                'datadir',
+                'sysconfdir',
+                'servicedir',
+                'sharedstatedir',
+                'localstatedir',
+                'infodir',
+                'mandir',
+                'docdir',
+                'bindir',
+                'sbindir',
+                'libexecdir',
+                'libdir',
+                'includedir',
+                'oldincludedir' ]
+
+    for path in target_path_vars:
+        dir = d.getVar(path, True) or ""
+        if dir == "":
+            continue
+        fs_perms_table[dir] = fs_perms_entry(bb.data.expand("%s 0755 root root false - - -" % (dir), d))
+
+    # Now we actually load from the configuration files
+    for conf in get_fs_perms_list(d).split():
+        if os.path.exists(conf):
+            f = open(conf)
+            for line in f:
+                if line.startswith('#'):
+                    continue
+                lsplit = line.split()
+                if len(lsplit) == 0:
+                    continue
+                if len(lsplit) != 8 and not (len(lsplit) == 3 and lsplit[1].lower() == "link"):
+                    bb.error("Fixup perms: %s invalid line: %s" % (conf, line))
+                    continue
+                entry = fs_perms_entry(d.expand(line))
+                if entry and entry.path:
+                    fs_perms_table[entry.path] = entry
+            f.close()
+
+    # Debug -- list out in-memory table
+    #for dir in fs_perms_table:
+    #    bb.note("Fixup Perms: %s: %s" % (dir, str(fs_perms_table[dir])))
+
+    # We process links first, so we can go back and fixup directory ownership
+    # for any newly created directories
+    for dir in fs_perms_table:
+        if not fs_perms_table[dir].link:
+            continue
+
+        origin = dvar + dir
+        if not (os.path.exists(origin) and os.path.isdir(origin) and not os.path.islink(origin)):
+            continue
+
+        link = fs_perms_table[dir].link
+        if link[0] == "/":
+            target = dvar + link
+            ptarget = link
+        else:
+            target = os.path.join(os.path.dirname(origin), link)
+            ptarget = os.path.join(os.path.dirname(dir), link)
+        if os.path.exists(target):
+            bb.error("Fixup Perms: Unable to correct directory link, target already exists: %s -> %s" % (dir, ptarget))
+            continue
+
+        # Create path to move directory to, move it, and then setup the symlink
+        bb.mkdirhier(os.path.dirname(target))
+        #bb.note("Fixup Perms: Rename %s -> %s" % (dir, ptarget))
+        os.rename(origin, target)
+        #bb.note("Fixup Perms: Link %s -> %s" % (dir, link))
+        os.symlink(link, origin)
+
+    for dir in fs_perms_table:
+        if fs_perms_table[dir].link:
+            continue
+
+        origin = dvar + dir
+        if not (os.path.exists(origin) and os.path.isdir(origin)):
+            continue
+
+        fix_perms(origin, fs_perms_table[dir].mode, fs_perms_table[dir].uid, fs_perms_table[dir].gid, dir)
+
+        if fs_perms_table[dir].walk == 'true':
+            for root, dirs, files in os.walk(origin):
+                for dr in dirs:
+                    each_dir = os.path.join(root, dr)
+                    fix_perms(each_dir, fs_perms_table[dir].mode, fs_perms_table[dir].uid, fs_perms_table[dir].gid, dir)
+                for f in files:
+                    each_file = os.path.join(root, f)
+                    fix_perms(each_file, fs_perms_table[dir].fmode, fs_perms_table[dir].fuid, fs_perms_table[dir].fgid, dir)
 }
 
 python split_and_strip_files () {
-	import commands, stat, errno, subprocess
-
-	dvar = d.getVar('PKGD', True)
-	pn = d.getVar('PN', True)
-
-	# We default to '.debug' style
-	if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE', True) == 'debug-file-directory':
-		# Single debug-file-directory style debug info
-		debugappend = ".debug"
-		debugdir = ""
-		debuglibdir = "/usr/lib/debug"
-		debugsrcdir = "/usr/src/debug"
-	else:
-		# Original OE-core, a.k.a. ".debug", style debug info
-		debugappend = ""
-		debugdir = "/.debug"
-		debuglibdir = ""
-		debugsrcdir = "/usr/src/debug"
-
-	os.chdir(dvar)
-
-	# Return type (bits):
-	# 0 - not elf
-	# 1 - ELF
-	# 2 - stripped
-	# 4 - executable
-	# 8 - shared library
-	def isELF(path):
-		type = 0
-		pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
-		ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, path))
-
-		if ret:
-			bb.error("split_and_strip_files: 'file %s' failed" % path)
-			return type
-
-		# Not stripped
-		if "ELF" in result:
-			type |= 1
-			if "not stripped" not in result:
-				type |= 2
-			if "executable" in result:
-				type |= 4
-			if "shared" in result:
-				type |= 8
-		return type
-
-
-	#
-	# First lets figure out all of the files we may have to process ... do this only once!
-	#
-	file_list = {}
-	file_links = {}
-	if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT', True) != '1') and \
-	   (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
-		for root, dirs, files in os.walk(dvar):
-			for f in files:
-				file = os.path.join(root, f)
-				# Only process files (and symlinks)... Skip files that are obviously debug files
-				if not (debugappend != "" and file.endswith(debugappend)) and \
-				   not (debugdir != "" and debugdir in os.path.dirname(file[len(dv