diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-09-20 07:04:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-09-20 07:04:35 +0000 |
| commit | b4a7122cacef647dbec3db5c9ebe1e504a7670df (patch) | |
| tree | 006885a1f4e8032062632ee1a091e72c32dd2810 /openembedded/classes/base.bbclass | |
| parent | f9e1d16bfa73a2df5254c63ae1abb6a4bbe0a062 (diff) | |
| download | openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.gz openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.bz2 openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.xz openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.zip | |
Updates against mainline OE
git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes/base.bbclass')
| -rw-r--r-- | openembedded/classes/base.bbclass | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass index 37254b94b..18d51a02e 100644 --- a/openembedded/classes/base.bbclass +++ b/openembedded/classes/base.bbclass @@ -371,7 +371,7 @@ def oe_unpack_file(file, data, url = None): destdir = "." elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK): os.makedirs("%s/%s" % (os.getcwd(), destdir)) - cmd = 'cp -a %s %s/%s/' % (file, os.getcwd(), destdir) + cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir) else: (type, host, path, user, pswd, parm) = bb.decodeurl(url) if not 'patch' in parm: @@ -496,8 +496,16 @@ python base_eventhandler() { note(msg) if name.startswith("BuildStarted"): - statusvars = ['TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', - 'TARGET_FPU'] + bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) + path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 ) + path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )] + monotone_revision = "<unknown>" + try: + monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip() + except IOError: + pass + bb.data.setVar( 'OE_REVISION', monotone_revision, e.data ) + statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'TARGET_FPU'] statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) print statusmsg |