[Qemu-devel] [6110] Add patch to allow Bochs patch queue to be built from another directory.

[Qemu-devel] [6110] Add patch to allow Bochs patch queue to be built from another directory.

[Anthony Liguori]

Revision: 6110
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6110
Author:   aliguori
Date:     2008-12-19 18:59:10 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
Add patch to allow Bochs patch queue to be built from another directory.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/pc-bios/bios-pq/series

Added Paths:
-----------
    trunk/pc-bios/bios-pq/0007_separate-build-dir.patch

Added: trunk/pc-bios/bios-pq/0007_separate-build-dir.patch
===================================================================
--- trunk/pc-bios/bios-pq/0007_separate-build-dir.patch	                        (rev 0)
+++ trunk/pc-bios/bios-pq/0007_separate-build-dir.patch	2008-12-19 18:59:10 UTC (rev 6110)
@@ -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

Modified: trunk/pc-bios/bios-pq/series
===================================================================
--- trunk/pc-bios/bios-pq/series	2008-12-19 16:22:03 UTC (rev 6109)
+++ trunk/pc-bios/bios-pq/series	2008-12-19 18:59:10 UTC (rev 6110)
@@ -4,3 +4,4 @@
 0004_no-stack-protector.patch
 0005_hpet.patch
 0006_acpi-packing.patch
+0007_separate-build-dir.patch

Re: [Qemu-devel] [6110] Add patch to allow Bochs patch queue to be built from another directory.

[Volker Ruppert]

Hi all!

> Revision: 6110
>           http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6110
> Author:   aliguori
> Date:     2008-12-19 18:59:10 +0000 (Fri, 19 Dec 2008)
>
> Log Message:
> -----------
> Add patch to allow Bochs patch queue to be built from another directory.

The patches #4, #6 and #7 are now applied to Bochs CVS.

BTW: The file vgabios.diff is obsolete, since the changes are already present 
in vgabios CVS (appear first in release 0.6a / August 2006).

--
Thanks

Volker

Re: [Qemu-devel] [6110] Add patch to allow Bochs patch queue to be built from another directory.

[Anthony Liguori]

Volker Ruppert wrote:
> Hi all!
>
>   
>> Revision: 6110
>>           http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6110
>> Author:   aliguori
>> Date:     2008-12-19 18:59:10 +0000 (Fri, 19 Dec 2008)
>>
>> Log Message:
>> -----------
>> Add patch to allow Bochs patch queue to be built from another directory.
>>     
>
> The patches #4, #6 and #7 are now applied to Bochs CVS.
>   

Fantastic!  I was planning on patch bombing the whole series to 
bochs-devel soon but this works too.  Do you have any comments on #2, 
#3, or #5?  #3 and #5 are guarded in BX_QEMU so they should be safe 
(although both could be useful to Bochs).

#4 enables the e820 map to describe more than 4GB of memory.  It's 
equally applicable to Bochs even if Bochs doesn't support this feature.

> BTW: The file vgabios.diff is obsolete, since the changes are already present 
> in vgabios CVS (appear first in release 0.6a / August 2006).
>   

Indeed, I'll remove it from SVN.

Thanks!

Regards,

Anthony Liguori

> --
> Thanks
>
> Volker
>   

[Qemu-devel] Re: [6110] Add patch to allow Bochs patch queue to bebuilt from another directory.

[Sebastian Herbszt]

Volker Ruppert wrote:
> Hi all!
> 
>> Revision: 6110
>>           http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6110
>> Author:   aliguori
>> Date:     2008-12-19 18:59:10 +0000 (Fri, 19 Dec 2008)
>>
>> Log Message:
>> -----------
>> Add patch to allow Bochs patch queue to be built from another directory.
> 
> The patches #4, #6 and #7 are now applied to Bochs CVS.

0004_no-stack-protector.patch breaks compile on my gcc version 3.4.5
(mingw-vista special r3):

error: unrecognized command line option "-fno-stack-protector"

This should be checked in configure.in or Makefile and added only if available.

- Sebastian

Re: [Qemu-devel] [6110] Add patch to allow Bochs patch queue to be built from another directory.

[Volker Ruppert]

Hi all!

> Fantastic!  I was planning on patch bombing the whole series to
> bochs-devel soon but this works too.  Do you have any comments on #2,
> #3, or #5?  #3 and #5 are guarded in BX_QEMU so they should be safe
> (although both could be useful to Bochs).
>
> #4 enables the e820 map to describe more than 4GB of memory.  It's
> equally applicable to Bochs even if Bochs doesn't support this feature.

I have now applied the outstanding patches to the Bochs BIOS.

--
Thanks

Volker