[build] Make the build use the pciutils headers/libs from buildroot, instead of the...

   This is accompanied by fixes to build.git and xen.git.

diff --git a/xen-hooks.mak b/xen-hooks.mak
index a9d5a0403167282599d2cecc3fbea177897ebec6..2b3ed91eaf4cb25bb76467270ad4ffbe703b3603 100644 (file)
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -51,7 +51,7 @@ endif
 ifdef CONFIG_STUBDOM
 CONFIG_PASSTHROUGH=1
 else
-  ifeq (,$(wildcard /usr/include/pci))
+  ifeq (,$(wildcard $(PCI_PREFIX_DIR)/usr/include/pci))
 $(warning *** pciutils-dev package not found - missing /usr/include/pci)
 $(warning *** PCI passthrough capability has been disabled)
   else
@@ -61,6 +61,9 @@ endif
 
 ifdef CONFIG_PASSTHROUGH
 OBJS+= pass-through.o pt-msi.o
+  ifdef PCI_PREFIX_DIR
+  LIBS += -L$(PCI_PREFIX_DIR)/usr/lib
+  endif
 LIBS += -lpci
 CFLAGS += -DCONFIG_PASSTHROUGH 
 $(info *** PCI passthrough capability has been enabled ***)

diff --git a/xen-setup b/xen-setup
index 8882c81dd47fefaa1eb7ff972f85b24ff96b439a..eaa6d3046fc746645ff626291c88701b43219737 100755 (executable)
--- a/xen-setup
+++ b/xen-setup
@@ -24,6 +24,8 @@ if [ "x$XEN_ROOT" != x ]; then
        echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak
 fi
 
+echo "PCI_PREFIX_DIR=${STAGING_ROOT}" >>config-host.mak
+
 ln -sf ../Makefile.target $target/Makefile
 ln -sf ../xen-config.mak $target/config.mak
 cat xen-config-host.mak >>config-host.mak