[oe-commits] org.nslu2-linux.bitbake Updated to SVN version 294

[rwhitby commit]

Updated to SVN version 294

Author: rwhitby at nslu2-linux.org
Branch: org.nslu2-linux.bitbake
Revision: 4fafd70a4fdd28339421a29c7061cd9a78197854
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4fafd70a4fdd28339421a29c7061cd9a78197854
Files:
1
bin/bitbake
lib/bb/fetch.py
lib/bb/parse/parse_py/ConfHandler.py
Diffs:

#
# mt diff -r3f4bb86fca4bbf1ec0813730c2138134e953491d -r4fafd70a4fdd28339421a29c7061cd9a78197854
#
# 
# 
# patch "bin/bitbake"
#  from [719d65d11c99af9dcdea3b3827153498bd3d8211]
#    to [85546e27d34eb90f0b7d78f6714b960266a18975]
# 
# patch "lib/bb/fetch.py"
#  from [2bcc653cadaf92f87bfebc77581625ff049e1902]
#    to [224b8bbd403d88df33219ece48dd59efd1fd61fa]
# 
# patch "lib/bb/parse/parse_py/ConfHandler.py"
#  from [b11363d7384ada9ade098aaf58310c5ebe4cb965]
#    to [332848401051e25e945534ce2fbf3d69fb085120]
# 
============================================================
--- bin/bitbake	719d65d11c99af9dcdea3b3827153498bd3d8211
+++ bin/bitbake	85546e27d34eb90f0b7d78f6714b960266a18975
@@ -21,7 +21,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA.
 
-import sys, os, getopt, glob, copy, os.path, re
+import sys, os, getopt, glob, copy, os.path, re, time
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
 import bb
 from bb import utils, data, parse, debug, event, fatal
@@ -544,6 +544,7 @@ class BBCooker:
         except ImportError, details:
             bb.fatal("Sorry, shell not available (%s)" % details )
         else:
+            bb.data.update_data( self.configuration.data )
             shell.start( self )
             sys.exit( 0 )
 
@@ -600,8 +601,10 @@ class BBCooker:
             self.showEnvironment()
             sys.exit( 0 )
 
+        # inject custom variables
         if not bb.data.getVar("BUILDNAME", self.configuration.data):
             bb.data.setVar("BUILDNAME", os.popen('date +%Y%m%d%H%M').readline().strip(), self.configuration.data)
+        bb.data.setVar("BUILDSTART", time.strftime('%m/%d/%Y %H:%M:%S',time.localtime()),self.configuration.data)
 
         buildname = bb.data.getVar("BUILDNAME", self.configuration.data)
 
============================================================
--- lib/bb/fetch.py	2bcc653cadaf92f87bfebc77581625ff049e1902
+++ lib/bb/fetch.py	224b8bbd403d88df33219ece48dd59efd1fd61fa
@@ -38,8 +38,8 @@ class MissingParameterError(Exception):
 class MissingParameterError(Exception):
     """Exception raised when a fetch method is missing a critical parameter in the url"""
 
-#decodeurl("cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=V0-99-81")
-#('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'})
+class MD5SumError(Exception):
+    """Exception raised when a MD5SUM of a file does not match the expected one"""
 
 def uri_replace(uri, uri_find, uri_replace, d):
 #   bb.note("uri_replace: operating on %s" % uri)
@@ -172,7 +172,17 @@ class Wget(Fetch):
 
     def go(self, d, urls = []):
         """Fetch urls"""
-        def fetch_uri(uri, basename, dl, md5, d):
+
+        def md5_sum(basename, data):
+            """
+            Fast and incomplete OVERRIDE implementation for MD5SUM handling
+            MD5SUM_basename = "SUM" and fallback to MD5SUM_basename
+            """
+            var = "MD5SUM_%s" % basename
+            return getVar(var, data) or get("MD5SUM",data)
+
+
+        def fetch_uri(uri, basename, dl, md5, parm, d):
             if os.path.exists(dl):
 #               file exists, but we didnt complete it.. trying again..
                 fetchcmd = data.getVar("RESUMECOMMAND", d, 1)
@@ -234,14 +244,14 @@ class Wget(Fetch):
             for (find, replace) in premirrors:
                 newuri = uri_replace(uri, find, replace, d)
                 if newuri != uri:
-                    if fetch_uri(newuri, basename, dl, md5, localdata):
+                    if fetch_uri(newuri, basename, dl, md5, parm, localdata):
                         completed = 1
                         break
 
             if completed:
                 continue
 
-            if fetch_uri(uri, basename, dl, md5, localdata):
+            if fetch_uri(uri, basename, dl, md5, parm, localdata):
                 continue
 
 #           try mirrors
@@ -249,7 +259,7 @@ class Wget(Fetch):
             for (find, replace) in mirrors:
                 newuri = uri_replace(uri, find, replace, d)
                 if newuri != uri:
-                    if fetch_uri(newuri, basename, dl, md5, localdata):
+                    if fetch_uri(newuri, basename, dl, md5, parm, localdata):
                         completed = 1
                         break
 
============================================================
--- lib/bb/parse/parse_py/ConfHandler.py	b11363d7384ada9ade098aaf58310c5ebe4cb965
+++ lib/bb/parse/parse_py/ConfHandler.py	332848401051e25e945534ce2fbf3d69fb085120
@@ -23,6 +23,7 @@ from bb import debug, fatal
 
 import re, bb.data, os, sys
 from bb import debug, fatal
+from bb.parse import ParseError
 
 #__config_regexp__  = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}]+)\s*(?P<colon>:)?(?P<ques>\?)?=\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$")
 __config_regexp__  = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}/]+)(\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?\s*((?P<colon>:=)|(?P<ques>\?=)|(?P<append>\+=)|(?P<prepend>=\+)|=)\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$")