Re: [Xen-devel] [PATCH 17/21] stubdom: enable xenstored build

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Fri, 2012-01-20 at 20:47 +0000, Daniel De Graaf wrote:
> Signed-off-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
> ---
>  extras/mini-os/apps/xenstore.mk |    8 ++++++++
>  stubdom/Makefile                |   29 ++++++++++++++++++++++++++---
>  2 files changed, 34 insertions(+), 3 deletions(-)
>  create mode 100644 extras/mini-os/apps/xenstore.mk
> 
> diff --git a/extras/mini-os/apps/xenstore.mk b/extras/mini-os/apps/xenstore.mk
> new file mode 100644
> index 0000000..26ff9a6
> --- /dev/null
> +++ b/extras/mini-os/apps/xenstore.mk
> @@ -0,0 +1,8 @@
> +CONFIG_BLKFRONT=n
> +CONFIG_NETFRONT=n
> +CONFIG_FBFRONT=n
> +CONFIG_KBDFRONT=n
> +CONFIG_XENBUS=n

I see now why you added this possibility.

> +
> +lwip=n
> +DEF_CPPFLAGS := $(filter-out -DHAVE_LWIP,$(DEF_CPPFLAGS))
> diff --git a/stubdom/Makefile b/stubdom/Makefile
> index 7989f31..0718e50 100644
> --- a/stubdom/Makefile
> +++ b/stubdom/Makefile
> @@ -74,14 +74,14 @@ TARGET_CPPFLAGS += -I$(XEN_ROOT)/xen/include
>  
>  TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib
>  
> -TARGETS=ioemu c caml grub
> +TARGETS=ioemu c caml grub xenstore
>  
>  CROSS_MAKE := $(MAKE) DESTDIR=
>  
>  .PHONY: all
>  all: build
>  ifeq ($(STUBDOM_SUPPORTED),1)
> -build: genpath ioemu-stubdom c-stubdom pv-grub
> +build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom
>  else
>  build: genpath
>  endif
> @@ -262,6 +262,11 @@ mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
>         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.c . && \
>         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.h . && \
>         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/Makefile . )
> +     mkdir -p xenstore
> +     [ -h xenstore/Makefile ] || ( cd xenstore && \
> +       ln -sf $(XEN_ROOT)/tools/xenstore/*.c . && \
> +       ln -sf $(XEN_ROOT)/tools/xenstore/*.h . && \
> +       ln -sf $(XEN_ROOT)/tools/xenstore/Makefile . )
>       $(CROSS_MAKE) -C $(MINI_OS) links
>       touch mk-headers-$(XEN_TARGET_ARCH)
>  
> @@ -334,6 +339,14 @@ grub: grub-upstream $(CROSS_ROOT)
>       mkdir -p grub-$(XEN_TARGET_ARCH)
>       CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(CROSS_MAKE) 
> -C $@ OBJ_DIR=$(CURDIR)/grub-$(XEN_TARGET_ARCH)
>  
> +##########
> +# xenstore
> +##########
> +
> +.PHONY: xenstore
> +xenstore: $(CROSS_ROOT)
> +     CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(CROSS_MAKE) 
> -C $@ LWIPDIR=$(CURDIR)/lwip xenstored.a CONFIG_STUBDOM=y
> +
>  ########
>  # minios
>  ########
> @@ -355,12 +368,16 @@ c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c 
> lwip-$(XEN_TARGET_ARCH) libxc c
>  pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxc grub
>       DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" 
> DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_APP=grub $(CROSS_MAKE) -C $(MINI_OS) 
> OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a
>  
> +.PHONY: xenstore-stubdom
> +xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore
> +     DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" 
> DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_APP=xenstore $(CROSS_MAKE) -C 
> $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) 
> APP_OBJS=$(CURDIR)/xenstore/xenstored.a
> +
>  #########
>  # install
>  #########
>  
>  ifeq ($(STUBDOM_SUPPORTED),1)
> -install: genpath install-readme install-ioemu install-grub
> +install: genpath install-readme install-ioemu install-grub install-xenstore
>  else
>  install: genpath
>  endif
> @@ -379,6 +396,10 @@ install-grub: pv-grub
>       $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
>       $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz 
> "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz"
>  
> +install-xenstore: xenstore-stubdom
> +     $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot"
> +     $(INSTALL_PROG) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz 
> "$(DESTDIR)/usr/lib/xen/boot/xenstore-stubdom.gz"
> +
>  #######
>  # clean
>  #######
> @@ -390,12 +411,14 @@ clean:
>       rm -fr mini-os-$(XEN_TARGET_ARCH)-c
>       rm -fr mini-os-$(XEN_TARGET_ARCH)-caml
>       rm -fr mini-os-$(XEN_TARGET_ARCH)-grub
> +     rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
>       $(CROSS_MAKE) -C caml clean
>       $(CROSS_MAKE) -C c clean
>       rm -fr grub-$(XEN_TARGET_ARCH)
>       rm -f $(STUBDOMPATH)
>       [ ! -d libxc-$(XEN_TARGET_ARCH) ] || $(CROSS_MAKE) -C 
> libxc-$(XEN_TARGET_ARCH) clean
>       -[ ! -d ioemu ] || $(CROSS_MAKE) -C ioemu clean
> +     -[ ! -d xenstore ] || $(CROSS_MAKE) -C xenstore clean
>  
>  # clean the cross-compilation result
>  .PHONY: crossclean



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel