fio: support it

diff --git a/root_image/Makefile b/root_image/Makefile
index 34322089066050eba2f57fdc98397ecaad586860..1533683e3f06a06bbfb09eeccf1ebd849cdbbe54 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -187,7 +187,7 @@ distdir:
 # This target includes all userspace tools and images
 # It does not include the Linux drivers/modules found in the modulespace target
 .PHONY:        root_image-userspace-install
-root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install
+root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install
 
        rm -rf userspace/man
        rm -rf userspace/usr/share/man
@@ -799,6 +799,14 @@ xtt-tools-install:
        $(INSTALL_PROG)   tools/iostat-2.2/iostat     userspace/usr/bin/
        $(INSTALL_PROG)   tools/debug/fb_test     userspace/usr/bin/
 
+fio/fio: fio/fio
+       $(MAKE) -C fio
+
+.PHONY: fio-install
+fio-install: fio/fio
+       $(call RPM_TO_USERSPACE,*libaio*,$(RPM_DIR)/libaio)
+       $(INSTALL_PROG)   fio/fio     userspace/usr/bin/
+
 .PHONY:        root_image-tools-install
 root_image-tools-install: userspace-prep
 

diff --git a/sources.mk b/sources.mk
index e3869be0466f0a7b1356ea763fdd19b40c61b807..da919e11fb2ccafa8495d75c312fd3ed04ba122d 100644 (file)
--- a/sources.mk
+++ b/sources.mk
@@ -1,8 +1,12 @@
 
 
-REPOS = syslinux root_image/busybox root_image/netperf root_image/pciutils root_image/RPMs xen linux
+REPOS = syslinux root_image/busybox root_image/netperf root_image/pciutils root_image/fio root_image/RPMs xen linux
 
 include $(TOP)/scm.mk
+
+GIT_URL=git://git.kernel.dk/
+$(eval $(call GIT_REPO,fio.git,root_image/fio))
+
 GIT_URL=git://xenbits.xensource.com/xentesttools/
 # Unroll those defines in real $-fetch labels..
 $(eval $(call GIT_REPO,syslinux.git,syslinux))