diff mbox

Xen 4.6.1 raisin build error etherboot undeclared

Message ID CAFLBxZZNSeF3RtRs9Lk-Yd+8wndbWrKks9iWgKco7s0yt07ZwQ@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

George Dunlap March 29, 2016, 4:07 p.m. UTC 
On Sat, Mar 26, 2016 at 12:46 PM, Holger Schramm <lists@schramm.by> wrote:
> Hi there,
>
> i receive a build error at rombios.c and etherboot not declared. I have
> no idea how to fix this.
>
> One thing i stumbled is this commit:
>
> http://xenbits.xen.org/gitweb/?p=raisin.git;a=commitdiff;h=5fe3855a6cf69c4aaed89c47b7e7937b9c66d07e

It looks like that commit contains a bug -- the patch adds
"--enable-rombios", but the text of the patch seems to indicate that
"--disable-rombios" is what was wanted.

Can you try the attached patch?

 -George
diff mbox

Patch

commit 8f40a9a9a61414ef6146da3524420858115600b1
Author: George Dunlap <george.dunlap@citrix.com>
Commit: George Dunlap <george.dunlap@citrix.com>

    raisin: Actually disable rombios
    
    Commit 5fe3855 meant to disable rombios, but didn't.  This causes the following
    build failure:
    
    gcc   -O2 -fomit-frame-pointer -m32 -march=i686 -fno-strict-aliasing
    -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement
    -Wno-unused-but-set-variable -Wno-unused-local-typedefs
    -D__XEN_TOOLS__ -MMD -MF .rombios.o.d -D_LARGEFILE_SOURCE
    -D_LARGEFILE64_SOURCE -mno-tls-direct-seg-refs  -DNDEBUG -Werror
    -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float
    -I/usr/local/src/xenboil/raisin/xen-dir-remote/tools/firmware/hvmloader/../../../tools/include
    -U__XEN_TOOLS__
    -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
    -DENABLE_OVMF -DENABLE_ROMBIOS -DENABLE_SEABIOS  -c -o rombios.o rombios.c
    rombios.c: In function ‘rombios_load_roms’:
    rombios.c:103:39: error: ‘etherboot’ undeclared (first use in this function)
                                           etherboot);
    
    Disable rombios instead.
    
    Reported-by: Holger Schramm <lists@schramm.by>
    Signed-off-by: George Dunlap <george.dunlap@citrix.com>
    ---
    CC: Stefano Stabellini <stefano.stabellini@citrix.com>

diff --git a/components/xen b/components/xen
index 894d119..ea290aa 100644
--- a/components/xen
+++ b/components/xen
@@ -45,7 +45,7 @@  function xen_build() {
     export ETHERBOOT_NICS=""
     ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386 \
         --disable-stubdom --disable-qemu-traditional \
-        --enable-rombios $seabios_opt $ovmf_opt
+        --disable-rombios $seabios_opt $ovmf_opt
     $RAISIN_MAKE
     $RAISIN_MAKE install DESTDIR="$INST_DIR"
     unset ETHERBOOT_NICS