diff options
| author | Olaf Hering <olaf@aepfle.de> | 2014-10-01 18:41:03 +0200 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2014-10-06 15:50:54 +0100 |
| commit | 3df671ec2603e8700665b62a29afe93d40f78457 (patch) | |
| tree | 388a5833dfc45bbac062e7a28eee0e6fb3732923 | |
| parent | 22be8b121a668d8351cdc497c35dbe167fc1aec1 (diff) | |
tools: fix make uninstall
The uninstall target does not know about the paths it removes because
the toplevel Makefile does not include the required files.
Move the commands to tools/Makefile because all files come from subdirs
in tools/ anyway. Drop the removal of $(XEN_RUN_DIR) because it gets
created at runtime. Drop the removal of systemd related files because
the wildcard matches everything.
The proper fix is to remove the files and directories in the Makefiles
which install them. But this version is the least intrusive change at
this point.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | tools/Makefile | 9 |
2 files changed, 9 insertions, 12 deletions
@@ -232,19 +232,7 @@ help: .PHONY: uninstall uninstall: D=$(DESTDIR) uninstall: - [ -d $(D)$(XEN_CONFIG_DIR) ] && mv -f $(D)$(XEN_CONFIG_DIR) $(D)$(XEN_CONFIG_DIR).old-`date +%s` || true $(MAKE) -C xen uninstall - rm -rf $(D)$(CONFIG_DIR)/init.d/xendomains $(D)$(CONFIG_DIR)/init.d/xend - rm -rf $(D)$(CONFIG_DIR)/init.d/xencommons $(D)$(CONFIG_DIR)/init.d/xen-watchdog - rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules - rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules - rm -f $(D)$(SYSCONFIG_DIR)/xendomains - rm -f $(D)$(SBINDIR)/xendomains - rm -f $(D)$(SYSCONFIG_DIR)/xencommons - rm -f $(D)$(XEN_SYSTEMD_DIR)/*.service - rm -f $(D)$(XEN_SYSTEMD_DIR)/*.mount - rm -f $(D)$(XEN_SYSTEMD_MODULES_LOAD)/*.conf - rm -rf $(D)$(XEN_RUN_DIR)* $(D)/var/lib/xen* make -C tools uninstall rm -rf $(D)/boot/tboot* diff --git a/tools/Makefile b/tools/Makefile index 00f539ac2c..99e5694af8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -67,6 +67,15 @@ install: subdirs-install .PHONY: uninstall uninstall: D=$(DESTDIR) uninstall: + [ -d $(D)$(XEN_CONFIG_DIR) ] && mv -f $(D)$(XEN_CONFIG_DIR) $(D)$(XEN_CONFIG_DIR).old-`date +%s` || true + rm -rf $(D)$(CONFIG_DIR)/init.d/xendomains $(D)$(CONFIG_DIR)/init.d/xend + rm -rf $(D)$(CONFIG_DIR)/init.d/xencommons $(D)$(CONFIG_DIR)/init.d/xen-watchdog + rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules + rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules + rm -f $(D)$(SYSCONFIG_DIR)/xendomains + rm -f $(D)$(SBINDIR)/xendomains + rm -f $(D)$(SYSCONFIG_DIR)/xencommons + rm -rf $(D)/var/lib/xen* rm -rf $(D)$(BINDIR)/cpuperf-perfcntr $(D)$(BINDIR)/cpuperf-xen rm -rf $(D)$(BINDIR)/xc_shadow rm -rf $(D)$(BINDIR)/pygrub |