Skip to contentSkip to conversation

backports: few python enhancements

PATCH New Luis R. Rodriguez 1 participant 9 messages May 1, 2014 Library code

lore
Share & tools
lore
#0 lore raw

cover backports: few python enhancements

This mainly addresses the lack of checks for binaries which are required to run some of our python tools. This also fixes some bug I found with some older versions of Python which I encountered on a fresh install of OpenSUSE 13.1. Two upstream patches were also merged that we were carrying around, so we can nuke 'em.

I haven't addressed compilation onto next-20140501, I don't have time for that right now, patches welcome to help with that.

Luis R. Rodriguez (8):
backports: add a Python binary package dependency library
backports: add backports-update-manager binary requirements
backports: add gentree.py binary requirements
backports: run autopep8 on ckmake
backports: add ckmake binary requirements
backports: remove two upstream patches
backports: devel/backports-update-manager: fix for older shutil.move
backports: fix igb patch for next-20140501

 devel/backports-update-manager                     |   29 +-
 devel/ckmake                                       | 1010 +++++++++++---------
 gentree.py                                         |   12 +
 lib/bpreqs.py                                      |  209 ++++
 .../0001-6lowpan-namespace.patch                   |  138 ---
 .../0002-include-new-netns-headers.patch           |   12 -
 .../0001-igb_net_device_ops.patch                  |   14 +-
 7 files changed, 782 insertions(+), 642 deletions(-)
 create mode 100644 lib/bpreqs.py
 delete mode 100644 patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch
 delete mode 100644 patches/0000-upstream-backport-changes/0002-include-new-netns-headers.patch
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/8 backports: add a Python binary package dependency library

From: "Luis R. Rodriguez" <[email protected]>

This lets us use this in our python scripts for program dependencies that they might have, instead of getting nasty stack traces you get output that's a very useful and clear. This is also important as we move along with Coccinelle and require newer versions with new bells and whisteles added upstream to Coccinelle.

---
 lib/bpreqs.py | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 209 insertions(+)
 create mode 100644 lib/bpreqs.py
lib/bpreqs.py new file +209 -0
new file mode 100644
index 0000000..6c46670
@@ -0,0 +1,209 @@
+import subprocess, os, sys, re
+"""
+Often enough Python code can grow to depend on binaries
+on a system, you may also require only specific versions
+of these. This small library helps with this. It also has
+helpers for packages which we know to handle already.
+"""
+
+class ReqError(Exception):
+    pass
+class ExecutionError(ReqError):
+    def __init__(self, errcode):
+        self.error_code = errcode
+
+class Req:
+    "To be used for verifying binay package dependencies on Python code"
+    def __init__(self):
+        self.all_reqs_ok = True
+        self.debug = False
+    def enable_debug(self):
+        self.debug = True
+    def reqs_match(self):
+        if self.all_reqs_ok:
+            return True
+        sys.stdout.write("You have unfulfilled binary requirements\n")
+        return False
+    def req_missing(self, program):
+        self.all_reqs_ok = False
+        sys.stdout.write("You need to have installed: %s\n" % program)
+    def req_old_program(self, program, version_req):
+        self.all_reqs_ok = False
+        sys.stdout.write("You need to have installed: %s >= %s\n" % (program, version_req))
+    def which(self, program):
+        cmd = ['which', program]
+        process = subprocess.Popen(cmd,
+                                   stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                                   close_fds=True, universal_newlines=True)
+        stdout = process.communicate()[0]
+        process.wait()
+        if process.returncode != 0:
+            raise ExecutionError(process.returncode)
+        return stdout
+    def req_exists(self, program):
+        cmd = ['which', program]
+        process = subprocess.Popen(cmd,
+                                   stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                                   close_fds=True, universal_newlines=True)
+        stdout = process.communicate()[0]
+        process.wait()
+        if process.returncode == 0:
+            return True
+        return False
+    def req_get_prog_version(self, program, version_query, version_pos):
+        '''
+        Suppose you have a binary that outputs:
+        $ spatch --version
+        spatch version 1.0.0-rc21 with Python support and with PCRE support
+
+        Every program veries what it wants you to query it for a version string,
+        prog_version() is designed so that you pass what the program expects for
+        its version query, and the position you expect the version string to be
+        on using python list.
+        '''
+        cmd = [program, version_query]
+        process = subprocess.Popen(cmd,
+                                   stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                                   close_fds=True, universal_newlines=True)
+        stdout = process.communicate()[0]
+        process.wait()
+        if process.returncode != 0:
+            raise ExecutionError(process.returncode)
+        if self.debug:
+            sys.stdout.write("Running '%s' got us this break down:\n%s\n" %
+                             (
+                             ' '.join(cmd),
+                             "\n".join(map(str, [[i, x] for i, x in enumerate(stdout.split())])),
+                             ))
+            sys.stdout.write("You are using for version: %s\n" % stdout.split()[version_pos])
+            sys.stdout.write("Specifically your idx, element: %s\n" % ([[i, x] for i, x in enumerate(stdout.split())][version_pos]))
+        return stdout.split()[version_pos]
+    def __compute_rel_weight(self, rel_specs):
+        weight = 0
+        extra = 0
+        sublevel = 0
+        relmod = 0
+
+        if self.debug:
+            sys.stdout.write("VERSION       = %s\n" % rel_specs['VERSION'])
+            sys.stdout.write("PATCHLEVEL    = %s\n" % rel_specs['PATCHLEVEL'])
+            sys.stdout.write("SUBLEVEL      = %s\n" % rel_specs['SUBLEVEL'])
+            sys.stdout.write("EXTRAVERSION  = %s\n" % rel_specs['EXTRAVERSION'])
+            sys.stdout.write("RELMOD_UPDATE = %s\n" % rel_specs['RELMOD_UPDATE'])
+
+        if rel_specs['EXTRAVERSION'] != '':
+            if ("." in rel_specs['EXTRAVERSION'] or
+                    "rc" in rel_specs['EXTRAVERSION']):
+                rc = rel_specs['EXTRAVERSION'].lstrip("-rc")
+                if (rc == ""):
+                    rc = 0
+                else:
+                    rc = int(rc) - 20
+                extra = int(rc)
+            else:
+                extra = int(rel_specs['EXTRAVERSION']) + 10
+
+        if rel_specs['SUBLEVEL'] != '':
+            sublevel = int(rel_specs['SUBLEVEL'].lstrip(".")) * 20
+        else:
+            sublevel = 5
+
+        if rel_specs['RELMOD_UPDATE'] != '':
+            mod = rel_specs['RELMOD_UPDATE']
+            if (mod == ""):
+                mod = 0
+            else:
+                mod = int(mod)
+            relmod = int(mod)
+
+        weight = (int(rel_specs['VERSION'])    << 32) + \
+                 (int(rel_specs['PATCHLEVEL']) << 16) + \
+                 (sublevel   		       << 8 ) + \
+                 (extra * 60) + (relmod * 2)
+
+        return weight
+    def req_get_rel_spec(self, rel):
+        if "rc" in rel:
+            m = re.match(r"v*(?P<VERSION>\d+)\.+"
+                         "(?P<PATCHLEVEL>\d+)[.]*"
+                         "(?P<SUBLEVEL>\d*)"
+                         "(?P<EXTRAVERSION>[-rc]+\w*)\-*"
+                         "(?P<RELMOD_UPDATE>\d*)[-]*",
+                         rel)
+        else:
+            m = re.match(r"v*(?P<VERSION>\d+)\.+"
+                         "(?P<PATCHLEVEL>\d+)[.]*"
+                         "(?P<SUBLEVEL>\d*)[.]*"
+                         "(?P<EXTRAVERSION>\w*)\-*"
+                         "(?P<RELMOD_UPDATE>\d*)[-]*",
+                         rel)
+        if not m:
+            return m
+        rel_specs = m.groupdict()
+        return rel_specs
+    def compute_rel_weight(self, rel):
+        rel_specs = self.req_get_rel_spec(rel)
+        if not rel_specs:
+            return 0
+        return self.__compute_rel_weight(rel_specs)
+    def linux_version_cmp(self, version_req, version):
+        '''
+        If the program follows the linux version style scheme you can
+        use this to compare versions.
+        '''
+        weight_has = self.compute_rel_weight(version)
+        weight_req = self.compute_rel_weight(version_req)
+
+        if self.debug:
+            sys.stdout.write("You have program weight: %s\n" % weight_has)
+            sys.stdout.write("Required program weight: %s\n" % weight_req)
+
+        if weight_has < weight_req:
+            return -1
+        return 0
+    def require_version(self, program, version_query, version_req, version_pos, version_cmp):
+        '''
+        If you have a program version requirement you can specify it here,
+        as for the other flags refer to prog_version.
+        '''
+        if not self.require(program):
+            return False
+        version = self.req_get_prog_version(program, version_query, version_pos)
+        if self.debug:
+            sys.stdout.write("Checking release specs and weight: for: %s\n" % program)
+            sys.stdout.write("You have version: %s\n" % version)
+            sys.stdout.write("Required version: %s\n" % version_req)
+        if version_cmp(version_req, version) != 0:
+            self.req_old_program(program, version_req)
+            return False
+        return True
+    def require(self, program):
+        if self.req_exists(program):
+            return True
+        self.req_missing(program)
+        return False
+    def require_hint(self, program, package_hint):
+        if self.require(program):
+            return True
+        sys.stdout.write("Try installing the package: %s\n" % package_hint)
+        return False
+    def coccinelle(self, version):
+        if self.require_version('spatch', '--version', version, 2, self.linux_version_cmp):
+            return True
+        sys.stdout.write("Try installing the package: coccinelle\n")
+        sys.stdout.write("If that is too old go grab the code from source:\n\n")
+        sys.stdout.write("git clone https://github.com/coccinelle/coccinelle.git\n\n")
+        sys.stdout.write("To build you will need: ocaml ncurses-devel\n\n")
+        sys.stdout.write("If on SUSE / OpenSUSE you will also need: ocaml-ocamldoc\n\n")
+        return False
+    def kup(self):
+        if self.require('kup'):
+            return True
+        sys.stdout.write("Try installing the package: kup\n")
+        sys.stdout.write("If your distribution lacks that go get from source:\n\n")
+        sys.stdout.write("git clone git://git.kernel.org/pub/scm/utils/kup/kup.git\n\n")
+        return False
+    def make(self, version):
+        return self.require_version('make', '--version', version, 2, self.linux_version_cmp)
+    def gcc(self, version):
+        return self.require_version('gcc', '--version', version, 3, self.linux_version_cmp)
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/8 backports: add backports-update-manager binary requirements

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

---
 devel/backports-update-manager | 9 +++++++++
 1 file changed, 9 insertions(+)
devel/backports-update-manager +9 -0
index 8d2cd08..fc146c6 100755
@@ -8,6 +8,7 @@ source_dir = os.path.abspath(os.path.dirname(__file__))
 sys.path.append(source_dir + '/../')
 from lib import bpar as ar
 from lib import bpgit as git
+from lib import bpreqs as reqs
 
 KPATH="http://kernel.ubuntu.com/~kernel-ppa/mainline/"
 BACKPORTS_KSRC_DIR="ksrc-backports"
@@ -562,6 +563,14 @@ def bk_tar_members(members):
             yield tarinfo
 
 def _main():
+    req = reqs.Req()
+    req.require_hint('ar', 'binutils')
+    req.require('make')
+    req.require('gcc')
+    req.require('git')
+    if not req.reqs_match():
+        sys.exit(1)
+
     parser = argparse.ArgumentParser(description='Linux kernel backports update manager')
     parser.add_argument('--force', const=True, default=False, action="store_const",
                         help='Force run without sanity or careful user checks')
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/8 backports: add gentree.py binary requirements

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

---
 gentree.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
gentree.py +12 -0
index 1058884..8a8f6b6 100755
@@ -15,6 +15,7 @@ from lib import bpgit as git
 from lib import bpgpg as gpg
 from lib import bpkup as kup
 from lib.tempdir import tempdir
+from lib import bpreqs as reqs
 
 def read_copy_list(copyfile):
     """
@@ -438,6 +439,13 @@ def upload_release(args, rel_prep, logwrite=lambda x:None):
         logwrite("kup-test: skipping cmd: %s" % kup_cmd)
 
 def _main():
+    # Our binary requirements go here
+    req = reqs.Req()
+    req.require('git')
+    req.coccinelle('1.0.0-rc21')
+    if not req.reqs_match():
+        sys.exit(1)
+
     # set up and parse arguments
     parser = argparse.ArgumentParser(description='generate backport tree')
     parser.add_argument('kerneldir', metavar='<kernel tree>', type=str,
@@ -880,6 +888,10 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
     git_debug_snapshot(args, "disable unsatisfied Makefile parts")
 
     if (args.kup or args.kup_test):
+        req = reqs.Req()
+        req.kup()
+        if not req.reqs_match():
+            sys.exit(1)
         upload_release(args, rel_prep, logwrite=logwrite)
 
     logwrite('Done!')
Signature · 1 line
1.9.1
#4 lore raw

PATCH 4/8 backports: run autopep8 on ckmake

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This converts rel-html.py to conform to the PEP 8 style guide using autopep8. If using vi, consider adding this to your .vimrc:

filetype indent plugin on
au FileType python setlocal tabstop=8 expandtab shiftwidth=4 softtabstop=4

---
 devel/ckmake | 997 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 519 insertions(+), 478 deletions(-)
 mode change 100755 => 100644 devel/ckmake
devel/ckmake +519 -478
old mode 100755
new mode 100644
index a78eeff..3e3d95e
@@ -40,539 +40,580 @@ home = os.getenv("HOME")
 ksrc = home + "/" + "ksrc-backports"
 modules = ksrc + "/lib/modules"
 
+
 def clean():
-	if os.path.exists(tmp_path):
-		rmtree(tmp_path)
+    if os.path.exists(tmp_path):
+        rmtree(tmp_path)
+
 
 def get_processed_rel(i):
-	"Because... list.pop(i) didn't work to keep order..."
-	processed_lock.acquire()
-	for rel in releases_processed:
-		if (rel['idx'] == i):
-			processed_lock.release()
-			return rel
-	processed_lock.release()
-
-	baking_lock.acquire()
-	for rel in releases_baking:
-		if (rel['idx'] == i):
-			releases_baking.remove(rel)
-			baking_lock.release()
-			return rel
-	baking_lock.release()
+    "Because... list.pop(i) didn't work to keep order..."
+    processed_lock.acquire()
+    for rel in releases_processed:
+        if (rel['idx'] == i):
+            processed_lock.release()
+            return rel
+    processed_lock.release()
+
+    baking_lock.acquire()
+    for rel in releases_baking:
+        if (rel['idx'] == i):
+            releases_baking.remove(rel)
+            baking_lock.release()
+            return rel
+    baking_lock.release()
+
 
 def get_status_name(status):
-	if (status == 0):
-		return 'OK'
-	elif (status == 130):
-		return 'TERM'
-	elif (status == 1234):
-		return 'INIT'
-	elif (status == 1235):
-		return 'LINK'
-	elif (status == -2):
-		return 'TERM'
-	else:
-		return 'FAIL'
+    if (status == 0):
+        return 'OK'
+    elif (status == 130):
+        return 'TERM'
+    elif (status == 1234):
+        return 'INIT'
+    elif (status == 1235):
+        return 'LINK'
+    elif (status == -2):
+        return 'TERM'
+    else:
+        return 'FAIL'
+
 
 def get_stat_pos(status):
-	if (status == 0):
-		return 34
-	elif (status == 130):
-		return 33
-	elif (status == 1234):
-		return 33
-	elif (status == 1235):
-		return 33
-	elif (status == -2):
-		return 33
-	else:
-		return 33
+    if (status == 0):
+        return 34
+    elif (status == 130):
+        return 33
+    elif (status == 1234):
+        return 33
+    elif (status == 1235):
+        return 33
+    elif (status == -2):
+        return 33
+    else:
+        return 33
+
 
 def get_status_color(status):
-	if (status == 0):
-		return curses.color_pair(1)
-	elif (status == 130):
-		return curses.color_pair(2)
-	elif (status == 1234):
-		return curses.color_pair(2)
-	elif (status == -2):
-		return curses.color_pair(2)
-	else:
-		return curses.color_pair(3)
+    if (status == 0):
+        return curses.color_pair(1)
+    elif (status == 130):
+        return curses.color_pair(2)
+    elif (status == 1234):
+        return curses.color_pair(2)
+    elif (status == -2):
+        return curses.color_pair(2)
+    else:
+        return curses.color_pair(3)
+
 
 def print_report():
-	os.system("clear")
-	sys.stdout.write("\n\n\n")
-	sys.stdout.write("== ckmake-report.log ==\n\n")
-	report = open(ckmake_report, 'r+')
-	copyfileobj(report, sys.stdout)
-	report.close()
+    os.system("clear")
+    sys.stdout.write("\n\n\n")
+    sys.stdout.write("== ckmake-report.log ==\n\n")
+    report = open(ckmake_report, 'r+')
+    copyfileobj(report, sys.stdout)
+    report.close()
+
 
 def process_logs():
-	os.system('clear')
-	log = open(ckmake_log, 'w+')
-	report = open(ckmake_report, 'w+')
-	for i in range(0, len(releases_processed)):
-		rel = get_processed_rel(i)
-		rel_log = open(rel['log'], 'r+')
-		log.write(rel_log.read())
-		status = get_status_name(rel['status'])
-		rel_report = "%-4s%-20s[  %s  ]\n" % \
-			     ( rel['idx']+1, rel['version'], status)
-		report.write(rel_report)
-		if (rel['status'] != 0 and
-		    rel['status'] != 2):
-			ckmake_return = -1
-	report.close()
-	log.close()
-	print_report()
+    os.system('clear')
+    log = open(ckmake_log, 'w+')
+    report = open(ckmake_report, 'w+')
+    for i in range(0, len(releases_processed)):
+        rel = get_processed_rel(i)
+        rel_log = open(rel['log'], 'r+')
+        log.write(rel_log.read())
+        status = get_status_name(rel['status'])
+        rel_report = "%-4s%-20s[  %s  ]\n" % \
+                     (rel['idx'] + 1, rel['version'], status)
+        report.write(rel_report)
+        if (rel['status'] != 0 and
+                rel['status'] != 2):
+            ckmake_return = -1
+    report.close()
+    log.close()
+    print_report()
+
 
 def process_kernel(num, kset, cmdline_args):
-	while True:
-		rel = kset.queue.get()
-		work_dir = tmp_path + '/' + rel['version']
-		copytree(my_cwd, \
-			 work_dir, \
-			 ignore=ignore_patterns('.tmp*', ".git"))
-		build = '%s/build/' % rel['full_path']
-		jobs = '-j%d' % kset.build_jobs
-		make_args =['KLIB=%s' % build,
-		            'KLIB_BUILD=%s' % build]
-		nice = ['ionice', '-c', '3', 'nice', '-n', '20']
-
-		log_file_name = work_dir + '/' + 'ckmake.n.log'
-		rel['log'] = log_file_name
-		log_file = open(log_file_name, 'w')
-		null_file = open('/dev/null', 'r')
-
-		all_config_name = os.path.join(work_dir, 'all.config')
-		all_config = open(all_config_name, 'w')
-		all_config.write("CPTCFG_CFG80211_INTERNAL_REGDB=n\n")
-		config_name = 'allnoconfig'
-		if cmdline_args.allyesconfig:
-			config_name = 'allyesconfig'
-		elif cmdline_args.defconfig:
-			all_config.write(open(os.path.join(work_dir, 'defconfigs', cmdline_args.defconfig)).read())
-		else:
-			all_config.write("CPTCFG_BACKPORT_USERSEL_BUILD_ALL=y\n")
-		all_config.close()
-
-		all_config_env = os.environ.copy()
-		all_config_env["KCONFIG_ALLCONFIG"] = all_config_name
-
-		kset.baking(rel)
-
-		p = subprocess.Popen(nice + ['make', jobs] + make_args + [config_name],
-				     cwd = work_dir, env=all_config_env,
-				     stdin=null_file,
-				     stdout=log_file,
-				     stderr=log_file)
-		p.wait()
-
-		if p.returncode == 0:
-			p = subprocess.Popen(nice + ['make', jobs] + make_args,
-					     cwd = work_dir,
-					     stdin=null_file,
-					     stdout=log_file,
-					     stderr=log_file)
-			p.wait()
-
-		log_file.close()
-		status = p.returncode
-		if status == 0:
-			warn = re.compile('^WARNING:.*undefined.*')
-			log_file = open(log_file_name, 'r')
-			for l in log_file:
-				if warn.match(l):
-					status = 1235
-					break
-		null_file.close()
-
-		kset.update_status(rel, status)
-		kset.queue.task_done()
-		kset.completed(rel)
+    while True:
+        rel = kset.queue.get()
+        work_dir = tmp_path + '/' + rel['version']
+        copytree(my_cwd,
+                 work_dir,
+                 ignore=ignore_patterns('.tmp*', ".git"))
+        build = '%s/build/' % rel['full_path']
+        jobs = '-j%d' % kset.build_jobs
+        make_args = ['KLIB=%s' % build,
+                     'KLIB_BUILD=%s' % build]
+        nice = ['ionice', '-c', '3', 'nice', '-n', '20']
+
+        log_file_name = work_dir + '/' + 'ckmake.n.log'
+        rel['log'] = log_file_name
+        log_file = open(log_file_name, 'w')
+        null_file = open('/dev/null', 'r')
+
+        all_config_name = os.path.join(work_dir, 'all.config')
+        all_config = open(all_config_name, 'w')
+        all_config.write("CPTCFG_CFG80211_INTERNAL_REGDB=n\n")
+        config_name = 'allnoconfig'
+        if cmdline_args.allyesconfig:
+            config_name = 'allyesconfig'
+        elif cmdline_args.defconfig:
+            all_config.write(
+                open(os.path.join(work_dir, 'defconfigs', cmdline_args.defconfig)).read())
+        else:
+            all_config.write("CPTCFG_BACKPORT_USERSEL_BUILD_ALL=y\n")
+        all_config.close()
+
+        all_config_env = os.environ.copy()
+        all_config_env["KCONFIG_ALLCONFIG"] = all_config_name
+
+        kset.baking(rel)
+
+        p = subprocess.Popen(nice + ['make', jobs] + make_args + [config_name],
+                             cwd=work_dir, env=all_config_env,
+                             stdin=null_file,
+                             stdout=log_file,
+                             stderr=log_file)
+        p.wait()
+
+        if p.returncode == 0:
+            p = subprocess.Popen(nice + ['make', jobs] + make_args,
+                                 cwd=work_dir,
+                                 stdin=null_file,
+                                 stdout=log_file,
+                                 stderr=log_file)
+            p.wait()
+
+        log_file.close()
+        status = p.returncode
+        if status == 0:
+            warn = re.compile('^WARNING:.*undefined.*')
+            log_file = open(log_file_name, 'r')
+            for l in log_file:
+                if warn.match(l):
+                    status = 1235
+                    break
+        null_file.close()
+
+        kset.update_status(rel, status)
+        kset.queue.task_done()
+        kset.completed(rel)
+
 
 def cpu_info_build_jobs():
-	if not os.path.exists('/proc/cpuinfo'):
-		return 1
-	f = open('/proc/cpuinfo', 'r')
-	max_cpu = 1
-	for line in f:
-		m = re.match(r"(?P<PROC>processor\s*:)\s*" \
-			     "(?P<NUM>\d+)",
-			     line)
-		if not m:
-			continue
-		proc_specs = m.groupdict()
-		cpu_num = int(proc_specs['NUM'])
-		if cpu_num > max_cpu:
-			max_cpu = cpu_num
-	return max_cpu + 1
+    if not os.path.exists('/proc/cpuinfo'):
+        return 1
+    f = open('/proc/cpuinfo', 'r')
+    max_cpu = 1
+    for line in f:
+        m = re.match(r"(?P<PROC>processor\s*:)\s*"
+                     "(?P<NUM>\d+)",
+                     line)
+        if not m:
+            continue
+        proc_specs = m.groupdict()
+        cpu_num = int(proc_specs['NUM'])
+        if cpu_num > max_cpu:
+            max_cpu = cpu_num
+    return max_cpu + 1
+
 
 def kill_curses():
-	curses.endwin()
-	sys.stdout = os.fdopen(0, 'w', 0)
+    curses.endwin()
+    sys.stdout = os.fdopen(0, 'w', 0)
+
 
 def sig_handler(signal, frame):
-	kill_curses()
-	process_logs()
-	clean()
-	sys.exit(-2)
+    kill_curses()
+    process_logs()
+    clean()
+    sys.exit(-2)
+
 
 def compute_rel_weight_base_2(rel_specs):
-	weight = 0
-	sublevel = 0
+    weight = 0
+    sublevel = 0
+
+    if (rel_specs['SUBLEVEL'] != ''):
+        sublevel = int(rel_specs['SUBLEVEL'].lstrip(".")) * 20
+    else:
+        sublevel = 5
 
-	if (rel_specs['SUBLEVEL'] != ''):
-		sublevel = int(rel_specs['SUBLEVEL'].lstrip(".")) * 20
-	else:
-		sublevel = 5
+    weight = (int(rel_specs['VERSION'])    << 32) + \
+             (int(rel_specs['PATCHLEVEL']) << 16) + \
+             (sublevel << 8)
 
-	weight = (int(rel_specs['VERSION'])    << 32) + \
-		 (int(rel_specs['PATCHLEVEL']) << 16) + \
-		 (sublevel   		       << 8 )
+    return weight
 
-	return weight
 
 def compute_rel_weight_base_3(rel_specs):
-	weight = 0
-	extra = 0
-	sublevel = 0
+    weight = 0
+    extra = 0
+    sublevel = 0
 
-	weight = (int(rel_specs['VERSION'])    << 32) + \
-		 (int(rel_specs['PATCHLEVEL']) << 16)
+    weight = (int(rel_specs['VERSION'])    << 32) + \
+             (int(rel_specs['PATCHLEVEL']) << 16)
+
+    return weight
 
-	return weight
 
 def compute_rel_weight_base(rel_specs):
 
-	if (int(rel_specs['VERSION']) == 2):
-		return compute_rel_weight_base_2(rel_specs)
-	if (int(rel_specs['VERSION']) == 3):
-		return compute_rel_weight_base_3(rel_specs)
-	return 0
+    if (int(rel_specs['VERSION']) == 2):
+        return compute_rel_weight_base_2(rel_specs)
+    if (int(rel_specs['VERSION']) == 3):
+        return compute_rel_weight_base_3(rel_specs)
+    return 0
+
 
 def compute_rel_weight(rel_specs):
-	weight = 0
-	extra = 0
-	sublevel = 0
-
-	if (rel_specs['EXTRAVERSION'] != ''):
-		if ("."  in rel_specs['EXTRAVERSION'] or
-		    "rc" in rel_specs['EXTRAVERSION']):
-			rc = rel_specs['EXTRAVERSION'].lstrip("-rc")
-			if (rc == ""):
-				rc = 0
-			else:
-				rc = int(rc) - 20
-			extra = int(rc)
-		else:
-			extra = int(rel_specs['EXTRAVERSION']) + 10
-
-	if (rel_specs['SUBLEVEL'] != ''):
-		sublevel = int(rel_specs['SUBLEVEL'].lstrip(".")) * 20
-	else:
-		sublevel = 5
-
-	weight = (int(rel_specs['VERSION'])    << 32) + \
-		 (int(rel_specs['PATCHLEVEL']) << 16) + \
-		 (sublevel   		       << 8 ) + \
-		 (extra * 60)
-
-	return weight
+    weight = 0
+    extra = 0
+    sublevel = 0
+
+    if (rel_specs['EXTRAVERSION'] != ''):
+        if ("." in rel_specs['EXTRAVERSION'] or
+                "rc" in rel_specs['EXTRAVERSION']):
+            rc = rel_specs['EXTRAVERSION'].lstrip("-rc")
+            if (rc == ""):
+                rc = 0
+            else:
+                rc = int(rc) - 20
+            extra = int(rc)
+        else:
+            extra = int(rel_specs['EXTRAVERSION']) + 10
+
+    if (rel_specs['SUBLEVEL'] != ''):
+        sublevel = int(rel_specs['SUBLEVEL'].lstrip(".")) * 20
+    else:
+        sublevel = 5
+
+    weight = (int(rel_specs['VERSION'])    << 32) + \
+             (int(rel_specs['PATCHLEVEL']) << 16) + \
+             (sublevel   		       << 8 ) + \
+             (extra * 60)
+
+    return weight
+
 
 def get_rel_spec_base(rel):
-	m = re.match(r"v*(?P<VERSION>\d+)\.+" \
-		     "(?P<PATCHLEVEL>\d+)[.]*" \
-		     "(?P<SUBLEVEL>\d*)",
-		     rel)
-	if (not m):
-		return m
-	rel_specs = m.groupdict()
-	return rel_specs
+    m = re.match(r"v*(?P<VERSION>\d+)\.+"
+                 "(?P<PATCHLEVEL>\d+)[.]*"
+                 "(?P<SUBLEVEL>\d*)",
+                 rel)
+    if (not m):
+        return m
+    rel_specs = m.groupdict()
+    return rel_specs
+
 
 def get_base_spec(rel_specs):
-	if (int(rel_specs['VERSION']) == 2):
-		rel = rel_specs['VERSION'] + "." + rel_specs['PATCHLEVEL'] + \
-		      "." + rel_specs['SUBLEVEL']
-	else:
-		rel = rel_specs['VERSION'] + "." + rel_specs['PATCHLEVEL']
-	return get_rel_spec_base(rel)
+    if (int(rel_specs['VERSION']) == 2):
+        rel = rel_specs['VERSION'] + "." + rel_specs['PATCHLEVEL'] + \
+            "." + rel_specs['SUBLEVEL']
+    else:
+        rel = rel_specs['VERSION'] + "." + rel_specs['PATCHLEVEL']
+    return get_rel_spec_base(rel)
+
 
 def get_rel_spec_ubuntu(rel):
-	if ("rc" in rel):
-		m = re.match(r"v*(?P<VERSION>\d+)\.+" \
-			     "(?P<PATCHLEVEL>\d+)[.]+" \
-			     "(?P<SUBLEVEL>\d+)[-]+" \
-			     "\d+rc(?P<EXTRAVERSION>\d+)\-*",
-			     rel)
-	else:
-		m = re.match(r"v*(?P<VERSION>\d+)\.+" \
-			     "(?P<PATCHLEVEL>\d+)[.]+" \
-			     "(?P<SUBLEVEL>\d+)[-]+" \
-			     "(?P<EXTRAVERSION>\d+)\-*",
-                              rel)
-        if (not m):
-                return m
-        rel_specs = m.groupdict()
-        return rel_specs
+    if ("rc" in rel):
+        m = re.match(r"v*(?P<VERSION>\d+)\.+"
+                     "(?P<PATCHLEVEL>\d+)[.]+"
+                     "(?P<SUBLEVEL>\d+)[-]+"
+                     "\d+rc(?P<EXTRAVERSION>\d+)\-*",
+                     rel)
+    else:
+        m = re.match(r"v*(?P<VERSION>\d+)\.+"
+                     "(?P<PATCHLEVEL>\d+)[.]+"
+                     "(?P<SUBLEVEL>\d+)[-]+"
+                     "(?P<EXTRAVERSION>\d+)\-*",
+                     rel)
+    if (not m):
+        return m
+    rel_specs = m.groupdict()
+    return rel_specs
+
 
 def krel_same_base(new_rel, rel):
-	if (int(new_rel['ver']) != int(rel['ver'])):
-		return False
-	if (int(new_rel['pat']) != int(rel['pat'])):
-		return False
-	if (int(new_rel['ver']) == 3):
-		return True
-	if (int(new_rel['ver']) != 2):
-		return False
-	if (int(new_rel['sub']) == int(rel['sub'])):
-		return True
-	return False
+    if (int(new_rel['ver']) != int(rel['ver'])):
+        return False
+    if (int(new_rel['pat']) != int(rel['pat'])):
+        return False
+    if (int(new_rel['ver']) == 3):
+        return True
+    if (int(new_rel['ver']) != 2):
+        return False
+    if (int(new_rel['sub']) == int(rel['sub'])):
+        return True
+    return False
+
 
 def krel_base_update(new_rel, rel):
-	if (not krel_same_base(new_rel, rel)):
-		return False
-	if (int(new_rel['sub']) > int(rel['sub'])):
-		return True
-	if (int(new_rel['sub']) < int(rel['sub'])):
-		return False
+    if (not krel_same_base(new_rel, rel)):
+        return False
+    if (int(new_rel['sub']) > int(rel['sub'])):
+        return True
+    if (int(new_rel['sub']) < int(rel['sub'])):
+        return False
+
+    # Too lazy to deal with 2.x kernels,
+    if (not new_rel['is_rc']):
+        return False
 
-	# Too lazy to deal with 2.x kernels,
-	if (not new_rel['is_rc']):
-		return False
+    if (int(new_rel['ext']) <= int(rel['ext'])):
+        return False
+    return True
 
-	if (int(new_rel['ext']) <= int(rel['ext'])):
-		return False
-	return True
 
 def krel_base_smaller(new_rel, rel):
-	if (not krel_same_base(new_rel, rel)):
-		return False
-	if (int(new_rel['sub']) > int(rel['sub'])):
-		return False
-	if (int(new_rel['sub']) < int(rel['sub'])):
-		return True
-	return False
+    if (not krel_same_base(new_rel, rel)):
+        return False
+    if (int(new_rel['sub']) > int(rel['sub'])):
+        return False
+    if (int(new_rel['sub']) < int(rel['sub'])):
+        return True
+    return False
+
 
 class kernel_set():
-	def __init__(self, stdscr):
-		self.queue = Queue()
-		self.target_krevs = []
-		self.releases = []
-		self.target_kranges = []
-		self.stdscr = stdscr
-		self.lock = Lock()
-		signal.signal(signal.SIGINT, sig_handler)
-		self.build_jobs = cpu_info_build_jobs()
-		if (curses.has_colors()):
-			curses.init_pair(1,
-					 curses.COLOR_GREEN,
-					 curses.COLOR_BLACK)
-			curses.init_pair(2,
-					 curses.COLOR_CYAN,
-					 curses.COLOR_BLACK)
-			curses.init_pair(3,
-					 curses.COLOR_RED,
-					 curses.COLOR_BLACK)
-			curses.init_pair(4,
-					 curses.COLOR_BLUE,
-					 curses.COLOR_BLACK)
-	def baking(self, rel):
-		baking_lock.acquire()
-		releases_baking.append(rel)
-		baking_lock.release()
-	def completed(self, rel):
-		processed_lock.acquire()
-		releases_processed.insert(rel['idx'], rel)
-		processed_lock.release()
-	def set_locale(self):
-		locale.setlocale(locale.LC_ALL, '')
-		code = locale.getpreferredencoding()
-	def refresh(self):
-		self.lock.acquire()
-		self.stdscr.refresh()
-		self.lock.release()
-	def wight_in_target_kranges(self, rel_base_weight):
-		for krange in self.target_kranges:
-			if (krange['is_range']):
-				if (krange['weight_lower'] <= rel_base_weight and
-				    rel_base_weight <= krange['weight_upper']):
-					return True
-			else:
-				if (rel_base_weight == krange['weight']):
-					return True
-		return False
-	def evaluate_new_rel(self, new_rel):
-		for rel in self.releases:
-			if (krel_base_update(new_rel, rel)):
-				new_rel['idx'] = rel['idx']
-				self.releases.remove(rel)
-				break
-			if (krel_base_smaller(new_rel, rel)):
-				return
-		if (self.target_kranges):
-			if (not self.wight_in_target_kranges(new_rel['base_weight'])):
-				return
-		self.releases.insert(new_rel['idx'], new_rel)
-	def parse_releases(self, target_kranges):
-		self.target_kranges = target_kranges
-		for dirname, dirnames, filenames in os.walk(modules):
-		        rels = []
-			for subdirname in dirnames:
-				specifics = get_rel_spec_ubuntu(subdirname)
-				if (not specifics):
-					continue
-				base_specs = get_base_spec(specifics)
-				if (not base_specs):
-					continue
-				rc = False
-
-				ver = specifics['VERSION'] + '.' + \
-				      specifics['PATCHLEVEL']
-
-				if ("rc" in subdirname):
-					rc = True
-					ver = ver + '-rc' + specifics['EXTRAVERSION']
-				else:
-					ver = ver + '.' + specifics['SUBLEVEL']
-
-				get_rel_spec_base(subdirname)
-				rel = dict(name=subdirname,
-					   full_path=dirname + '/' +
-							 subdirname,
-					   version=ver,
-					   is_rc = rc,
-					   ver=specifics['VERSION'],
-					   pat=specifics['PATCHLEVEL'],
-					   sub=specifics['SUBLEVEL'],
-					   ext=specifics['EXTRAVERSION'],
-					   base_weight=compute_rel_weight_base(base_specs),
-					   weight=compute_rel_weight(specifics),
-					   processed=False,
-					   log='',
-					   status=1234)
-                                rels.append(rel)
-			def relsort(rel):
-				return int(rel['ver']), int(rel['pat']), int(rel['sub'])
-			rels.sort(key=relsort)
-			for rel in rels:
-				rel['idx'] = len(self.releases)
-				self.evaluate_new_rel(rel)
-		self.refresh()
-	def setup_screen(self):
-		for i in range(0, len(self.releases)):
-			rel = self.releases[i]
-			self.lock.acquire()
-			self.stdscr.addstr(rel['idx'], 0,
-					   "%-4d" % (rel['idx']+1))
-			if (curses.has_colors()):
-				self.stdscr.addstr(rel['idx'], 5,
-						   "%-20s" % (rel['version']),
-						   curses.color_pair(4))
-			else:
-				self.stdscr.addstr(rel['idx'], 0,
-						   "%-20s" % (rel['version']))
-			self.stdscr.addstr(rel['idx'], 30, "[        ]")
-			self.stdscr.refresh()
-			self.lock.release()
-	def create_threads(self, cmdline_args):
-		for rel in self.releases:
-			th = Thread(target=process_kernel, args=(0, self, cmdline_args))
-			th.setDaemon(True)
-			th.start()
-	def kick_threads(self):
-		for rel in self.releases:
-			self.queue.put(rel)
-			sleep(1)
-	def wait_threads(self):
-		self.queue.join()
-	def update_status(self, rel, status):
-		self.lock.acquire()
-		stat_name = get_status_name(status)
-		stat_pos = get_stat_pos(status)
-		if (curses.has_colors()):
-			stat_color = get_status_color(status)
-			self.stdscr.addstr(rel['idx'], stat_pos, stat_name,
-					   get_status_color(status))
-		else:
-			self.stdscr.addstr(rel['idx'], stat_pos, stat_name)
-		rel['processed'] = True
-		rel['status'] = status
-		self.stdscr.refresh()
-		self.lock.release()
+
+    def __init__(self, stdscr):
+        self.queue = Queue()
+        self.target_krevs = []
+        self.releases = []
+        self.target_kranges = []
+        self.stdscr = stdscr
+        self.lock = Lock()
+        signal.signal(signal.SIGINT, sig_handler)
+        self.build_jobs = cpu_info_build_jobs()
+        if (curses.has_colors()):
+            curses.init_pair(1,
+                             curses.COLOR_GREEN,
+                             curses.COLOR_BLACK)
+            curses.init_pair(2,
+                             curses.COLOR_CYAN,
+                             curses.COLOR_BLACK)
+            curses.init_pair(3,
+                             curses.COLOR_RED,
+                             curses.COLOR_BLACK)
+            curses.init_pair(4,
+                             curses.COLOR_BLUE,
+                             curses.COLOR_BLACK)
+
+    def baking(self, rel):
+        baking_lock.acquire()
+        releases_baking.append(rel)
+        baking_lock.release()
+
+    def completed(self, rel):
+        processed_lock.acquire()
+        releases_processed.insert(rel['idx'], rel)
+        processed_lock.release()
+
+    def set_locale(self):
+        locale.setlocale(locale.LC_ALL, '')
+        code = locale.getpreferredencoding()
+
+    def refresh(self):
+        self.lock.acquire()
+        self.stdscr.refresh()
+        self.lock.release()
+
+    def wight_in_target_kranges(self, rel_base_weight):
+        for krange in self.target_kranges:
+            if (krange['is_range']):
+                if (krange['weight_lower'] <= rel_base_weight and
+                        rel_base_weight <= krange['weight_upper']):
+                    return True
+            else:
+                if (rel_base_weight == krange['weight']):
+                    return True
+        return False
+
+    def evaluate_new_rel(self, new_rel):
+        for rel in self.releases:
+            if (krel_base_update(new_rel, rel)):
+                new_rel['idx'] = rel['idx']
+                self.releases.remove(rel)
+                break
+            if (krel_base_smaller(new_rel, rel)):
+                return
+        if (self.target_kranges):
+            if (not self.wight_in_target_kranges(new_rel['base_weight'])):
+                return
+        self.releases.insert(new_rel['idx'], new_rel)
+
+    def parse_releases(self, target_kranges):
+        self.target_kranges = target_kranges
+        for dirname, dirnames, filenames in os.walk(modules):
+            rels = []
+            for subdirname in dirnames:
+                specifics = get_rel_spec_ubuntu(subdirname)
+                if (not specifics):
+                    continue
+                base_specs = get_base_spec(specifics)
+                if (not base_specs):
+                    continue
+                rc = False
+
+                ver = specifics['VERSION'] + '.' + \
+                    specifics['PATCHLEVEL']
+
+                if ("rc" in subdirname):
+                    rc = True
+                    ver = ver + '-rc' + specifics['EXTRAVERSION']
+                else:
+                    ver = ver + '.' + specifics['SUBLEVEL']
+
+                get_rel_spec_base(subdirname)
+                rel = dict(name=subdirname,
+                           full_path=dirname + '/' +
+                           subdirname,
+                           version=ver,
+                           is_rc=rc,
+                           ver=specifics['VERSION'],
+                           pat=specifics['PATCHLEVEL'],
+                           sub=specifics['SUBLEVEL'],
+                           ext=specifics['EXTRAVERSION'],
+                           base_weight=compute_rel_weight_base(base_specs),
+                           weight=compute_rel_weight(specifics),
+                           processed=False,
+                           log='',
+                           status=1234)
+                rels.append(rel)
+
+            def relsort(rel):
+                return int(rel['ver']), int(rel['pat']), int(rel['sub'])
+            rels.sort(key=relsort)
+            for rel in rels:
+                rel['idx'] = len(self.releases)
+                self.evaluate_new_rel(rel)
+        self.refresh()
+
+    def setup_screen(self):
+        for i in range(0, len(self.releases)):
+            rel = self.releases[i]
+            self.lock.acquire()
+            self.stdscr.addstr(rel['idx'], 0,
+                               "%-4d" % (rel['idx'] + 1))
+            if (curses.has_colors()):
+                self.stdscr.addstr(rel['idx'], 5,
+                                   "%-20s" % (rel['version']),
+                                   curses.color_pair(4))
+            else:
+                self.stdscr.addstr(rel['idx'], 0,
+                                   "%-20s" % (rel['version']))
+            self.stdscr.addstr(rel['idx'], 30, "[        ]")
+            self.stdscr.refresh()
+            self.lock.release()
+
+    def create_threads(self, cmdline_args):
+        for rel in self.releases:
+            th = Thread(target=process_kernel, args=(0, self, cmdline_args))
+            th.setDaemon(True)
+            th.start()
+
+    def kick_threads(self):
+        for rel in self.releases:
+            self.queue.put(rel)
+            sleep(1)
+
+    def wait_threads(self):
+        self.queue.join()
+
+    def update_status(self, rel, status):
+        self.lock.acquire()
+        stat_name = get_status_name(status)
+        stat_pos = get_stat_pos(status)
+        if (curses.has_colors()):
+            stat_color = get_status_color(status)
+            self.stdscr.addstr(rel['idx'], stat_pos, stat_name,
+                               get_status_color(status))
+        else:
+            self.stdscr.addstr(rel['idx'], stat_pos, stat_name)
+        rel['processed'] = True
+        rel['status'] = status
+        self.stdscr.refresh()
+        self.lock.release()
+
 
 def main(stdscr, args, target_kranges):
-	kset = kernel_set(stdscr)
+    kset = kernel_set(stdscr)
+
+    kset.set_locale()
+    kset.parse_releases(target_kranges)
+    kset.setup_screen()
+    kset.create_threads(args)
+    kset.kick_threads()
+    kset.wait_threads()
+    kset.refresh()
 
-	kset.set_locale()
-	kset.parse_releases(target_kranges)
-	kset.setup_screen()
-	kset.create_threads(args)
-	kset.kick_threads()
-	kset.wait_threads()
-	kset.refresh()
 
 def build_krange(krange_list):
-	if (len(krange_list) == 2):
-		lower = krange_list.pop(0)
-		upper = krange_list.pop(0)
-		specifics_lower = get_rel_spec_base(lower)
-		if (not specifics_lower):
-			return {}
-		specifics_upper = get_rel_spec_base(upper)
-		if (not specifics_upper):
-			return {}
-		krange = dict(is_range = True,
-			      weight_lower=compute_rel_weight_base(specifics_lower),
-			      weight_upper=compute_rel_weight_base(specifics_upper))
-		return krange
-	elif (len(krange_list) == 1):
-		rel = krange_list.pop(0)
-		specifics = get_rel_spec_base(rel)
-		if (not specifics):
-			return {}
-		krange = dict(is_range = False,
-			      weight=compute_rel_weight_base(specifics))
-		return krange
-	else:
-		return {}
-	return {}
+    if (len(krange_list) == 2):
+        lower = krange_list.pop(0)
+        upper = krange_list.pop(0)
+        specifics_lower = get_rel_spec_base(lower)
+        if (not specifics_lower):
+            return {}
+        specifics_upper = get_rel_spec_base(upper)
+        if (not specifics_upper):
+            return {}
+        krange = dict(is_range=True,
+                      weight_lower=compute_rel_weight_base(specifics_lower),
+                      weight_upper=compute_rel_weight_base(specifics_upper))
+        return krange
+    elif (len(krange_list) == 1):
+        rel = krange_list.pop(0)
+        specifics = get_rel_spec_base(rel)
+        if (not specifics):
+            return {}
+        krange = dict(is_range=False,
+                      weight=compute_rel_weight_base(specifics))
+        return krange
+    else:
+        return {}
+    return {}
 
 if __name__ == "__main__":
-	parser = argparse.ArgumentParser(description='compile against all kernels you have')
-	parser.add_argument('--allyesconfig', const=True, default=False, action="store_const",
-			    help='Build allyesconfig rather than only backport code.')
-	parser.add_argument('--defconfig', metavar='<name>', type=str,
-			    help='Build this defconfig rather than only backport code.')
-	parser.add_argument('--revs', metavar='<revision-list>', type=str,
-			    help='Optional list of kernel revisions to test for, example: 2.6.24,2.6.30,2.6.32..3.2,3.4')
-	args = parser.parse_args()
-
-	target_kranges = []
-	if (args.revs):
-		klists = args.revs.split(",")
-		for klist in klists:
-			krange_list = klist.split("..")
-			krange = build_krange(krange_list)
-			target_kranges.append(krange)
-
-	if not os.path.exists(modules):
-		print "%s does not exist" % (modules)
-		sys.exit(1)
-	if not os.path.exists(my_cwd + '/Makefile'):
-		print "%s does not exist" % (my_cwd + '/Makefile')
-		sys.exit(1)
-	if os.path.exists(ckmake_log):
-		os.remove(ckmake_log)
-	if os.path.exists(ckmake_report):
-		os.remove(ckmake_report)
-	if os.path.exists(tmp_path):
-		rmtree(tmp_path)
-	os.makedirs(tmp_path)
-	curses.wrapper(main, args, target_kranges)
-	kill_curses()
-	process_logs()
-	clean()
-	sys.exit(ckmake_return)
+    parser = argparse.ArgumentParser(
+        description='compile against all kernels you have')
+    parser.add_argument(
+        '--allyesconfig', const=True, default=False, action="store_const",
+        help='Build allyesconfig rather than only backport code.')
+    parser.add_argument('--defconfig', metavar='<name>', type=str,
+                        help='Build this defconfig rather than only backport code.')
+    parser.add_argument('--revs', metavar='<revision-list>', type=str,
+                        help='Optional list of kernel revisions to test for, example: 2.6.24,2.6.30,2.6.32..3.2,3.4')
+    args = parser.parse_args()
+
+    target_kranges = []
+    if (args.revs):
+        klists = args.revs.split(",")
+        for klist in klists:
+            krange_list = klist.split("..")
+            krange = build_krange(krange_list)
+            target_kranges.append(krange)
+
+    if not os.path.exists(modules):
+        print "%s does not exist" % (modules)
+        sys.exit(1)
+    if not os.path.exists(my_cwd + '/Makefile'):
+        print "%s does not exist" % (my_cwd + '/Makefile')
+        sys.exit(1)
+    if os.path.exists(ckmake_log):
+        os.remove(ckmake_log)
+    if os.path.exists(ckmake_report):
+        os.remove(ckmake_report)
+    if os.path.exists(tmp_path):
+        rmtree(tmp_path)
+    os.makedirs(tmp_path)
+    curses.wrapper(main, args, target_kranges)
+    kill_curses()
+    process_logs()
+    clean()
+    sys.exit(ckmake_return)
Signature · 1 line
1.9.1
#5 lore raw

PATCH 5/8 backports: add ckmake binary requirements

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

---
 devel/ckmake | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 mode change 100644 => 100755 devel/ckmake
devel/ckmake +13 -0
old mode 100644
new mode 100755
index 3e3d95e..0c238a6
@@ -25,6 +25,14 @@ from threading import Thread, Lock
 from shutil import copytree, ignore_patterns, rmtree, copyfileobj
 from time import sleep
 
+# find self
+source_dir = os.path.abspath(os.path.dirname(__file__))
+source_dir = os.path.dirname(source_dir)
+# add parent directory to path to get to lib/
+sys.path.append(source_dir)
+# import libraries we need
+from lib import bpreqs as reqs
+
 releases_processed = []
 releases_baking = []
 processed_lock = Lock()
@@ -580,6 +588,11 @@ def build_krange(krange_list):
     return {}
 
 if __name__ == "__main__":
+    req = reqs.Req()
+    req.require('make')
+    req.require('gcc')
+    if not req.reqs_match():
+        sys.exit(1)
     parser = argparse.ArgumentParser(
         description='compile against all kernels you have')
     parser.add_argument(
Signature · 1 line
1.9.1
#6 lore raw

PATCH 6/8 backports: remove two upstream patches

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

Two changes to help with backports were merged upstream so nuke 'em.

---
 .../0001-6lowpan-namespace.patch                   | 138 ---------------------
 .../0002-include-new-netns-headers.patch           |  12 --
 2 files changed, 150 deletions(-)
 delete mode 100644 patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch
 delete mode 100644 patches/0000-upstream-backport-changes/0002-include-new-netns-headers.patch
patches/0000-upstream-backport-changes/0001-6lowpan-namespace.patch deleted +0 -138
deleted file mode 100644
index 6205752..0000000
@@ -1,138 +0,0 @@
-This will be sent upstream, then we can remove this.
-The first hunk however was removed as it doesn't apply to
-our backport framework which declared net_ieee802154_lowpan(),
-for now we carry that for older and newer kernels in our own
-backport/backport-include/net/net_namespace.h file.
-
-From 2e509dac53558fda87061b06f081fde5a7cb8051 Mon Sep 17 00:00:00 2001
-From: "Luis R. Rodriguez" <[email protected]>
-Date: Mon, 31 Mar 2014 01:53:22 -0700
-Subject: [PATCH] 6lowpan: add helper to get 6lowpan namespace
-
-This will simplify the new reassembly backport
-with no code changes.
-
-Cc:Alexander Aring <[email protected]>
-Signed-off-by: Luis R. Rodriguez <[email protected]>
---- a/net/ieee802154/reassembly.c
-+++ b/net/ieee802154/reassembly.c
-@@ -120,6 +120,8 @@ fq_find(struct net *net, const struct lo
- 	struct inet_frag_queue *q;
- 	struct lowpan_create_arg arg;
- 	unsigned int hash;
-+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
-+		net_ieee802154_lowpan(net);
- 
- 	arg.tag = frag_info->d_tag;
- 	arg.d_size = frag_info->d_size;
-@@ -129,7 +131,7 @@ fq_find(struct net *net, const struct lo
- 	read_lock(&lowpan_frags.lock);
- 	hash = lowpan_hash_frag(frag_info->d_tag, frag_info->d_size, src, dst);
- 
--	q = inet_frag_find(&net->ieee802154_lowpan.frags,
-+	q = inet_frag_find(&ieee802154_lowpan->frags,
- 			   &lowpan_frags, &arg, hash);
- 	if (IS_ERR_OR_NULL(q)) {
- 		inet_frag_maybe_warn_overflow(q, pr_fmt());
-@@ -357,6 +359,8 @@ int lowpan_frag_rcv(struct sk_buff *skb,
- 	struct net *net = dev_net(skb->dev);
- 	struct lowpan_frag_info *frag_info = lowpan_cb(skb);
- 	struct ieee802154_addr source, dest;
-+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
-+		net_ieee802154_lowpan(net);
- 	int err;
- 
- 	source = mac_cb(skb)->source;
-@@ -366,10 +370,10 @@ int lowpan_frag_rcv(struct sk_buff *skb,
- 	if (err < 0)
- 		goto err;
- 
--	if (frag_info->d_size > net->ieee802154_lowpan.max_dsize)
-+	if (frag_info->d_size > ieee802154_lowpan->max_dsize)
- 		goto err;
- 
--	inet_frag_evictor(&net->ieee802154_lowpan.frags, &lowpan_frags, false);
-+	inet_frag_evictor(&ieee802154_lowpan->frags, &lowpan_frags, false);
- 
- 	fq = fq_find(net, frag_info, &source, &dest);
- 	if (fq != NULL) {
-@@ -436,6 +440,8 @@ static int __net_init lowpan_frags_ns_sy
- {
- 	struct ctl_table *table;
- 	struct ctl_table_header *hdr;
-+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
-+		net_ieee802154_lowpan(net);
- 
- 	table = lowpan_frags_ns_ctl_table;
- 	if (!net_eq(net, &init_net)) {
-@@ -444,10 +450,10 @@ static int __net_init lowpan_frags_ns_sy
- 		if (table == NULL)
- 			goto err_alloc;
- 
--		table[0].data = &net->ieee802154_lowpan.frags.high_thresh;
--		table[1].data = &net->ieee802154_lowpan.frags.low_thresh;
--		table[2].data = &net->ieee802154_lowpan.frags.timeout;
--		table[3].data = &net->ieee802154_lowpan.max_dsize;
-+		table[0].data = &ieee802154_lowpan->frags.high_thresh;
-+		table[1].data = &ieee802154_lowpan->frags.low_thresh;
-+		table[2].data = &ieee802154_lowpan->frags.timeout;
-+		table[3].data = &ieee802154_lowpan->max_dsize;
- 
- 		/* Don't export sysctls to unprivileged users */
- 		if (net->user_ns != &init_user_ns)
-@@ -458,7 +464,7 @@ static int __net_init lowpan_frags_ns_sy
- 	if (hdr == NULL)
- 		goto err_reg;
- 
--	net->ieee802154_lowpan.sysctl.frags_hdr = hdr;
-+	ieee802154_lowpan->sysctl.frags_hdr = hdr;
- 	return 0;
- 
- err_reg:
-@@ -471,9 +477,11 @@ err_alloc:
- static void __net_exit lowpan_frags_ns_sysctl_unregister(struct net *net)
- {
- 	struct ctl_table *table;
-+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
-+		net_ieee802154_lowpan(net);
- 
--	table = net->ieee802154_lowpan.sysctl.frags_hdr->ctl_table_arg;
--	unregister_net_sysctl_table(net->ieee802154_lowpan.sysctl.frags_hdr);
-+	table = ieee802154_lowpan->sysctl.frags_hdr->ctl_table_arg;
-+	unregister_net_sysctl_table(ieee802154_lowpan->sysctl.frags_hdr);
- 	if (!net_eq(net, &init_net))
- 		kfree(table);
- }
-@@ -514,20 +522,26 @@ static inline void lowpan_frags_sysctl_u
- 
- static int __net_init lowpan_frags_init_net(struct net *net)
- {
--	net->ieee802154_lowpan.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
--	net->ieee802154_lowpan.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
--	net->ieee802154_lowpan.frags.timeout = IPV6_FRAG_TIMEOUT;
--	net->ieee802154_lowpan.max_dsize = 0xFFFF;
-+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
-+		net_ieee802154_lowpan(net);
- 
--	inet_frags_init_net(&net->ieee802154_lowpan.frags);
-+	ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
-+	ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH;
-+	ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT;
-+	ieee802154_lowpan->max_dsize = 0xFFFF;
-+
-+	inet_frags_init_net(&ieee802154_lowpan->frags);
- 
- 	return lowpan_frags_ns_sysctl_register(net);
- }
- 
- static void __net_exit lowpan_frags_exit_net(struct net *net)
- {
-+	struct netns_ieee802154_lowpan *ieee802154_lowpan =
-+		net_ieee802154_lowpan(net);
-+
- 	lowpan_frags_ns_sysctl_unregister(net);
--	inet_frags_exit_net(&net->ieee802154_lowpan.frags, &lowpan_frags);
-+	inet_frags_exit_net(&ieee802154_lowpan->frags, &lowpan_frags);
- }
- 
- static struct pernet_operations lowpan_frags_ops = {
patches/0000-upstream-backport-changes/0002-include-new-netns-headers.patch deleted +0 -12
deleted file mode 100644
index 3b00450..0000000
@@ -1,12 +0,0 @@
-This can reasonably be sent upstream.
-
---- a/include/net/6lowpan.h
-+++ b/include/net/6lowpan.h
-@@ -54,6 +54,7 @@
- #define __6LOWPAN_H__
- 
- #include <net/ipv6.h>
-+#include <net/net_namespace.h>
- 
- #define UIP_802154_SHORTADDR_LEN	2  /* compressed ipv6 address length */
- #define UIP_IPH_LEN			40 /* ipv6 fixed header size */
Signature · 1 line
1.9.1
#7 lore raw

PATCH 7/8 backports: devel/backports-update-manager: fix for older shutil.move

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

Older shutil.move does not seem to like it when there are symlinks on a target, to account for this and to make things clearer just split up the work on the lib/modules and usr/src directory.

This fixes running devel/backports-update-manager on OpenSUSE 13.1 base install.

---
 devel/backports-update-manager | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
devel/backports-update-manager +14 -6
index fc146c6..0676421 100755
@@ -429,7 +429,7 @@ class backport_kernel_updater:
             self.increase_kver_count(url)
             self.all_new_kernels.append(url)
         sys.stdout.write("\n")
-    def fix_and_install_header_lib_modules(self, dir_path):
+    def fix_header_lib_modules(self, dir_path):
         """
         Relink lib/modules/*/build/ directories relatively to make it work
         for regular user based workflows
@@ -438,16 +438,22 @@ class backport_kernel_updater:
             if "generic" not in kernel:
                 continue
             kver = self.get_kver(kernel)
-            sys.stdout.write("%s - adjusting build symlink for non-root installation ...\n" % (kver.get('ver')))
-            build_target = os.path.join(dir_path, kernel + '/build')
+            sys.stdout.write("%s - creating lib/modules/$kernel/build symlink for non-root installation ...\n" % (kver.get('ver')))
+            src = os.path.join(dir_path, kernel)
+            dst = os.path.join(self.ksrc_prefix, 'lib/modules/' + kernel)
+            build_target = os.path.join(src, 'build')
             usr_src_sym = "../../../usr/src/linux-headers-" + kernel
             os.unlink(build_target)
             os.symlink(usr_src_sym, build_target)
+            shutil.move(src, dst)
+    def install_headers(self, dir_path):
         for kernel in os.listdir(dir_path):
             src = os.path.join(dir_path, kernel)
-            dst = os.path.join(self.ksrc_prefix, 'lib/modules/' + kernel)
+            dst = os.path.join(self.ksrc_prefix, 'usr/src/' + kernel)
             kver = self.get_kver(kernel)
-            sys.stdout.write("%s - installing lib/modules/ ...\n" % (kver.get('ver')))
+            sys.stdout.write("%s - installing usr/src/ ...\n" % (kver.get('ver')))
+            sys.stdout.write("src: %s\n" % src)
+            sys.stdout.write("dst: %s\n" % dst)
             self.rm_clean_dir(dst)
             shutil.move(src, dst)
     def fix_makefile_old_kernels(self, makefile):
@@ -463,8 +469,10 @@ class backport_kernel_updater:
     def sanitize_and_install_kernel_dirs(self, dir_path):
         d_lib_modules = os.path.join(dir_path, "lib/modules")
         d_usr_src     = os.path.join(dir_path, "usr/src")
+        if os.path.isdir(d_usr_src):
+            self.install_headers(d_usr_src)
         if os.path.isdir(d_lib_modules):
-            self.fix_and_install_header_lib_modules(d_lib_modules)
+            self.fix_header_lib_modules(d_lib_modules)
     def extract_backport_pkgs(self):
         tmp_prefix = BACKPORTS_KSRC_DIR + '_'
         tmpdir_path = tempfile.mkdtemp(prefix=tmp_prefix)
Signature · 1 line
1.9.1
#8 lore raw

PATCH 8/8 backports: fix igb patch for next-20140501

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

Manual fixes were needed for:

patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch

We currently hit a compile error as of next-20140501 because of the introduction of smp_mb__after_atomic(). This is not yet addressed.

---
 .../0001-ethernet-igb/0001-igb_net_device_ops.patch        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
patches/the-way-not-to-do-backports/0001-ethernet-igb/0001-igb_net_device_ops.patch +6 -8
index 97ad8aa..e464283 100644
@@ -1,11 +1,9 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 14ad4c7..f2a5abf 100644
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -160,8 +160,13 @@ static int igb_ioctl(struct net_device *
- static void igb_tx_timeout(struct net_device *);
+@@ -157,8 +157,13 @@ static void igb_tx_timeout(struct net_de
  static void igb_reset_task(struct work_struct *);
- static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features);
+ static void igb_vlan_mode(struct net_device *netdev,
+ 			  netdev_features_t features);
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
  static int igb_vlan_rx_add_vid(struct net_device *, __be16, u16);
  static int igb_vlan_rx_kill_vid(struct net_device *, __be16, u16);
@@ -16,7 +14,7 @@ index 14ad4c7..f2a5abf 100644
  static void igb_restore_vlan(struct igb_adapter *);
  static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
  static void igb_ping_all_vfs(struct igb_adapter *);
-@@ -7249,8 +7254,12 @@ static void igb_vlan_mode(struct net_dev
+@@ -7257,8 +7262,12 @@ static void igb_vlan_mode(struct net_dev
  	igb_rlpml_set(adapter);
  }
  
@@ -29,7 +27,7 @@ index 14ad4c7..f2a5abf 100644
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
  	struct e1000_hw *hw = &adapter->hw;
-@@ -7267,8 +7276,12 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7275,8 +7284,12 @@ static int igb_vlan_rx_add_vid(struct ne
  	return 0;
  }
  
@@ -42,7 +40,7 @@ index 14ad4c7..f2a5abf 100644
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
  	struct e1000_hw *hw = &adapter->hw;
-@@ -7294,7 +7307,11 @@ static void igb_restore_vlan(struct igb_
+@@ -7302,7 +7315,11 @@ static void igb_restore_vlan(struct igb_
  	igb_vlan_mode(adapter->netdev, adapter->netdev->features);
  
  	for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
Signature · 1 line
1.9.1