| Message ID | 1457978150-27201-15-git-send-email-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 14, 2016 at 05:55:49PM +0000, Anthony PERARD wrote: > ... to compile SeaBIOS and OVMF. Only depends on CONFIG_*. s/depends/depend/ > > If --with-system-* configure option is used, then set *_CONFIG=n to not > compile SEABIOS and OVMF. > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > > --- > Change in V4: > - change subject prefix > > Please, run ./autogen.sh on this patch. > --- > tools/configure.ac | 6 ++++-- > tools/firmware/Makefile | 8 -------- > 2 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/tools/configure.ac b/tools/configure.ac > index 7e5452e..ef306ae 100644 > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -212,12 +212,13 @@ AC_ARG_WITH([system-seabios], > AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@], > [Use system supplied seabios PATH instead of building and installing > our own version]),[ > + # Disable compilation of SeaBIOS. > + seabios=n > case $withval in > no) seabios_path= ;; > *) seabios_path=$withval ;; > esac > ],[]) > -AC_SUBST(seabios_path) > AC_DEFINE_UNQUOTED([SEABIOS_PATH], > ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"], > [SeaBIOS path]) > @@ -226,12 +227,13 @@ AC_ARG_WITH([system-ovmf], > AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@], > [Use system supplied OVMF PATH instead of building and installing > our own version]),[ > + # Disable compilation of OVMF. > + ovmf=n > case $withval in > no) ovmf_path= ;; > *) ovmf_path=$withval ;; > esac > ],[]) > -AC_SUBST(ovmf_path) > AC_DEFINE_UNQUOTED([OVMF_PATH], > ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], > [OVMF path]) > diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile > index 6a37758..4975cb4 100644 > --- a/tools/firmware/Makefile > +++ b/tools/firmware/Makefile > @@ -6,12 +6,8 @@ TARGET := hvmloader/hvmloader > INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) > > SUBDIRS-y := > -ifeq ($(OVMF_PATH),) > SUBDIRS-$(CONFIG_OVMF) += ovmf-dir > -endif > -ifeq ($(SEABIOS_PATH),) > SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir > -endif > SUBDIRS-$(CONFIG_ROMBIOS) += rombios > SUBDIRS-$(CONFIG_ROMBIOS) += vgabios > SUBDIRS-$(CONFIG_ROMBIOS) += etherboot > @@ -49,15 +45,11 @@ install: all > [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR) > [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR) > ifeq ($(CONFIG_SEABIOS),y) > -ifeq ($(SEABIOS_PATH),) > $(INSTALL_DATA) $(SEABIOS_ROM) $(INST_DIR)/seabios.bin > endif > -endif > ifeq ($(CONFIG_OVMF),y) > -ifeq ($(OVMF_PATH),) > $(INSTALL_DATA) $(OVMF_ROM) $(INST_DIR)/ovmf.bin > endif > -endif > > .PHONY: clean > clean: subdirs-clean > -- > Anthony PERARD > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
On Mon, Mar 14, 2016 at 05:55:49PM +0000, Anthony PERARD wrote: > ... to compile SeaBIOS and OVMF. Only depends on CONFIG_*. > > If --with-system-* configure option is used, then set *_CONFIG=n to not > compile SEABIOS and OVMF. > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > Acked-by: Wei Liu <wei.liu2@citrix.com>
diff --git a/tools/configure.ac b/tools/configure.ac index 7e5452e..ef306ae 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -212,12 +212,13 @@ AC_ARG_WITH([system-seabios], AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@], [Use system supplied seabios PATH instead of building and installing our own version]),[ + # Disable compilation of SeaBIOS. + seabios=n case $withval in no) seabios_path= ;; *) seabios_path=$withval ;; esac ],[]) -AC_SUBST(seabios_path) AC_DEFINE_UNQUOTED([SEABIOS_PATH], ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"], [SeaBIOS path]) @@ -226,12 +227,13 @@ AC_ARG_WITH([system-ovmf], AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@], [Use system supplied OVMF PATH instead of building and installing our own version]),[ + # Disable compilation of OVMF. + ovmf=n case $withval in no) ovmf_path= ;; *) ovmf_path=$withval ;; esac ],[]) -AC_SUBST(ovmf_path) AC_DEFINE_UNQUOTED([OVMF_PATH], ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], [OVMF path]) diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 6a37758..4975cb4 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -6,12 +6,8 @@ TARGET := hvmloader/hvmloader INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS-y := -ifeq ($(OVMF_PATH),) SUBDIRS-$(CONFIG_OVMF) += ovmf-dir -endif -ifeq ($(SEABIOS_PATH),) SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir -endif SUBDIRS-$(CONFIG_ROMBIOS) += rombios SUBDIRS-$(CONFIG_ROMBIOS) += vgabios SUBDIRS-$(CONFIG_ROMBIOS) += etherboot @@ -49,15 +45,11 @@ install: all [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR) [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR) ifeq ($(CONFIG_SEABIOS),y) -ifeq ($(SEABIOS_PATH),) $(INSTALL_DATA) $(SEABIOS_ROM) $(INST_DIR)/seabios.bin endif -endif ifeq ($(CONFIG_OVMF),y) -ifeq ($(OVMF_PATH),) $(INSTALL_DATA) $(OVMF_ROM) $(INST_DIR)/ovmf.bin endif -endif .PHONY: clean clean: subdirs-clean
... to compile SeaBIOS and OVMF. Only depends on CONFIG_*. If --with-system-* configure option is used, then set *_CONFIG=n to not compile SEABIOS and OVMF. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- Change in V4: - change subject prefix Please, run ./autogen.sh on this patch. --- tools/configure.ac | 6 ++++-- tools/firmware/Makefile | 8 -------- 2 files changed, 4 insertions(+), 10 deletions(-)