Author: stepan
Date: 2009-02-28 18:09:29 +0100 (Sat, 28 Feb 2009)
New Revision: 3962

Modified:
   trunk/coreboot-v2/util/newconfig/config.g
Log:
This is a small fix for the last checkin (does not fix those two boards) that
caused same filenames to still cause objects being dropped from the build list
- which was the whole purpose of the patch.

Signed-off-by: Stefan Reinauer <[email protected]>
Acked-by: Stefan Reinauer <[email protected]>



Modified: trunk/coreboot-v2/util/newconfig/config.g
===================================================================
--- trunk/coreboot-v2/util/newconfig/config.g   2009-02-28 12:50:32 UTC (rev 
3961)
+++ trunk/coreboot-v2/util/newconfig/config.g   2009-02-28 17:09:29 UTC (rev 
3962)
@@ -330,6 +330,7 @@
                if (object_name[0] == '.'):
                        source = base + suffix
                        object = base + '.o'
+                       rel_base = base
                else:
                        rel_base = re.sub(treetop, "", 
os.path.join(dirstack.tos(), base))
                        source = "$(TOP)/" + rel_base + suffix
@@ -337,11 +338,11 @@
                                rel_base = re.sub("^/", "", rel_base)
                        object = rel_base + '.o'
 
-               debug.info(debug.object, "add object %s source %s" % 
(object_name, source))
-               l = getdict(dict, base)
+               debug.info(debug.object, "add object %s source %s" % (object, 
source))
+               l = getdict(dict, rel_base)
                if (l):
-                       warning("object/driver %s previously defined" % base)
-               setdict(dict, base, [object, source, type, base])
+                       warning("object/driver %s previously defined" % 
rel_base)
+               setdict(dict, rel_base, [object, source, type, rel_base])
 
        def addinitobjectrule(self, name):
                self.addobjectdriver(self.initobjectrules, name)


--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to