mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools/hotplug: cleanup Makefiles
Remove "build" targets. Use simply expanded variables when recursively expanded variable aren't needed. (Use ":=" instead of "=".) Don't check if a directory already exist when installing, just create it. Fix $(HOTPLUGPATH), it shouldn't have any double-quote. Some reindentation. FreeBSD, "hotplugpath.sh" is already installed by common/. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
This commit is contained in:
Anthony PERARD authored and Jan Beulich committed
1 parent
2d696fc3d0
commit
290a9b91d9
5 files changed
+25
-43
No files matched your search
@@ -2,18 +2,15 @@ XEN_ROOT = $(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
# Xen script dir and scripts to go there.
|
||||
XEN_SCRIPTS = vif-bridge block
|
||||
XEN_SCRIPTS := vif-bridge block
|
||||
|
||||
XEN_SCRIPT_DATA =
|
||||
XEN_SCRIPT_DATA :=
|
||||
|
||||
XEN_RCD_PROG = rc.d/xencommons rc.d/xendriverdomain
|
||||
XEN_RCD_PROG := rc.d/xencommons rc.d/xendriverdomain
|
||||
|
||||
.PHONY: all
|
||||
all:
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
|
||||
.PHONY: install
|
||||
install: install-scripts install-rcd
|
||||
|
||||
@@ -44,12 +41,10 @@ install-rcd:
|
||||
do \
|
||||
$(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \
|
||||
done
|
||||
$(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(XEN_SCRIPT_DIR)
|
||||
|
||||
.PHONY: uninstall-rcd
|
||||
uninstall-rcd:
|
||||
rm -f $(addprefix $(DESTDIR)$(INITD_DIR)/, $(XEN_RCD_PROG))
|
||||
rm -f $(DESTDIR)$(XEN_SCRIPT_DIR)/hotplugpath.sh
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
|
||||
@@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
# Xen script dir and scripts to go there.
|
||||
XEN_SCRIPTS = vif-bridge
|
||||
XEN_SCRIPTS := vif-bridge
|
||||
XEN_SCRIPTS += vif-route
|
||||
XEN_SCRIPTS += vif-nat
|
||||
XEN_SCRIPTS += vif-openvswitch
|
||||
@@ -22,16 +22,13 @@ XEN_SCRIPTS += launch-xenstore
|
||||
|
||||
SUBDIRS-$(CONFIG_SYSTEMD) += systemd
|
||||
|
||||
XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh
|
||||
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
|
||||
|
||||
.PHONY: all
|
||||
all: subdirs-all
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
|
||||
.PHONY: install
|
||||
install: install-initd install-scripts subdirs-install
|
||||
|
||||
@@ -41,9 +38,9 @@ uninstall: uninstall-initd uninstall-scripts subdirs-uninstall
|
||||
# See docs/misc/distro_mapping.txt for INITD_DIR location
|
||||
.PHONY: install-initd
|
||||
install-initd:
|
||||
[ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
|
||||
[ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
|
||||
[ -d $(DESTDIR)$(LIBEXEC_BIN) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
|
||||
$(INSTALL_DATA) init.d/sysconfig.xendomains $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
|
||||
$(INSTALL_DATA) init.d/sysconfig.xencommons $(DESTDIR)$(SYSCONFIG_DIR)/xencommons
|
||||
$(INSTALL_PROG) xendomains $(DESTDIR)$(LIBEXEC_BIN)
|
||||
@@ -64,8 +61,7 @@ uninstall-initd:
|
||||
|
||||
.PHONY: install-scripts
|
||||
install-scripts:
|
||||
[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
|
||||
set -e; for i in $(XEN_SCRIPTS); \
|
||||
do \
|
||||
$(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
XEN_ROOT = $(CURDIR)/../../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
XEN_SYSTEMD_MODULES = xen.conf
|
||||
XEN_SYSTEMD_MODULES := xen.conf
|
||||
|
||||
XEN_SYSTEMD_MOUNT = proc-xen.mount
|
||||
XEN_SYSTEMD_MOUNT := proc-xen.mount
|
||||
XEN_SYSTEMD_MOUNT += var-lib-xenstored.mount
|
||||
|
||||
XEN_SYSTEMD_SERVICE = xenstored.service
|
||||
XEN_SYSTEMD_SERVICE := xenstored.service
|
||||
XEN_SYSTEMD_SERVICE += xenconsoled.service
|
||||
XEN_SYSTEMD_SERVICE += xen-qemu-dom0-disk-backend.service
|
||||
XEN_SYSTEMD_SERVICE += xendomains.service
|
||||
@@ -14,7 +14,7 @@ XEN_SYSTEMD_SERVICE += xen-watchdog.service
|
||||
XEN_SYSTEMD_SERVICE += xen-init-dom0.service
|
||||
XEN_SYSTEMD_SERVICE += xendriverdomain.service
|
||||
|
||||
ALL_XEN_SYSTEMD = $(XEN_SYSTEMD_MODULES) \
|
||||
ALL_XEN_SYSTEMD := $(XEN_SYSTEMD_MODULES) \
|
||||
$(XEN_SYSTEMD_MOUNT) \
|
||||
$(XEN_SYSTEMD_SERVICE)
|
||||
|
||||
@@ -30,10 +30,8 @@ distclean: clean
|
||||
|
||||
.PHONY: install
|
||||
install: $(ALL_XEN_SYSTEMD)
|
||||
[ -d $(DESTDIR)$(XEN_SYSTEMD_DIR) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR)
|
||||
[ -d $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD)
|
||||
$(INSTALL_DATA) *.service $(DESTDIR)$(XEN_SYSTEMD_DIR)
|
||||
$(INSTALL_DATA) *.mount $(DESTDIR)$(XEN_SYSTEMD_DIR)
|
||||
$(INSTALL_DATA) *.conf $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD)
|
||||
@@ -48,5 +46,5 @@ $(XEN_SYSTEMD_MODULES):
|
||||
rm -f $@.tmp
|
||||
for mod in $(LINUX_BACKEND_MODULES) ; do \
|
||||
echo $$mod ; \
|
||||
done > $@.tmp
|
||||
done > $@.tmp
|
||||
$(call move-if-changed,$@.tmp,$@)
|
||||
@@ -2,22 +2,19 @@ XEN_ROOT = $(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
# Xen script dir and scripts to go there.
|
||||
XEN_SCRIPTS =
|
||||
XEN_SCRIPTS :=
|
||||
XEN_SCRIPTS += locking.sh
|
||||
XEN_SCRIPTS += block
|
||||
XEN_SCRIPTS += vif-bridge
|
||||
XEN_SCRIPTS += vif-ip
|
||||
XEN_SCRIPTS += qemu-ifup
|
||||
|
||||
XEN_SCRIPT_DATA =
|
||||
XEN_RCD_PROG = rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain
|
||||
XEN_SCRIPT_DATA :=
|
||||
XEN_RCD_PROG := rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain
|
||||
|
||||
.PHONY: all
|
||||
all:
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
|
||||
.PHONY: install
|
||||
install: install-scripts install-rcd
|
||||
|
||||
|
||||
@@ -1,22 +1,19 @@
|
||||
XEN_ROOT = $(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
HOTPLUGPATH="hotplugpath.sh"
|
||||
HOTPLUGPATH := hotplugpath.sh
|
||||
|
||||
# OS-independent hotplug scripts go in this directory
|
||||
|
||||
# Xen scripts to go there.
|
||||
XEN_SCRIPTS =
|
||||
XEN_SCRIPT_DATA = $(HOTPLUGPATH)
|
||||
XEN_SCRIPTS :=
|
||||
XEN_SCRIPT_DATA := $(HOTPLUGPATH)
|
||||
|
||||
genpath-target = $(call buildmakevars2file,$(HOTPLUGPATH))
|
||||
$(eval $(genpath-target))
|
||||
|
||||
.PHONY: all
|
||||
all: build
|
||||
|
||||
.PHONY: build
|
||||
build: $(HOTPLUGPATH)
|
||||
all: $(HOTPLUGPATH)
|
||||
|
||||
.PHONY: install
|
||||
install: install-scripts
|
||||
@@ -25,9 +22,8 @@ install: install-scripts
|
||||
uninstall: uninstall-scripts
|
||||
|
||||
.PHONY: install-scripts
|
||||
install-scripts: build
|
||||
[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
|
||||
install-scripts: all
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
|
||||
set -e; for i in $(XEN_SCRIPTS); \
|
||||
do \
|
||||
$(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
|
||||
|
||||