Revision dfb5e54b
b/pc-bios/bios-pq/0007_separate-build-dir.patch | ||
---|---|---|
1 |
Fix bochs bios build from a separate directory |
|
2 |
|
|
3 |
Bochs keeps the BIOS-bochs-latest and BIOS-bochs-legacy binaries under revision |
|
4 |
control. Since the build changes these binaries, and guilt cannot handle |
|
5 |
changed binaries, it makes it very difficult to work with a patch queue if |
|
6 |
you're building from the same tree as the source is located. |
|
7 |
|
|
8 |
Bochs has some support for building from a separate directory but it's currently |
|
9 |
broken. This patch fixes that and allows for a sane work flow when developing |
|
10 |
BIOS changes for QEMU. |
|
11 |
|
|
12 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> |
|
13 |
|
|
14 |
diff --git a/bios/Makefile.in b/bios/Makefile.in |
|
15 |
index 5c7bd4f..3d3d195 100644 |
|
16 |
--- a/bios/Makefile.in |
|
17 |
+++ b/bios/Makefile.in |
|
18 |
@@ -98,7 +98,7 @@ rombios32.bin: rombios32.out rombios.h |
|
19 |
./biossums -pad $@ |
|
20 |
|
|
21 |
rombios32.out: rombios32start.o rombios32.o rombios32.ld |
|
22 |
- ld -o $@ -T rombios32.ld rombios32start.o rombios32.o |
|
23 |
+ ld -o $@ -T $(srcdir)/rombios32.ld rombios32start.o rombios32.o |
|
24 |
|
|
25 |
rombios32.o: rombios32.c acpi-dsdt.hex |
|
26 |
$(GCC32) -O2 -Wall -c -o $@ $< |
|
27 |
@@ -115,5 +115,4 @@ rombios32start.o: rombios32start.S |
|
28 |
BIOS-bochs-latest: rombios16.bin rombios32.bin |
|
29 |
cat rombios32.bin rombios16.bin > $@ |
|
30 |
|
|
31 |
-biossums: biossums.c |
|
32 |
- $(GCC) -o biossums biossums.c |
|
33 |
+biossums: biossums.o |
b/pc-bios/bios-pq/series | ||
---|---|---|
4 | 4 |
0004_no-stack-protector.patch |
5 | 5 |
0005_hpet.patch |
6 | 6 |
0006_acpi-packing.patch |
7 |
0007_separate-build-dir.patch |
Also available in: Unified diff