Changeset 03362fbd in mainline for tools/pack.py

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Message:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• tools/pack.py (modified) (2 diffs)

tools/pack.py

@@ -155 +155 @@
         header.write('/***************************************\n')
         header.write(' * AUTO-GENERATED FILE, DO NOT EDIT!!! *\n')
+        header.write(' * Generated by: tools/pack.py         *\n')
         header.write(' ***************************************/\n\n')
         header.write("#ifndef BOOT_COMPONENTS_H_\n")
@@ -177 +178 @@
         data.write('/***************************************\n')
         data.write(' * AUTO-GENERATED FILE, DO NOT EDIT!!! *\n')
+        data.write(' * Generated by: tools/pack.py         *\n')
         data.write(' ***************************************/\n\n')
         data.write("#include <typedefs.h>\n")