Makefile/config: Add support for IEE1394 support.

To build it as part of the xtt, do:
 make libraw1394-install

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/linux.config b/linux.config
index 0d8a2162518fc4a714f9906705af01859c12818f..98cde3b15140ff04060db2177a6624075e7f0964 100644 (file)
--- a/linux.config
+++ b/linux.config
@@ -909,3 +909,6 @@ CONFIG_XEN_PVH=y
 CONFIG_DEBUG_VM=y
 # CONFIG_DEBUG_VIRTUAL is not set
 
+CONFIG_FIREWIRE=y
+CONFIG_FIREWIRE_OHCI=m
+

diff --git a/root_image/Makefile b/root_image/Makefile
index d1a8221626c0f083ad92065380a6f738ad7b5959..bac656b42f7fd2b7e0222987db71b7845f05caa2 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -993,6 +993,15 @@ qemu-install:
        $(MAKE) -C qemu -j$$(($(NCPUS) * 2)) V=1
        $(MAKE) -C qemu DESTDIR=$(shell pwd)/userspace/ install
 
+.PHONY:        libraw1394-install
+libraw1394-install:
+       if ! [ -e libraw1394/config.h ]; then (cd libraw1394; ./autogen.sh;./configure --prefix=/usr); fi
+       $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C libraw1394
+       $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C libraw1394 DESTDIR=$(CURDIR)/userspace install
+ifeq ($(RPM_ARCH), x86_64)
+       (cd userspace/usr$(LIBSDIR); ln -fs  ../lib/libraw1394.so.11)
+endif
+
 .PHONY:        root_image-tools-install
 root_image-tools-install: userspace-prep
 

diff --git a/sources.mk b/sources.mk
index 790325f277d45a35799de97986deee79821158f3..94921fcfce0e3623d6d091729cb15c7b00d6265f 100644 (file)
--- a/sources.mk
+++ b/sources.mk
@@ -1,6 +1,6 @@
 
 
-REPOS = syslinux root_image/busybox root_image/netperf root_image/pciutils root_image/fio root_image/RPMs root_image/pm-utils root_image/kexec-tools xen linux root_image/xenalyze
+REPOS = syslinux root_image/busybox root_image/netperf root_image/pciutils root_image/fio root_image/RPMs root_image/pm-utils root_image/kexec-tools xen linux root_image/xenalyze root_image/libraw1394
 
 include $(TOP)/scm.mk
 
@@ -43,3 +43,7 @@ $(eval $(call GIT_REPO,kexec-tools.git,root_image/kexec-tools))
 
 HG_URL=http://xenbits.xen.org/
 $(eval $(call HG_REPO,ext/xenalyze,root_image/xenalyze))
+
+GIT_URL=git://git.kernel.org/pub/scm/libs/ieee1394/
+$(eval $(call GIT_REPO,libraw1394.git,root_image/libraw1394))
+