diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-19 18:59:10 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-19 18:59:10 +0000 |
| commit | dfb5e54b1148fc2ed2185dbc2ea9feb9490ee078 (patch) | |
| tree | 7ecfa26048ace4380ee15ff4519bb2bc7693f99e | |
| parent | f5dc4c7c9f36561d9edf65162335d5e0666c3883 (diff) | |
Add patch to allow Bochs patch queue to be built from another directory.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6110 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | pc-bios/bios-pq/0007_separate-build-dir.patch | 33 | ||||
| -rw-r--r-- | pc-bios/bios-pq/series | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/pc-bios/bios-pq/0007_separate-build-dir.patch b/pc-bios/bios-pq/0007_separate-build-dir.patch new file mode 100644 index 0000000000..5d718c4522 --- /dev/null +++ b/pc-bios/bios-pq/0007_separate-build-dir.patch @@ -0,0 +1,33 @@ +Fix bochs bios build from a separate directory + +Bochs keeps the BIOS-bochs-latest and BIOS-bochs-legacy binaries under revision +control. Since the build changes these binaries, and guilt cannot handle +changed binaries, it makes it very difficult to work with a patch queue if +you're building from the same tree as the source is located. + +Bochs has some support for building from a separate directory but it's currently +broken. This patch fixes that and allows for a sane work flow when developing +BIOS changes for QEMU. + +Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> + +diff --git a/bios/Makefile.in b/bios/Makefile.in +index 5c7bd4f..3d3d195 100644 +--- a/bios/Makefile.in ++++ b/bios/Makefile.in +@@ -98,7 +98,7 @@ rombios32.bin: rombios32.out rombios.h + ./biossums -pad $@ + + rombios32.out: rombios32start.o rombios32.o rombios32.ld +- ld -o $@ -T rombios32.ld rombios32start.o rombios32.o ++ ld -o $@ -T $(srcdir)/rombios32.ld rombios32start.o rombios32.o + + rombios32.o: rombios32.c acpi-dsdt.hex + $(GCC32) -O2 -Wall -c -o $@ $< +@@ -115,5 +115,4 @@ rombios32start.o: rombios32start.S + BIOS-bochs-latest: rombios16.bin rombios32.bin + cat rombios32.bin rombios16.bin > $@ + +-biossums: biossums.c +- $(GCC) -o biossums biossums.c ++biossums: biossums.o diff --git a/pc-bios/bios-pq/series b/pc-bios/bios-pq/series index b53157ecd9..bbf1aafc40 100644 --- a/pc-bios/bios-pq/series +++ b/pc-bios/bios-pq/series @@ -4,3 +4,4 @@ 0004_no-stack-protector.patch 0005_hpet.patch 0006_acpi-packing.patch +0007_separate-build-dir.patch |