Browse Source

[build] Disable ccache for embedded.o

Embedded image support uses .incbin in inline assembly to include binary
files.  The file dependency is not spotted by ccache when deciding
whether or not to rebuild embedded.o.  This results in builds that
contain an outdated version of the embedded image when ccache is used.

Reported-by: Tim 'Shaggy' Bielawa <tbielawa@jabber.org>
Reported-by: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Marty Connor <mdc@etherboot.org>
tags/v1.20.1
Stefan Hajnoczi 14 years ago
parent
commit
868d2e4250
15 changed files with 155 additions and 0 deletions
  1. 103
    0
      .dotest/0001
  2. 0
    0
      .dotest/applying
  3. 1
    0
      .dotest/binary
  4. 11
    0
      .dotest/final-commit
  5. 11
    0
      .dotest/final-commit~
  6. 5
    0
      .dotest/info
  7. 1
    0
      .dotest/keep
  8. 1
    0
      .dotest/last
  9. 8
    0
      .dotest/msg
  10. 10
    0
      .dotest/msg-clean
  11. 1
    0
      .dotest/next
  12. 0
    0
      .dotest/patch
  13. 1
    0
      .dotest/sign
  14. 1
    0
      .dotest/utf8
  15. 1
    0
      .dotest/whitespace

+ 103
- 0
.dotest/0001 View File

@@ -0,0 +1,103 @@
1
+Return-Path: <gpxe-devel-bounces@etherboot.org>
2
+Received: from p02c12m103.mxlogic.net (208.65.145.245) by entity.com with
3
+ ESMTP (EIMS X 3.3.9) for <mdc@entity.com>; Mon, 1 Mar 2010 15:40:07 -0500
4
+Received: from unknown [140.211.167.171] (EHLO etherboot.org)
5
+	by p02c12m103.mxlogic.net(mxl_mta-6.5.0-1) over TLS secured channel
6
+	with ESMTP id fd42c8b4.0.4168455.00-005.7521746.p02c12m103.mxlogic.net (envelope-from <gpxe-devel-bounces@etherboot.org>);
7
+	Mon, 01 Mar 2010 13:34:39 -0700 (MST)
8
+Received: from etherboot.org (localhost.localdomain [127.0.0.1])
9
+	by etherboot.org (8.14.2/8.14.1) with ESMTP id o21KYbS7012321;
10
+	Mon, 1 Mar 2010 15:34:38 -0500
11
+Received: from p02c11m026.mxlogic.net (mxl144v245.mxlogic.net [208.65.144.245])
12
+	by etherboot.org (8.14.2/8.14.1) with ESMTP id o21KYY2N012318
13
+	for <gpxe-devel@etherboot.org>; Mon, 1 Mar 2010 15:34:34 -0500
14
+Received: from unknown [74.125.82.172] (EHLO mail-wy0-f172.google.com)
15
+	by p02c11m026.mxlogic.net(mxl_mta-6.5.0-1)
16
+	with ESMTP id 9d42c8b4.0.166215.00-009.325205.p02c11m026.mxlogic.net
17
+	(envelope-from <stefanha@gmail.com>); 
18
+	Mon, 01 Mar 2010 13:34:33 -0700 (MST)
19
+Received: by wyb40 with SMTP id 40so1419829wyb.3
20
+	for <gpxe-devel@etherboot.org>; Mon, 01 Mar 2010 12:34:32 -0800 (PST)
21
+Received: by 10.216.90.131 with SMTP id e3mr3423835wef.69.1267475672513;
22
+	Mon, 01 Mar 2010 12:34:32 -0800 (PST)
23
+Received: from localhost.localdomain ([109.170.137.145])
24
+	by mx.google.com with ESMTPS id q9sm12235819gve.9.2010.03.01.12.34.30
25
+	(version=TLSv1/SSLv3 cipher=RC4-MD5);
26
+	Mon, 01 Mar 2010 12:34:31 -0800 (PST)
27
+From: Stefan Hajnoczi <stefanha@gmail.com>
28
+To: gpxe-devel@etherboot.org
29
+Date: Mon,  1 Mar 2010 20:34:47 +0000
30
+Message-Id: <1267475687-2588-1-git-send-email-stefanha@gmail.com>
31
+X-Mailer: git-send-email 1.6.6.1
32
+X-Spam: [F=0.0026605109; B=0.500(0); spf=0.500; CM=0.500; MH=0.500(2010030128);
33
+	R=0.010(110211361); S=0.200(2010022601); SC=none]
34
+X-MAIL-FROM: <stefanha@gmail.com>
35
+X-SOURCE-IP: [74.125.82.172]
36
+X-AnalysisOut: [v=1.0 c=1 a=rKSIm1mMmeAA:10 a=D3jKoc08XWmMkYP2DZwE0A==:17 ]
37
+X-AnalysisOut: [a=RqVXL-LNAAAA:8 a=iLNU1ar6AAAA:8 a=pGLkceISAAAA:8 a=AuZ9e]
38
+X-AnalysisOut: [Z2SswYdc2fNWtAA:9 a=CPnfYM3Gieb-gT-cb9IA:7 a=LC8435YRJuG01]
39
+X-AnalysisOut: [rSSbKrC0rh93LgA:4 a=DOYNd9a5gwgA:10 a=-XwJ49_kmwcA:10 a=MS]
40
+X-AnalysisOut: [l-tDqOz04A:10]
41
+Subject: [gPXE-devel] [PATCH] [makefile] Disable ccache for embedded.o
42
+X-BeenThere: gpxe-devel@etherboot.org
43
+X-Mailman-Version: 2.1.9
44
+Precedence: list
45
+List-Id: gPXE development discussion <gpxe-devel.etherboot.org>
46
+List-Unsubscribe: <http://etherboot.org/mailman/listinfo/gpxe-devel>,
47
+	<mailto:gpxe-devel-request@etherboot.org?subject=unsubscribe>
48
+List-Archive: <http://etherboot.org/pipermail/gpxe-devel>
49
+List-Post: <mailto:gpxe-devel@etherboot.org>
50
+List-Help: <mailto:gpxe-devel-request@etherboot.org?subject=help>
51
+List-Subscribe: <http://etherboot.org/mailman/listinfo/gpxe-devel>,
52
+	<mailto:gpxe-devel-request@etherboot.org?subject=subscribe>
53
+MIME-Version: 1.0
54
+Content-Type: text/plain; charset="us-ascii"
55
+Content-Transfer-Encoding: 7bit
56
+Sender: gpxe-devel-bounces@etherboot.org
57
+Errors-To: gpxe-devel-bounces@etherboot.org
58
+X-Spam: [F=0.2573030374; B=0.500(0); CM=0.500; MH=0.500(2010030128); R=0.580(1102113526); S=0.200(2010022601); SC=none]
59
+X-MAIL-FROM: <gpxe-devel-bounces@etherboot.org>
60
+X-SOURCE-IP: [140.211.167.171]
61
+X-AnalysisOut: [v=1.0 c=1 a=0P5afutgQfoA:10 a=xR1HcFQh7M/g2HrvuBmjtA==:17 ]
62
+X-AnalysisOut: [a=RqVXL-LNAAAA:8 a=iLNU1ar6AAAA:8 a=pGLkceISAAAA:8 a=ZQMZI]
63
+X-AnalysisOut: [4RIAAAA:8 a=AuZ9eZ2SswYdc2fNWtAA:9 a=re_wC--vStNGNHZ52bYA:]
64
+X-AnalysisOut: [7 a=aNBrdc3xVhUQmJpx8CKas0b13rQA:4 a=DOYNd9a5gwgA:10 a=-Xw]
65
+X-AnalysisOut: [J49_kmwcA:10 a=MSl-tDqOz04A:10 a=ivdeCs68_u8A:10]
66
+
67
+Embedded image support uses .incbin in inline assembly to include binary
68
+files.  The file dependency is not spotted by ccache when deciding
69
+whether or not to rebuild embedded.o.  This results in builds that
70
+contain an outdated version of the embedded image when ccache is used.
71
+
72
+Reported-by: Tim 'Shaggy' Bielawa <tbielawa@jabber.org>
73
+Reported-by: Matt Domsch <Matt_Domsch@dell.com>
74
+Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
75
+---
76
+ src/Makefile.housekeeping |    7 +++++++
77
+ 1 files changed, 7 insertions(+), 0 deletions(-)
78
+
79
+diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
80
+index 1f5e115..8ba7e44 100644
81
+--- a/src/Makefile.housekeeping
82
++++ b/src/Makefile.housekeeping
83
+@@ -511,6 +511,13 @@ EMBED_ALL	:= $(foreach i,$(call seq,1,$(words $(EMBEDDED_FILES))),\
84
+ 			     \"$(notdir $(word $(i),$(EMBEDDED_FILES)))\" ))
85
+ 
86
+ $(BIN)/embedded.o : $(EMBEDDED_FILES) $(EMBEDDED_LIST)
87
++
88
++# This file uses .incbin inline assembly to include a binary file.
89
++# Unfortunately ccache does not detect this dependency and caches builds even
90
++# when the binary file has changed.
91
++#
92
++$(BIN)/embedded.o : override CC := env CCACHE_DISABLE=1 $(CC)
93
++
94
+ CFLAGS_embedded = -DEMBED_ALL="$(EMBED_ALL)"
95
+ 
96
+ # Generate the NIC file from the parsed source files.  The NIC file is
97
+-- 
98
+1.6.6.1
99
+
100
+_______________________________________________
101
+gPXE-devel mailing list
102
+gPXE-devel@etherboot.org
103
+http://etherboot.org/mailman/listinfo/gpxe-devel

+ 0
- 0
.dotest/applying View File


+ 1
- 0
.dotest/binary View File

@@ -0,0 +1 @@
1
+

+ 11
- 0
.dotest/final-commit View File

@@ -0,0 +1,11 @@
1
+[build] Disable ccache for embedded.o
2
+
3
+Embedded image support uses .incbin in inline assembly to include binary
4
+files.  The file dependency is not spotted by ccache when deciding
5
+whether or not to rebuild embedded.o.  This results in builds that
6
+contain an outdated version of the embedded image when ccache is used.
7
+
8
+Reported-by: Tim 'Shaggy' Bielawa <tbielawa@jabber.org>
9
+Reported-by: Matt Domsch <Matt_Domsch@dell.com>
10
+Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
11
+Signed-off-by: Marty Connor <mdc@etherboot.org>

+ 11
- 0
.dotest/final-commit~ View File

@@ -0,0 +1,11 @@
1
+Disable ccache for embedded.o
2
+
3
+Embedded image support uses .incbin in inline assembly to include binary
4
+files.  The file dependency is not spotted by ccache when deciding
5
+whether or not to rebuild embedded.o.  This results in builds that
6
+contain an outdated version of the embedded image when ccache is used.
7
+
8
+Reported-by: Tim 'Shaggy' Bielawa <tbielawa@jabber.org>
9
+Reported-by: Matt Domsch <Matt_Domsch@dell.com>
10
+Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
11
+Signed-off-by: Marty Connor <mdc@etherboot.org>

+ 5
- 0
.dotest/info View File

@@ -0,0 +1,5 @@
1
+Author: Stefan Hajnoczi
2
+Email: stefanha@gmail.com
3
+Subject: Disable ccache for embedded.o
4
+Date: Mon, 1 Mar 2010 20:34:47 +0000
5
+

+ 1
- 0
.dotest/keep View File

@@ -0,0 +1 @@
1
+

+ 1
- 0
.dotest/last View File

@@ -0,0 +1 @@
1
+1

+ 8
- 0
.dotest/msg View File

@@ -0,0 +1,8 @@
1
+Embedded image support uses .incbin in inline assembly to include binary
2
+files.  The file dependency is not spotted by ccache when deciding
3
+whether or not to rebuild embedded.o.  This results in builds that
4
+contain an outdated version of the embedded image when ccache is used.
5
+
6
+Reported-by: Tim 'Shaggy' Bielawa <tbielawa@jabber.org>
7
+Reported-by: Matt Domsch <Matt_Domsch@dell.com>
8
+Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>

+ 10
- 0
.dotest/msg-clean View File

@@ -0,0 +1,10 @@
1
+Disable ccache for embedded.o
2
+
3
+Embedded image support uses .incbin in inline assembly to include binary
4
+files.  The file dependency is not spotted by ccache when deciding
5
+whether or not to rebuild embedded.o.  This results in builds that
6
+contain an outdated version of the embedded image when ccache is used.
7
+
8
+Reported-by: Tim 'Shaggy' Bielawa <tbielawa@jabber.org>
9
+Reported-by: Matt Domsch <Matt_Domsch@dell.com>
10
+Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>

+ 1
- 0
.dotest/next View File

@@ -0,0 +1 @@
1
+1

+ 0
- 0
.dotest/patch View File


+ 1
- 0
.dotest/sign View File

@@ -0,0 +1 @@
1
+t

+ 1
- 0
.dotest/utf8 View File

@@ -0,0 +1 @@
1
+t

+ 1
- 0
.dotest/whitespace View File

@@ -0,0 +1 @@
1
+ 

Loading…
Cancel
Save