Patchwork More build breakage: signrom.sh vs kvmvapic.bin

login
register
mail settings
Submitter Brad
Date April 1, 2012, 2:48 a.m.
Message ID <20120401024817.GA14275@rox.home.comstyle.com>
Download mbox | patch
Permalink /patch/149897/
State New
Headers show

Comments

Brad - April 1, 2012, 2:48 a.m.
Here is another source of build breakage that popped up over a month ago.

The patch below fixes the build but I'm wondering why the file in question
is being built on anything but Linux. It seems to be used for KVM support
and thus has no relevance on any other OS.


  AS    optionrom/kvmvapic.o
  Building optionrom/kvmvapic.img
  Building optionrom/kvmvapic.raw
  Signing optionrom/kvmvapic.bin
/buildbot-qemu/default_openbsd_current/build/scripts/signrom.sh[31]:           018                                                             * 512 - 1 : bad number `018'
gmake[1]: *** [kvmvapic.bin] Error 1
Jan Kiszka - April 1, 2012, 8:36 a.m.
On 2012-04-01 04:48, Brad Smith wrote:
> Here is another source of build breakage that popped up over a month ago.
> 
> The patch below fixes the build but I'm wondering why the file in question
> is being built on anything but Linux. It seems to be used for KVM support
> and thus has no relevance on any other OS.

It is only build on x86 unix hosts minus Mac. We are shipping it as
binary for the rest. There is WIP on getting KVM working for Solaris, so
this may not be of Linux-only interest in the future.

> 
> 
>   AS    optionrom/kvmvapic.o
>   Building optionrom/kvmvapic.img
>   Building optionrom/kvmvapic.raw
>   Signing optionrom/kvmvapic.bin
> /buildbot-qemu/default_openbsd_current/build/scripts/signrom.sh[31]:           018                                                             * 512 - 1 : bad number `018'
> gmake[1]: *** [kvmvapic.bin] Error 1
> 
> 
> diff --git a/scripts/signrom.sh b/scripts/signrom.sh
> index 9dc5c63..2d421e9 100755
> --- a/scripts/signrom.sh
> +++ b/scripts/signrom.sh
> @@ -27,8 +27,8 @@ sum=0
>  
>  # find out the file size
>  x=`dd if="$1" bs=1 count=1 skip=2 2>/dev/null | od -t u1 -A n`
> -#size=`expr $x \* 512 - 1`
> -size=$(( $x * 512 - 1 ))
> +size=`expr $x \* 512 - 1`
> +#size=$(( $x * 512 - 1 ))
>  
>  # now get the checksum
>  nums=`od -A n -t u1 -v -N $size "$1"`
> 

signrom.sh is horribly slow and should be replaced soon, see
http://thread.gmane.org/gmane.comp.emulators.qemu/139368

Jan
Jan Kiszka - April 1, 2012, 8:39 a.m.
On 2012-04-01 10:36, Jan Kiszka wrote:
> On 2012-04-01 04:48, Brad Smith wrote:
>> Here is another source of build breakage that popped up over a month ago.
>>
>> The patch below fixes the build but I'm wondering why the file in question
>> is being built on anything but Linux. It seems to be used for KVM support
>> and thus has no relevance on any other OS.
> 
> It is only build on x86 unix hosts minus Mac. We are shipping it as
> binary for the rest. There is WIP on getting KVM working for Solaris, so
> this may not be of Linux-only interest in the future.
> 

Oh, and I totally forgot to mention that we are able to emulate the KVM
VAPIC in the absence of host-side KVM support.

Jan
Brad - April 1, 2012, 8:55 a.m.
On 01/04/12 4:36 AM, Jan Kiszka wrote:
> It is only build on x86 unix hosts minus Mac. We are shipping it as
> binary for the rest. There is WIP on getting KVM working for Solaris, so
> this may not be of Linux-only interest in the future.

Ok so you then build it on Linux and Solaris. But I don't see the point of
building it on any OS that does not have KVM since you'll never use it 
there.

> signrom.sh is horribly slow and should be replaced soon, see
> http://thread.gmane.org/gmane.comp.emulators.qemu/139368

I don't care if it's slow. The build is broken. That is what matters.

Patch

diff --git a/scripts/signrom.sh b/scripts/signrom.sh
index 9dc5c63..2d421e9 100755
--- a/scripts/signrom.sh
+++ b/scripts/signrom.sh
@@ -27,8 +27,8 @@  sum=0
 
 # find out the file size
 x=`dd if="$1" bs=1 count=1 skip=2 2>/dev/null | od -t u1 -A n`
-#size=`expr $x \* 512 - 1`
-size=$(( $x * 512 - 1 ))
+size=`expr $x \* 512 - 1`
+#size=$(( $x * 512 - 1 ))
 
 # now get the checksum
 nums=`od -A n -t u1 -v -N $size "$1"`