diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-07-31 16:15:50 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-08-20 15:33:54 +0100 |
| commit | 03145f0fe42c007834c1ef50d95fe6c4f58a326a (patch) | |
| tree | 83b0a7896a8de2e13237ce33b43a625f0472dd98 /tools/hotplug | |
| parent | 9af42f3598ba6f4b38384fdd2038c30f7ec763b9 (diff) | |
| download | xen-03145f0fe42c007834c1ef50d95fe6c4f58a326a.tar.gz xen-03145f0fe42c007834c1ef50d95fe6c4f58a326a.tar.bz2 xen-03145f0fe42c007834c1ef50d95fe6c4f58a326a.zip | |
tools: make building xend configurable.
xend has been deprecated for 2 releases now. Lets make it possible to not even
build it.
For now I'm leaving the default of on but I would like to change that before
the 4.4 release.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Matt Wilson <msw@amazon.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/hotplug')
| -rw-r--r-- | tools/hotplug/Linux/Makefile | 5 | ||||
| -rw-r--r-- | tools/hotplug/NetBSD/Makefile | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 8b0d7f4dda..b7737ab498 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -28,7 +28,8 @@ XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA += block-common.sh UDEV_RULES_DIR = $(CONFIG_DIR)/udev -UDEV_RULES = xen-backend.rules xend.rules +UDEV_RULES-$(CONFIG_XEND) = xend.rules +UDEV_RULES = xen-backend.rules $(UDEV_RULES-y) .PHONY: all all: @@ -44,7 +45,9 @@ install: all install-initd install-scripts install-udev install-initd: [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) +ifeq ($(CONFIG_XEND),y) $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(INITD_DIR) +endif $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR) $(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 2ae5a34ebc..3d7f2222c9 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -8,7 +8,8 @@ XEN_SCRIPTS += vif-bridge XEN_SCRIPTS += vif-ip XEN_SCRIPT_DATA = -XEN_RCD_PROG = rc.d/xencommons rc.d/xend rc.d/xendomains rc.d/xen-watchdog +XEN_RCD_PROG-$(CONFIG_XEND) = rc.d/xend +XEN_RCD_PROG = rc.d/xencommons $(XEN_RCD_PROG-y) rc.d/xendomains rc.d/xen-watchdog .PHONY: all all: |