Patch failure handling updates, added a 'patch' concrete class, so we can apply patches to quilt-native itself.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@670 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 160 insertions, 99 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 546992e71f..940e7ac7a4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -13,9 +13,11 @@ def base_dep_prepend(d):
         # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command.  Whether or  not
         # we need that built is the responsibility of the patch function / class, not
         # the application.
-        patchdeps = bb.data.getVar("PATCH_DEPENDS", d, 1)
-        if patchdeps and not patchdeps in bb.data.getVar("PROVIDES", d, 1):
-                deps = patchdeps
+        patchdeps = bb.data.getVar("PATCHTOOL", d, 1)
+        if patchdeps:
+                patchdeps = "%s-native" % patchdeps
+                if not patchdeps in bb.data.getVar("PROVIDES", d, 1):
+                        deps = patchdeps
 
         if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
                 if (bb.data.getVar('HOST_SYS', d, 1) !=
@@ -685,7 +687,7 @@ python () {
 # Patch handling
 inherit patch
 
-EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_patch do_populate_pkgs do_stage
+EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage
 
 MIRRORS[func] = "0"
 MIRRORS () {
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 6616cb11a9..ea0182484e 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -1,9 +1,11 @@
-def patch_init():
+# Copyright (C) 2006  OpenedHand LTD
+
+def patch_init(d):
         import os, sys
-        
+
         def md5sum(fname):
                 import md5, sys
-        
+
                 f = file(fname, 'rb')
                 m = md5.new()
                 while True:
@@ -13,12 +15,12 @@ def patch_init():
                         m.update(d)
                 f.close()
                 return m.hexdigest()
-        
+
         class CmdError(Exception):
                 def __init__(self, exitstatus, output):
                         self.status = exitstatus
                         self.output = output
-        
+
                 def __str__(self):
                         return "Command Error: exit status: %d  Output:\n%s" % (self.status, self.output)
 
@@ -27,17 +29,17 @@ def patch_init():
                         self.path = path
                 def __str__(self):
                         return "Error: %s not found." % self.path
-        
+
         def runcmd(args, dir = None):
                 import commands
-        
+
                 if dir:
                         olddir = os.path.abspath(os.curdir)
                         if not os.path.exists(dir):
                                 raise NotFoundError(dir)
                         os.chdir(dir)
                         # print("cwd: %s -> %s" % (olddir, self.dir))
-        
+
                 try:
                         args = [ commands.mkarg(str(arg)) for arg in args ]
                         cmd = " ".join(args)
@@ -46,92 +48,143 @@ def patch_init():
                         if exitstatus != 0:
                                 raise CmdError(exitstatus >> 8, output)
                         return output
-        
+
                 finally:
                         if dir:
                                 os.chdir(olddir)
-        
+
         class PatchError(Exception):
                 def __init__(self, msg):
                         self.msg = msg
-        
+
                 def __str__(self):
                         return "Patch Error: %s" % self.msg
-        
+
         import bb, bb.data, bb.fetch
-        
+
         class PatchSet(object):
                 defaults = {
                         "strippath": 1
                 }
-        
+
                 def __init__(self, dir, d):
                         self.dir = dir
                         self.d = d
                         self.patches = []
                         self._current = None
-        
+
                 def current(self):
                         return self._current
-        
+
                 def Clean(self):
                         """
                         Clean out the patch set.  Generally includes unapplying all
                         patches and wiping out all associated metadata.
                         """
                         raise NotImplementedError()
-        
+
                 def Import(self, patch, force):
                         if not patch.get("file"):
                                 if not patch.get("remote"):
                                         raise PatchError("Patch file must be specified in patch import.")
                                 else:
                                         patch["file"] = bb.fetch.localpath(patch["remote"], self.d)
-        
+
                         for param in PatchSet.defaults:
                                 if not patch.get(param):
                                         patch[param] = PatchSet.defaults[param]
-        
+
                         if patch.get("remote"):
                                 patch["file"] = bb.data.expand(bb.fetch.localpath(patch["remote"], self.d), self.d)
-        
+
                         patch["filemd5"] = md5sum(patch["file"])
-        
+
                 def Push(self, force):
                         raise NotImplementedError()
-        
+
                 def Pop(self, force):
                         raise NotImplementedError()
-        
+
                 def Refresh(self, remote = None, all = None):
                         raise NotImplementedError()
-        
-        
+
+
+        class PatchTree(PatchSet):
+                def __init__(self, dir, d):
+                        PatchSet.__init__(self, dir, d)
+
+                def Import(self, patch, force = None):
+                        """"""
+                        PatchSet.Import(self, patch, force)
+
+                        self.patches.insert(self._current or 0, patch)
+
+                def _applypatch(self, patch, force = None, reverse = None):
+                        shellcmd = ["patch", "<", patch['file'], "-p", patch['strippath']]
+                        if reverse:
+                                shellcmd.append('-R')
+                        shellcmd.append('--dry-run')
+
+                        try:
+                                output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
+                        except CmdError:
+                                if force:
+                                        shellcmd.pop(len(shellcmd) - 1)
+                                        output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
+                                else:
+                                        import sys
+                                        raise sys.exc_value
+
+                        return output
+
+                def Push(self, force = None, all = None):
+                        if all:
+                                for i in self.patches:
+                                        if self._current is not None:
+                                                self._current = self._current + 1
+                                        else:
+                                                self._current = 0
+                                        self._applypatch(i, force)
+                        else:
+                                if self._current is not None:
+                                        self._current = self._current + 1
+                                else:
+                                        self._current = 0
+                                self._applypatch(self.patches[self._current], force)
+
+
+                def Pop(self, force = None, all = None):
+                        if all:
+                                for i in self.patches:
+                                        self._applypatch(i, force, True)
+                        else:
+                                self._applypatch(self.patches[self._current], force, True)
+
+                def Clean(self):
+                        """"""
+
         class QuiltTree(PatchSet):
                 def _runcmd(self, args):
                         runcmd(["quilt"] + args, self.dir)
-        
+
                 def _quiltpatchpath(self, file):
                         return os.path.join(self.dir, "patches", os.path.basename(file))
-        
-        
+
+
                 def __init__(self, dir, d):
                         PatchSet.__init__(self, dir, d)
                         self.initialized = False
-        
+
                 def Clean(self):
                         try:
                                 self._runcmd(["pop", "-a", "-f"])
                         except CmdError:
-                                if sys.exc_value.output.strip() == "No patch removed":
-                                        pass
-                                else:
-                                        raise PatchError("Unable to clean patches from tree:\n"+str(sys.exc_value))
+                                pass
                         except NotFoundError:
                                 pass
-                        runcmd(["rm", "-rf", os.path.join(self.dir, "patches"), os.path.join(self.dir, ".pc")])
+                        # runcmd(["rm", "-rf", os.path.join(self.dir, "patches"), os.path.join(self.dir, ".pc")])
                         self.initialized = True
-        
+
                 def InitFromDir(self):
                         # read series -> self.patches
                         seriespath = os.path.join(self.dir, 'patches', 'series')
@@ -148,7 +201,7 @@ def patch_init():
                                                 patch["strippath"] = parts[1][2:]
                                         self.patches.append(patch)
                                 series.close()
-        
+
                                 # determine which patches are applied -> self._current
                                 try:
                                         output = runcmd(["quilt", "applied"], self.dir)
@@ -162,45 +215,45 @@ def patch_init():
                                         if os.path.basename(patch["quiltfile"]) == output[-1]:
                                                 self._current = self.patches.index(patch)
                         self.initialized = True
-        
+
                 def Import(self, patch, force = None):
                         if not self.initialized:
                                 self.InitFromDir()
                         PatchSet.Import(self, patch, force)
-        
+
                         args = ["import", "-p", patch["strippath"]]
                         if force:
                                 args.append("-f")
                         args.append(patch["file"])
-        
+
                         self._runcmd(args)
-        
+
                         patch["quiltfile"] = self._quiltpatchpath(patch["file"])
                         patch["quiltfilemd5"] = md5sum(patch["quiltfile"])
-        
+
                         # TODO: determine if the file being imported:
                         #          1) is already imported, and is the same
                         #          2) is already imported, but differs
-        
+
                         self.patches.insert(self._current or 0, patch)
-        
-        
+
+
                 def Push(self, force = None, all = None):
                         # quilt push [-f]
-        
+
                         args = ["push"]
                         if force:
                                 args.append("-f")
                         if all:
                                 args.append("-a")
-        
+
                         self._runcmd(args)
-        
+
                         if self._current is not None:
                                 self._current = self._current + 1
                         else:
                                 self._current = 0
-        
+
                 def Pop(self, force = None, all = None):
                         # quilt pop [-f]
                         args = ["pop"]
@@ -208,15 +261,15 @@ def patch_init():
                                 args.append("-f")
                         if all:
                                 args.append("-a")
-        
+
                         self._runcmd(args)
-        
+
                         if self._current == 0:
                                 self._current = None
-        
+
                         if self._current is not None:
                                 self._current = self._current - 1
-        
+
                 def Refresh(self, **kwargs):
                         if kwargs.get("remote"):
                                 patch = self.patches[kwargs["patch"]]
@@ -227,7 +280,7 @@ def patch_init():
                                         import shutil
                                         if not patch.get("file") and patch.get("remote"):
                                                 patch["file"] = bb.fetch.localpath(patch["remote"], self.d)
-        
+
                                         shutil.copyfile(patch["quiltfile"], patch["file"])
                                 else:
                                         raise PatchError("Unable to do a remote refresh of %s, unsupported remote url scheme %s." % (os.path.basename(patch["quiltfile"]), type))
@@ -239,31 +292,31 @@ def patch_init():
                                 elif kwargs.get("patch"):
                                         args.append(os.path.basename(self.patches[kwargs["patch"]]["quiltfile"]))
                                 self._runcmd(args)
-        
+
         class Resolver(object):
                 def __init__(self, patchset):
                         raise NotImplementedError()
-        
+
                 def Resolve(self):
                         raise NotImplementedError()
-        
+
                 def Revert(self):
                         raise NotImplementedError()
-        
+
                 def Finalize(self):
                         raise NotImplementedError()
-        
+
         # Patch resolver which relies on the user doing all the work involved in the
         # resolution, with the exception of refreshing the remote copy of the patch
         # files (the urls).
         class UserResolver(Resolver):
                 def __init__(self, patchset):
                         self.patchset = patchset
-        
+
                 # Force a push in the patchset, then drop to a shell for the user to
                 # resolve any rejected hunks
                 def Resolve(self):
-        
+
                         olddir = os.path.abspath(os.curdir)
                         os.chdir(self.patchset.dir)
                         try:
@@ -274,21 +327,21 @@ def patch_init():
                                         return
                                 print(sys.exc_value)
                                 print('NOTE: dropping user into a shell, so that patch rejects can be fixed manually.')
-        
+
                                 os.system('/bin/sh')
-        
+
                                 # Construct a new PatchSet after the user's changes, compare the
                                 # sets, checking patches for modifications, and doing a remote
                                 # refresh on each.
                                 oldpatchset = self.patchset
                                 self.patchset = oldpatchset.__class__(self.patchset.dir, self.patchset.d)
-        
+
                                 for patch in self.patchset.patches:
                                         oldpatch = None
                                         for opatch in oldpatchset.patches:
                                                 if opatch["quiltfile"] == patch["quiltfile"]:
                                                         oldpatch = opatch
-        
+
                                         if oldpatch:
                                                 patch["remote"] = oldpatch["remote"]
                                                 if patch["quiltfile"] == oldpatch["quiltfile"]:
@@ -303,17 +356,18 @@ def patch_init():
                                 os.chdir(olddir)
                                 raise
                         os.chdir(olddir)
-        
+
                 # Throw away the changes to the patches in the patchset made by resolve()
                 def Revert(self):
                         raise NotImplementedError()
-        
+
                 # Apply the changes to the patches in the patchset made by resolve()
                 def Finalize(self):
                         raise NotImplementedError()
 
         g = globals()
         g["PatchSet"] = PatchSet
+        g["PatchTree"] = PatchTree
         g["QuiltTree"] = QuiltTree
         g["Resolver"] = Resolver
         g["UserResolver"] = UserResolver
@@ -322,45 +376,48 @@ def patch_init():
 
 addtask patch after do_unpack
 do_patch[dirs] = "${WORKDIR}"
-python base_do_patch() {
+python patch_do_patch() {
         import re
         import bb.fetch
 
-        patch_init()
-        
+        patch_init(d)
+
         src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
         if not src_uri:
                 return
-        
+
         patchsetmap = {
+                "patch": PatchTree,
                 "quilt": QuiltTree,
         }
 
         cls = patchsetmap[bb.data.getVar('PATCHTOOL', d, 1) or 'quilt']
-        
+
         resolvermap = {
                 "user": UserResolver,
         }
-        
+
         rcls = resolvermap[bb.data.getVar('PATCHRESOLVE', d, 1) or 'user']
-        
+
         s = bb.data.getVar('S', d, 1)
-        
+
+        path = os.getenv('PATH')
+        os.putenv('PATH', bb.data.getVar('PATH', d, 1))
         patchset = cls(s, d)
         patchset.Clean()
 
         resolver = rcls(patchset)
-        
+
         workdir = bb.data.getVar('WORKDIR', d, 1)
         for url in src_uri:
                 (type, host, path, user, pswd, parm) = bb.decodeurl(url)
                 if not "patch" in parm:
                         continue
-        
+
                 bb.fetch.init([url],d)
                 url = bb.encodeurl((type, host, path, user, pswd, []))
                 local = os.path.join('/', bb.fetch.localpath(url, d))
-        
+
                 # did it need to be unpacked?
                 dots = os.path.basename(local).split(".")
                 if dots[-1] in ['gz', 'bz2', 'Z']:
@@ -368,45 +425,45 @@ python base_do_patch() {
                 else:
                         unpacked = local
                 unpacked = bb.data.expand(unpacked, d)
-        
+
                 if "pnum" in parm:
                         pnum = parm["pnum"]
                 else:
                         pnum = "1"
-        
+
                 if "pname" in parm:
                         pname = parm["pname"]
                 else:
                         pname = os.path.basename(unpacked)
-        
+
                 if "mindate" in parm:
                         mindate = parm["mindate"]
                 else:
                         mindate = 0
-        
+
                 if "maxdate" in parm:
                         maxdate = parm["maxdate"]
                 else:
                         maxdate = "20711226"
-        
+
                 pn = bb.data.getVar('PN', d, 1)
                 srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
-        
+
                 if not srcdate:
                         srcdate = bb.data.getVar('SRCDATE', d, 1)
-        
-                if srcdate == "now": 
+
+                if srcdate == "now":
                         srcdate = bb.data.getVar('DATE', d, 1)
-        
+
                 if (maxdate < srcdate) or (mindate > srcdate):
                         if (maxdate < srcdate):
                                 bb.note("Patch '%s' is outdated" % pname)
-        
+
                         if (mindate > srcdate):
                                 bb.note("Patch '%s' is predated" % pname)
-        
+
                         continue
-        
+
                 bb.note("Applying patch '%s'" % pname)
                 try:
                         patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True)
@@ -415,3 +472,5 @@ python base_do_patch() {
                         raise bb.build.FuncFailed(str(sys.exc_value))
                 resolver.Resolve()
 }
+
+EXPORT_FUNCTIONS do_patch
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9f94bae3f5..2e3cb0f980 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -239,6 +239,12 @@ export MAKE = "make"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 ##################################################################
+# Patch handling.
+##################################################################
+PATCHTOOL = 'quilt'
+PATCHRESOLVE = 'user'
+
+##################################################################
 # Build flags and options.
 ##################################################################
 
@@ -336,12 +342,6 @@ SRC_URI = "file://${FILE}"
 MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
 MKTEMPCMD = "mktemp -q ${TMPBASE}"
 
-# Program to be used to patch sources, use 'inherit patcher' to overwrite this:
-
-PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi'
-PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -P $name $patch; chmod u+w patches/$name; quilt push"
-PATCH_DEPENDS = "quilt-native"
-
 # GNU patch tries to be intellgent about checking out read-only files from
 # a RCS, which freaks out those special folks with active Perforce clients
 # the following makes patch ignore RCS: