mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

insane: Fix python function whitespace changes

Browse Source 
(From OE-Core rev: 9dee6c2fe0d1882521c0f9a6998257a652845854)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2014-02-03 15:15:29 +00:00
parent 220f4f5806
commit 76f52a81f6
1 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/insane.bbclass
+85 -85
View File
@@ -95,7 +95,7 @@ def package_qa_get_machine_dict():
"mips64": ( 8, 0, 0, False, 64), "mips64": ( 8, 0, 0, False, 64),
"mips64el": ( 8, 0, 0, True, 64), "mips64el": ( 8, 0, 0, True, 64),
"avr32": (6317, 0, 0, False, 32), "avr32": (6317, 0, 0, False, 32),
"sh4": (42, 0, 0, True, 32), "sh4": (42, 0, 0, True, 32),
}, },
"uclinux-uclibc" : { "uclinux-uclibc" : {
@@ -309,110 +309,110 @@ def package_qa_check_perm(path,name,d, elf, messages):
QAPATHTEST[unsafe-references-in-binaries] = "package_qa_check_unsafe_references_in_binaries" QAPATHTEST[unsafe-references-in-binaries] = "package_qa_check_unsafe_references_in_binaries"
def package_qa_check_unsafe_references_in_binaries(path, name, d, elf, messages): def package_qa_check_unsafe_references_in_binaries(path, name, d, elf, messages):
""" """
Ensure binaries in base_[bindir|sbindir|libdir] do not link to files under exec_prefix Ensure binaries in base_[bindir|sbindir|libdir] do not link to files under exec_prefix
""" """
if unsafe_references_skippable(path, name, d): if unsafe_references_skippable(path, name, d):
return return
if elf: if elf:
import subprocess as sub import subprocess as sub
pn = d.getVar('PN', True) pn = d.getVar('PN', True)
exec_prefix = d.getVar('exec_prefix', True) exec_prefix = d.getVar('exec_prefix', True)
sysroot_path = d.getVar('STAGING_DIR_TARGET', True) sysroot_path = d.getVar('STAGING_DIR_TARGET', True)
sysroot_path_usr = sysroot_path + exec_prefix sysroot_path_usr = sysroot_path + exec_prefix
try: try:
ldd_output = bb.process.Popen(["prelink-rtld", "--root", sysroot_path, path], stdout=sub.PIPE).stdout.read() ldd_output = bb.process.Popen(["prelink-rtld", "--root", sysroot_path, path], stdout=sub.PIPE).stdout.read()
except bb.process.CmdError: except bb.process.CmdError:
error_msg = pn + ": prelink-rtld aborted when processing %s" % path error_msg = pn + ": prelink-rtld aborted when processing %s" % path
package_qa_handle_error("unsafe-references-in-binaries", error_msg, d) package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
return False return False
if sysroot_path_usr in ldd_output: if sysroot_path_usr in ldd_output:
ldd_output = ldd_output.replace(sysroot_path, "") ldd_output = ldd_output.replace(sysroot_path, "")
pkgdest = d.getVar('PKGDEST', True) pkgdest = d.getVar('PKGDEST', True)
packages = d.getVar('PACKAGES', True) packages = d.getVar('PACKAGES', True)
for package in packages.split(): for package in packages.split():
short_path = path.replace('%s/%s' % (pkgdest, package), "", 1) short_path = path.replace('%s/%s' % (pkgdest, package), "", 1)
if (short_path != path): if (short_path != path):
break break
base_err = pn + ": %s, installed in the base_prefix, requires a shared library under exec_prefix (%s)" % (short_path, exec_prefix) base_err = pn + ": %s, installed in the base_prefix, requires a shared library under exec_prefix (%s)" % (short_path, exec_prefix)
for line in ldd_output.split('\n'): for line in ldd_output.split('\n'):
if exec_prefix in line: if exec_prefix in line:
error_msg = "%s: %s" % (base_err, line.strip()) error_msg = "%s: %s" % (base_err, line.strip())
package_qa_handle_error("unsafe-references-in-binaries", error_msg, d) package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
return False return False
QAPATHTEST[unsafe-references-in-scripts] = "package_qa_check_unsafe_references_in_scripts" QAPATHTEST[unsafe-references-in-scripts] = "package_qa_check_unsafe_references_in_scripts"
def package_qa_check_unsafe_references_in_scripts(path, name, d, elf, messages): def package_qa_check_unsafe_references_in_scripts(path, name, d, elf, messages):
""" """
Warn if scripts in base_[bindir|sbindir|libdir] reference files under exec_prefix Warn if scripts in base_[bindir|sbindir|libdir] reference files under exec_prefix
""" """
if unsafe_references_skippable(path, name, d): if unsafe_references_skippable(path, name, d):
return return
if not elf: if not elf:
import stat import stat
import subprocess import subprocess
pn = d.getVar('PN', True) pn = d.getVar('PN', True)
# Ensure we're checking an executable script # Ensure we're checking an executable script
statinfo = os.stat(path) statinfo = os.stat(path)
if bool(statinfo.st_mode & stat.S_IXUSR): if bool(statinfo.st_mode & stat.S_IXUSR):
# grep shell scripts for possible references to /exec_prefix/ # grep shell scripts for possible references to /exec_prefix/
exec_prefix = d.getVar('exec_prefix', True) exec_prefix = d.getVar('exec_prefix', True)
statement = "grep -e '%s/' %s > /dev/null" % (exec_prefix, path) statement = "grep -e '%s/' %s > /dev/null" % (exec_prefix, path)
if subprocess.call(statement, shell=True) == 0: if subprocess.call(statement, shell=True) == 0:
error_msg = pn + ": Found a reference to %s/ in %s" % (exec_prefix, path) error_msg = pn + ": Found a reference to %s/ in %s" % (exec_prefix, path)
package_qa_handle_error("unsafe-references-in-scripts", error_msg, d) package_qa_handle_error("unsafe-references-in-scripts", error_msg, d)
error_msg = "Shell scripts in base_bindir and base_sbindir should not reference anything in exec_prefix" error_msg = "Shell scripts in base_bindir and base_sbindir should not reference anything in exec_prefix"
package_qa_handle_error("unsafe-references-in-scripts", error_msg, d) package_qa_handle_error("unsafe-references-in-scripts", error_msg, d)
def unsafe_references_skippable(path, name, d): def unsafe_references_skippable(path, name, d):
if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d): if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d):
return True return True
if "-dbg" in name or "-dev" in name: if "-dbg" in name or "-dev" in name:
return True return True
# Other package names to skip: # Other package names to skip:
if name.startswith("kernel-module-"): if name.startswith("kernel-module-"):
return True return True
# Skip symlinks # Skip symlinks
if os.path.islink(path): if os.path.islink(path):
return True return True
# Skip unusual rootfs layouts which make these tests irrelevant # Skip unusual rootfs layouts which make these tests irrelevant
exec_prefix = d.getVar('exec_prefix', True) exec_prefix = d.getVar('exec_prefix', True)
if exec_prefix == "": if exec_prefix == "":
return True return True
pkgdest = d.getVar('PKGDEST', True) pkgdest = d.getVar('PKGDEST', True)
pkgdest = pkgdest + "/" + name pkgdest = pkgdest + "/" + name
pkgdest = os.path.abspath(pkgdest) pkgdest = os.path.abspath(pkgdest)
base_bindir = pkgdest + d.getVar('base_bindir', True) base_bindir = pkgdest + d.getVar('base_bindir', True)
base_sbindir = pkgdest + d.getVar('base_sbindir', True) base_sbindir = pkgdest + d.getVar('base_sbindir', True)
base_libdir = pkgdest + d.getVar('base_libdir', True) base_libdir = pkgdest + d.getVar('base_libdir', True)
bindir = pkgdest + d.getVar('bindir', True) bindir = pkgdest + d.getVar('bindir', True)
sbindir = pkgdest + d.getVar('sbindir', True) sbindir = pkgdest + d.getVar('sbindir', True)
libdir = pkgdest + d.getVar('libdir', True) libdir = pkgdest + d.getVar('libdir', True)
if base_bindir == bindir and base_sbindir == sbindir and base_libdir == libdir: if base_bindir == bindir and base_sbindir == sbindir and base_libdir == libdir:
return True return True
# Skip files not in base_[bindir|sbindir|libdir] # Skip files not in base_[bindir|sbindir|libdir]
path = os.path.abspath(path) path = os.path.abspath(path)
if not (base_bindir in path or base_sbindir in path or base_libdir in path): if not (base_bindir in path or base_sbindir in path or base_libdir in path):
return True return True
return False return False
QAPATHTEST[arch] = "package_qa_check_arch" QAPATHTEST[arch] = "package_qa_check_arch"
def package_qa_check_arch(path,name,d, elf, messages): def package_qa_check_arch(path,name,d, elf, messages):
@@ -443,11 +443,11 @@ def package_qa_check_arch(path,name,d, elf, messages):
# Check the architecture and endiannes of the binary # Check the architecture and endiannes of the binary
if not ((machine == elf.machine()) or \ if not ((machine == elf.machine()) or \
("virtual/kernel" in provides) and (target_os == "linux-gnux32")): ("virtual/kernel" in provides) and (target_os == "linux-gnux32")):
messages.append("Architecture did not match (%d to %d) on %s" % \ messages.append("Architecture did not match (%d to %d) on %s" % \
(machine, elf.machine(), package_qa_clean_path(path,d))) (machine, elf.machine(), package_qa_clean_path(path,d)))
elif not ((bits == elf.abiSize()) or \ elif not ((bits == elf.abiSize()) or \
("virtual/kernel" in provides) and (target_os == "linux-gnux32")): ("virtual/kernel" in provides) and (target_os == "linux-gnux32")):
messages.append("Bit size did not match (%d to %d) %s on %s" % \ messages.append("Bit size did not match (%d to %d) %s on %s" % \
(bits, elf.abiSize(), bpn, package_qa_clean_path(path,d))) (bits, elf.abiSize(), bpn, package_qa_clean_path(path,d)))
elif not littleendian == elf.isLittleEndian(): elif not littleendian == elf.isLittleEndian():
@@ -949,7 +949,7 @@ Missing inherit gettext?""" % (gt, config))
whitelist = set(d.getVar("UNKNOWN_CONFIGURE_WHITELIST", True).split()) whitelist = set(d.getVar("UNKNOWN_CONFIGURE_WHITELIST", True).split())
options -= whitelist options -= whitelist
if options: if options:
pn = d.getVar('PN', True) pn = d.getVar('PN', True)
error_msg = pn + ": configure was passed unrecognised options: " + " ".join(options) error_msg = pn + ": configure was passed unrecognised options: " + " ".join(options)
package_qa_handle_error("unknown-configure-option", error_msg, d) package_qa_handle_error("unknown-configure-option", error_msg, d)
except subprocess.CalledProcessError: except subprocess.CalledProcessError: