aboutsummaryrefslogtreecommitdiffstats
path: root/tools/hotplug
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2013-07-31 16:15:56 +0100
committerIan Campbell <ian.campbell@citrix.com>2013-08-20 15:35:00 +0100
commit76c66c689b8591a8d185586cdd8a1bbbf393ffb6 (patch)
tree0b4a12e0c4e604ee046aedaae3337865ad8fd9b3 /tools/hotplug
parent20fe0ae7c73f147bd39204d01d67149b6ee1b076 (diff)
downloadxen-76c66c689b8591a8d185586cdd8a1bbbf393ffb6.tar.gz
xen-76c66c689b8591a8d185586cdd8a1bbbf393ffb6.tar.bz2
xen-76c66c689b8591a8d185586cdd8a1bbbf393ffb6.zip
tools: disable blktap1 build by default
I don't think there are any dom0's around whose kernels support only blktap1 and not something newer like blktap2 or qdisk. Certainly not that you would want to run Xen 4.4 on. libxl will never use blktap1. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/hotplug')
-rw-r--r--tools/hotplug/Linux/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index b7737ab498..47655f691a 100644
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -18,11 +18,13 @@ XEN_SCRIPTS += vif2
XEN_SCRIPTS += vif-setup
XEN_SCRIPTS += block
XEN_SCRIPTS += block-enbd block-nbd
-XEN_SCRIPTS += blktap
+XEN_SCRIPTS-$(CONFIG_BLKTAP1) += blktap
XEN_SCRIPTS += xen-hotplug-cleanup
XEN_SCRIPTS += external-device-migrate
XEN_SCRIPTS += vscsi
XEN_SCRIPTS += block-iscsi
+XEN_SCRIPTS += $(XEN_SCRIPTS-y)
+
XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh
XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh
XEN_SCRIPT_DATA += block-common.sh