Changes for ticket:8, with fixes for the bugs reported by Richard.

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

1 files changed, 5 insertions, 86 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index bb6171f19c..0fa2b8cd07 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -337,7 +337,7 @@ python base_do_mrproper() {
 
 addtask fetch
 do_fetch[dirs] = "${DL_DIR}"
-#do_fetch[nostamp] = "1"
+do_fetch[nostamp] = "1"
 python base_do_fetch() {
         import sys
 
@@ -451,86 +451,6 @@ python base_do_unpack() {
                         raise bb.build.FuncFailed()
 }
 
-addtask patch after do_unpack
-do_patch[dirs] = "${WORKDIR}"
-python base_do_patch() {
-        import re
-        import bb.fetch
-
-        src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
-        if not src_uri:
-                return
-
-        patchcleancmd = bb.data.getVar('PATCHCLEANCMD', d, 1)
-        if patchcleancmd:
-                bb.data.setVar("do_patchcleancmd", patchcleancmd, d)
-                bb.data.setVarFlag("do_patchcleancmd", "func", 1, d)
-                bb.build.exec_func("do_patchcleancmd", d)
-
-        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']:
-                        unpacked = os.path.join(bb.data.getVar('WORKDIR', d),'.'.join(dots[0:-1]))
-                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": 
-                        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)
-                bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
-                bb.data.setVarFlag("do_patchcmd", "func", 1, d)
-                bb.data.setVarFlag("do_patchcmd", "dirs", "${WORKDIR} ${S}", d)
-                bb.build.exec_func("do_patchcmd", d)
-}
-
 
 addhandler base_eventhandler
 python base_eventhandler() {
@@ -557,8 +477,7 @@ python base_eventhandler() {
                 msg += messages.get(name[5:]) or name[5:]
         elif name == "UnsatisfiedDep":
                 msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())
-        if msg:
-                note(msg)
+        note(msg)
 
         if name.startswith("BuildStarted"):
                 bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
@@ -599,7 +518,6 @@ python base_eventhandler() {
 addtask configure after do_unpack do_patch
 do_configure[dirs] = "${S} ${B}"
 do_configure[bbdepcmd] = "do_populate_staging"
-do_configure[deptask] = "do_populate_staging"
 base_do_configure() {
         :
 }
@@ -761,6 +679,9 @@ python () {
                                 return
 }
 
+# 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
 
 MIRRORS[func] = "0"
@@ -802,9 +723,7 @@ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/
 ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/
 ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
 ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/
-http://www.rpsys.net/openzaurus/patches/archive http://projects.o-hand.com/sources/kernel
 
 ftp://.*/.*/    http://www.oesources.org/source/current/
 http://.*/.*/   http://www.oesources.org/source/current/
 }
-