Changeset f9d0a86 in mainline for tools/config.py


Ignore:
Timestamp:
2017-11-14T12:24:42Z (8 years ago)
Author:
Aearsis <Hlavaty.Ondrej@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6cad776
Parents:
887c9de (diff), d2d142a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)
git-committer:
Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)
Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/config.py

    r887c9de rf9d0a86  
    445445def create_output(mkname, mcname, config, rules):
    446446        "Create output configuration"
    447 
    448         timestamp_unix = int(time.time())
     447       
     448        varname_strip = 'CONFIG_STRIP_REVISION_INFO'
     449        strip_rev_info = (varname_strip in config) and (config[varname_strip] == 'y')
     450       
     451        if strip_rev_info:
     452                timestamp_unix = int(0)
     453        else:
     454                # TODO: Use commit timestamp instead of build time.
     455                timestamp_unix = int(time.time())
     456       
    449457        timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp_unix))
    450458       
     
    458466                sys.stderr.write("failed\n")
    459467       
    460         if len(version) == 3:
     468        if (not strip_rev_info) and (len(version) == 3):
    461469                revision = version[1]
    462470                if version[0] != 1:
Note: See TracChangeset for help on using the changeset viewer.