Makefile: Some updates to uninstall

PATCH Superseded Fabio Fantoni 2 participants 4 messages Apr 16, 2012 – Apr 17, 2012 Kbuild

Share & tools

Fabio Fantoni

author

2012-04-16 11:45 UTC #0 lore raw

PATCH 1/1 Makefile: Some updates to uninstall

# HG changeset patch
# User Fabio Fantoni
# Date 1334565174 -7200
# Node ID a9c00a9b48c708a8e448bf5d9cd96026721fbf2f # Parent 6b72eb3b40cf2b3d5a6c75d68fa7093c57fc0d1f
Makefile: Some updates to uninstall

Signed-off-by Fabio Fantoni <[email protected]>

Makefile lun apr 16 10:32:54 2012 +0200 renamed from Makefile ven apr 13 17:13:01 2012 +0100 +0 -0

diff -r 6b72eb3b40cf -r a9c00a9b48c7 Makefile
@@ -220,13 +220,12 @@
 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/xend*
+ rm -rf $(D)$(CONFIG_DIR)/init.d/xen*

     rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent
     rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules
-    rm -f  $(D)$(CONFIG_DIR)/udev/xen-backend.rules
     rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules
-    rm -f  $(D)$(CONFIG_DIR)/udev/xend.rules
     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*
@@ -236,11 +235,16 @@
     rm -rf $(D)$(BINDIR)/pygrub
     rm -rf $(D)$(BINDIR)/setsize $(D)$(BINDIR)/tbctl
     rm -rf $(D)$(BINDIR)/xsls
-    rm -rf $(D)$(INCLUDEDIR)/xenctrl.h $(D)$(INCLUDEDIR)/xenguest.h
+    rm -rf $(D)$(BINDIR)/xenstore* $(D)$(BINDIR)/xentrace*
+    rm -rf $(D)$(BINDIR)/xen-detect $(D)$(BINDIR)/xencons
+    rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen
+    rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h
     rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h
     rm -rf $(D)$(INCLUDEDIR)/xen
+    rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl*
+    rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h
     rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
-    rm -rf $(D)$(LIBDIR)/libxenstore*
+    rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil*
     rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
     rm -rf $(D)$(LIBDIR)/xen/
     rm -rf $(D)$(LIBEXEC)/xen*
@@ -248,6 +252,7 @@
     rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm
     rm -rf $(D)$(SHAREDIR)/doc/xen
     rm -rf $(D)$(SHAREDIR)/xen
+    rm -rf $(D)$(SHAREDIR)/qemu-xen
     rm -rf $(D)$(MAN1DIR)/xen*
     rm -rf $(D)$(MAN8DIR)/xen*
     rm -rf $(D)/boot/tboot*

Signed-off-by Fabio Fantoni <[email protected]>

Makefile +10 -5

diff -r 6b72eb3b40cf -r a9c00a9b48c7 Makefile
@@ -220,13 +220,12 @@
 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/xend*
+	rm -rf $(D)$(CONFIG_DIR)/init.d/xen*
 	rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent
 	rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules
-	rm -f  $(D)$(CONFIG_DIR)/udev/xen-backend.rules
 	rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules
-	rm -f  $(D)$(CONFIG_DIR)/udev/xend.rules
 	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*

@@ -236,11 +235,16 @@
 	rm -rf $(D)$(BINDIR)/pygrub
 	rm -rf $(D)$(BINDIR)/setsize $(D)$(BINDIR)/tbctl
 	rm -rf $(D)$(BINDIR)/xsls
-	rm -rf $(D)$(INCLUDEDIR)/xenctrl.h $(D)$(INCLUDEDIR)/xenguest.h
+	rm -rf $(D)$(BINDIR)/xenstore* $(D)$(BINDIR)/xentrace*
+	rm -rf $(D)$(BINDIR)/xen-detect $(D)$(BINDIR)/xencons
+	rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen
+	rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h
 	rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h
 	rm -rf $(D)$(INCLUDEDIR)/xen
+	rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl*
+	rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h
 	rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
-	rm -rf $(D)$(LIBDIR)/libxenstore*
+	rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil*
 	rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
 	rm -rf $(D)$(LIBDIR)/xen/
 	rm -rf $(D)$(LIBEXEC)/xen*

@@ -248,6 +252,7 @@
 	rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm
 	rm -rf $(D)$(SHAREDIR)/doc/xen
 	rm -rf $(D)$(SHAREDIR)/xen
+	rm -rf $(D)$(SHAREDIR)/qemu-xen
 	rm -rf $(D)$(MAN1DIR)/xen*
 	rm -rf $(D)$(MAN8DIR)/xen*
 	rm -rf $(D)/boot/tboot*

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

Ian Campbell

2012-04-16 12:08 UTC #1 lore raw

Quoted 17 lines · Fabio Fantoni

# HG changeset patch
# User Fabio Fantoni
# Date 1334565174 -7200
# Node ID a9c00a9b48c708a8e448bf5d9cd96026721fbf2f # Parent 6b72eb3b40cf2b3d5a6c75d68fa7093c57fc0d1f
Makefile: Some updates to uninstall
Signed-off-by Fabio Fantoni <[email protected]>
diff -r 6b72eb3b40cf -r a9c00a9b48c7 Makefile
Makefile lun apr 16 10:32:54 2012 +0200 renamed from Makefile ven apr 13 17:13:01 2012 +0100 +0 -0
@@ -220,13 +220,12 @@
  uninstall: D=$(DESTDIR)
  uninstall:
      [ -d $(D)$(XEN_CONFIG_DIR) ] && mv -f $(D)$(XEN_CONFIG_DIR) 
$(D)$(XEN_CONFIG_DIR).old-date +%s || true

Makefile lun apr 16 10:32:54 2012 +0200

Quoted 2 lines

Makefile lun apr 16 10:32:54 2012 +0200 renamed from Makefile ven apr 13 17:13:01 2012 +0100 +1 -1
-    rm -rf $(D)$(CONFIG_DIR)/init.d/xend*
+    rm -rf $(D)$(CONFIG_DIR)/init.d/xen*

I know this is pre-existing but I'd rather see these enumerating all the actual possibilities without wildcards, so as to not remove any local initscripts which might happen to match (which becomes move likely with your removal of the "d")

Makefile lun apr 16 10:32:54 2012 +0200

Quoted 5 lines

      rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent
      rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules

Makefile lun apr 16 10:32:54 2012 +0200 renamed from Makefile ven apr 13 17:13:01 2012 +0100 +0 -2

-    rm -f  $(D)$(CONFIG_DIR)/udev/xen-backend.rules
      rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules
-    rm -f  $(D)$(CONFIG_DIR)/udev/xend.rules

These two are things older versions of Xen installed but which current versions do not?

Quoted 33 lines

      rm -f  $(D)$(SYSCONFIG_DIR)/xendomains

Makefile lun apr 16 10:32:54 2012 +0200 renamed from Makefile ven apr 13 17:13:01 2012 +0100 +9 -2

+    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*

@@ -236,11 +235,16 @@
      rm -rf $(D)$(BINDIR)/pygrub
      rm -rf $(D)$(BINDIR)/setsize $(D)$(BINDIR)/tbctl
      rm -rf $(D)$(BINDIR)/xsls
-    rm -rf $(D)$(INCLUDEDIR)/xenctrl.h $(D)$(INCLUDEDIR)/xenguest.h
+    rm -rf $(D)$(BINDIR)/xenstore* $(D)$(BINDIR)/xentrace*
+    rm -rf $(D)$(BINDIR)/xen-detect $(D)$(BINDIR)/xencons
+    rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen
+    rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h
      rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h
      rm -rf $(D)$(INCLUDEDIR)/xen
+    rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl*
+    rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h
      rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
-    rm -rf $(D)$(LIBDIR)/libxenstore*
+    rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil*
      rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
      rm -rf $(D)$(LIBDIR)/xen/
      rm -rf $(D)$(LIBEXEC)/xen*

@@ -248,6 +252,7 @@
      rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm
      rm -rf $(D)$(SHAREDIR)/doc/xen
      rm -rf $(D)$(SHAREDIR)/xen
+    rm -rf $(D)$(SHAREDIR)/qemu-xen
      rm -rf $(D)$(MAN1DIR)/xen*
      rm -rf $(D)$(MAN8DIR)/xen*
      rm -rf $(D)/boot/tboot*

Fantu

author

2012-04-17 14:30 UTC #2 lore raw

Ian Campbell-10 wrote

Quoted 10 lines

Makefile line 228

Quoted 6 lines

      rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent
      rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules

Makefile +0 -2

-    rm -f  $(D)$(CONFIG_DIR)/udev/xen-backend.rules
      rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules
-    rm -f  $(D)$(CONFIG_DIR)/udev/xend.rules

These two are things older versions of Xen installed but which current versions do not?

I not understand that.
Could you clarify me?

--
View this message in context: http://xen.1045712.n5.nabble.com/PATCH-Makefile-Some-updates-to-uninstall-tp5643579p5646707.html
Sent from the Xen - Dev mailing list archive at Nabble.com.

Ian Campbell

2012-04-17 14:38 UTC #3 lore raw

Quoted 8 lines · Fantu

Ian Campbell-10 wrote

Quoted 7 lines

Quoted 6 lines

      rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent
      rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules

Makefile +0 -2

-    rm -f  $(D)$(CONFIG_DIR)/udev/xen-backend.rules
      rm -f  $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules
-    rm -f  $(D)$(CONFIG_DIR)/udev/xend.rules

Quoted 5 lines

Quoted 3 lines
These two are things older versions of Xen installed but which current versions do not?
I not understand that.
Could you clarify me?

Why are we deleting them now (before your patch), where did they used to come from? If we no longer create them then it is fine (IMHO) to stop removing them.

Quoted 9 lines

--
View this message in context: http://xen.1045712.n5.nabble.com/PATCH-Makefile-Some-updates-to-uninstall-tp5643579p5646707.html
Sent from the Xen - Dev mailing list archive at Nabble.com.
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel