See patch
--
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: [EMAIL PROTECTED] • http://www.coresystems.de/
Registergericht: Amtsgericht Freiburg • HRB 7656
Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866
This patch fixes the ugly race condition created through build_opt_tbl running
twice at the same time, overwriting its output files. This caused a depending
rule to produce an object file with no symbols in it.
This should silence up the regularly happening build failure messages on the
mailing list since we moved to the newer, much faster server.
Signed-off-by: Stefan Reinauer <[EMAIL PROTECTED]>
Signed-off-by: Patrick Georgi <[EMAIL PROTECTED]>
Index: util/newconfig/config.g
===================================================================
--- util/newconfig/config.g (Revision 3773)
+++ util/newconfig/config.g (Arbeitskopie)
@@ -1607,6 +1607,7 @@
token PATH: r'[-a-zA-Z0-9_.][-a-zA-Z0-9/_.]+[-a-zA-Z0-9_.]+'
# Dir's on the other hand are abitrary
# this may all be stupid.
+ token RULE: r'[-a-zA-Z0-9_$()./]+[-a-zA-Z0-9_ $()./]+[-a-zA-Z0-9_$()./]+'
token DIRPATH: r'[-a-zA-Z0-9_$()./]+'
token ID: r'[a-zA-Z_.]+[a-zA-Z0-9_.]*'
token DELEXPR: r'{([^}]+|\\.)*}'
@@ -1703,13 +1704,10 @@
[ ELSE (stmt<<C and not c>>)* ]
END
- rule depsacts<<ID, C>>:
- ( DEPENDS STR {{ if (C): adddep(ID, STR) }}
- | ACTION STR {{ if (C): addaction(ID, STR) }}
+ rule makerule<<C>>: MAKERULE RULE {{ if (C): addrule(RULE) }}
+ ( DEPENDS STR {{ if (C): adddep(RULE, STR) }}
+ | ACTION STR {{ if (C): addaction(RULE, STR) }}
)*
-
- rule makerule<<C>>: MAKERULE DIRPATH {{ if (C): addrule(DIRPATH) }}
- depsacts<<DIRPATH, C>>
END
rule makedefine<<C>>:
Index: src/config/Config.lb
===================================================================
--- src/config/Config.lb (Revision 3773)
+++ src/config/Config.lb (Arbeitskopie)
@@ -179,21 +179,16 @@
action "$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) $< -o $@"
end
-makerule option_table.c
+makerule option_table.h option_table.c
depends "build_opt_tbl $(MAINBOARD)/cmos.layout"
- action "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout --header option_table.h"
+ action "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout --header option_table.h --option option_table.c"
end
-makerule option_table.h
- depends "build_opt_tbl $(MAINBOARD)/cmos.layout"
- action "./build_opt_tbl -b --config $(MAINBOARD)/cmos.layout --header option_table.h"
-end
-
if HAVE_OPTION_TABLE
object ./option_table.o
end
-makerule clean
+makerule clean
action "rm -f coreboot.* *~"
action "rm -f coreboot"
action "rm -f ldscript.ld"
signature.asc
Description: OpenPGP digital signature
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
