Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and libxc public headers to include subdir

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Thu, 7 Aug 2014, Ian Jackson wrote:
> Stefano Stabellini writes ("Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and 
> libxc public headers to include subdir"):
> > I needed to make a couple of more libxc to libxc/include substitutions
> > under tools/ocaml.
> > The appended patch should work.
> > I have also pushed:
> > 
> > git://xenbits.xen.org/people/sstabellini/xen-unstable.git public_headers_v5
> 
> It seems that the 32-bit stubdom build is still broken:
> 
> In file included from xc_core.c:64:0:
> xg_private.h:30:21: fatal error: xenctrl.h: No such file or directory

Somehow I missed this email until today.

I modified the stubdom and mini-os Makefiles (below is the incremental
diff):


diff --git a/extras/mini-os/Config.mk b/extras/mini-os/Config.mk
index d61877b..4852443 100644
--- a/extras/mini-os/Config.mk
+++ b/extras/mini-os/Config.mk
@@ -46,7 +46,7 @@ DEF_CPPFLAGS += -D__MINIOS__
 ifeq ($(libc),y)
 DEF_CPPFLAGS += -DHAVE_LIBC
 DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include/posix
-DEF_CPPFLAGS += -isystem $(XEN_ROOT)/tools/xenstore
+DEF_CPPFLAGS += -isystem $(XEN_ROOT)/tools/xenstore/include
 endif
 
 ifneq ($(LWIPDIR),)
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 6bea68b..ffebc0d 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -306,12 +306,14 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET)
        mkdir -p libxc-$(XEN_TARGET_ARCH)
        [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd 
libxc-$(XEN_TARGET_ARCH) && \
          ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \
+         ln -sf $(XEN_ROOT)/tools/libxc/include/*.h . && \
          ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \
          ln -sf $(XEN_ROOT)/tools/libxc/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/include/*.h . && \
          ln -sf $(XEN_ROOT)/tools/xenstore/Makefile . )
        $(MAKE) DESTDIR= -C $(MINI_OS) links
        touch mk-headers-$(XEN_TARGET_ARCH)
diff --git a/stubdom/grub/Makefile b/stubdom/grub/Makefile
index 6bd2c4c..934cc4c 100644
--- a/stubdom/grub/Makefile
+++ b/stubdom/grub/Makefile
@@ -5,7 +5,7 @@ vpath %.c ../grub-upstream
 
 BOOT=$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o
 
-DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc -I$(XEN_ROOT)/tools/include -I.
+DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include -I$(XEN_ROOT)/tools/include 
-I.
 DEF_CPPFLAGS += -I../grub-upstream/stage1
 DEF_CPPFLAGS += -I../grub-upstream/stage2
 DEF_CPPFLAGS += -I../grub-upstream/netboot


I have also pushed everything:

git://xenbits.xen.org/people/sstabellini/xen-unstable.git public_headers_v6

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel