uninstall: do not remove kernels or modules on uninstall.

The pattern used is very broad and will delete any kernel with xen in
its filename, likewise modules, including those which come packages
from the distribution etc.

I don't think this was ever the right thing to do but it is doubly
wrong now that Xen does not even build or install a kernel by default.

Push cleanup of the installed hypervisor down into xen/Makefile so that
it can cleanup exactly what it actually installs.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Looks-good: Jan Beulich <JBeulich@suse.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Makefile b/Makefile
index 8c2c3652c754975064200a760f95cdf31089e457..d39e26f697bde54f25cd71422aa0039102edc7f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -220,6 +220,7 @@ help:
 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 -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent
@@ -228,8 +229,6 @@ uninstall:
        rm -f  $(D)$(SYSCONFIG_DIR)/xendomains
        rm -f  $(D)$(SYSCONFIG_DIR)/xencommons
        rm -rf $(D)/var/run/xen* $(D)/var/lib/xen*
-       rm -rf $(D)/boot/*xen*
-       rm -rf $(D)/lib/modules/*xen*
        rm -rf $(D)$(LIBDIR)/xen* $(D)$(BINDIR)/lomount
        rm -rf $(D)$(BINDIR)/cpuperf-perfcntr $(D)$(BINDIR)/cpuperf-xen
        rm -rf $(D)$(BINDIR)/xc_shadow

diff --git a/xen/Makefile b/xen/Makefile
index b1350344345cd8982bbe382c33bf997034eb7283..824f442700c46c73965e887692c5eb3b06e369e4 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -20,8 +20,8 @@ default: build
 .PHONY: dist
 dist: install
 
-.PHONY: build install clean distclean cscope TAGS tags MAP gtags
-build install debug clean distclean cscope TAGS tags MAP gtags::
+.PHONY: build install uninstall clean distclean cscope TAGS tags MAP gtags
+build install uninstall debug clean distclean cscope TAGS tags MAP gtags::
        $(MAKE) -f Rules.mk _$@
 
 .PHONY: _build
@@ -48,6 +48,21 @@ _install: $(TARGET).gz
                fi; \
        fi
 
+.PHONY: _uninstall
+_uninstall: D=$(DESTDIR)
+_uninstall: T=$(notdir $(TARGET))
+_uninstall:
+       rm -f $(D)/boot/$(T)-$(XEN_FULLVERSION).gz
+       rm -f $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).gz
+       rm -f $(D)/boot/$(T)-$(XEN_VERSION).gz
+       rm -f $(D)/boot/$(T).gz
+       rm -f $(D)/boot/$(T)-syms-$(XEN_FULLVERSION)
+       rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi
+       rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi
+       rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi
+       rm -f $(D)$(EFI_DIR)/$(T).efi
+       rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi
+
 .PHONY: _debug
 _debug:
        objdump -D -S $(TARGET)-syms > $(TARGET).s