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