Author: tha-guest Date: 2006-02-18 22:55:21 +0000 (Sat, 18 Feb 2006) New Revision: 24 Removed: trunk/debian/patches/30rename-pae-hypervisor.dpatch Log: Guido found a better way to have the pae hypervisor installed with another name without patching upstream and it seems to work as good as the patched upstream version, so I removed my patch from svn again. There seems to be no need to just disable my patch. Deleted: trunk/debian/patches/30rename-pae-hypervisor.dpatch ==================================================================--- trunk/debian/patches/30rename-pae-hypervisor.dpatch 2006-02-18 22:36:52 UTC (rev 23) +++ trunk/debian/patches/30rename-pae-hypervisor.dpatch 2006-02-18 22:55:21 UTC (rev 24) @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30rename-pae-hypervisor.dpatch by Ralph Passgang <ralph@debianbase.de> -## -## All lines beginning with `## DP:'' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -Naur xen-3.0-testing.hg.old/xen/Makefile xen-3.0-testing.hg/xen/Makefile ---- xen-3.0-testing.hg.old/xen/Makefile 2006-02-16 23:44:09.000000000 +0100 -+++ xen-3.0-testing.hg/xen/Makefile 2006-02-18 17:05:59.803870888 +0100 -@@ -27,6 +27,13 @@ - - install: $(TARGET).gz - [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot -+ifeq ($(XEN_TARGET_X86_PAE),y) -+ $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))_pae-$(XEN_FULLVERSION).gz -+ ln -f -s $(notdir $(TARGET))_pae-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))_pae-$(XEN_VERSION).$(XEN_SUBVERSION).gz -+ ln -f -s $(notdir $(TARGET))_pae-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))_pae-$(XEN_VERSION).gz -+ ln -f -s $(notdir $(TARGET))_pae-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))_pae.gz -+ $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))_pae-syms-$(XEN_FULLVERSION) -+else - $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz -@@ -37,6 +44,7 @@ - $(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen - $(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io - $(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen -+endif - - clean: delete-unfresh-files - $(MAKE) -C tools clean
Guido Trotter
2006-Feb-18 23:36 UTC
[Pkg-xen-devel] Re: [Pkg-xen-changes] r24 - trunk/debian/patches
On Sat, Feb 18, 2006 at 10:55:22PM +0000, Ralph Passgang wrote: Hi,> Guido found a better way to have the pae hypervisor installed with > another name without patching upstream and it seems to work as good > as the patched upstream version, so I removed my patch from svn again. > There seems to be no need to just disable my patch. >Yeah, I preferred to just disable it, before, as I wanted you and the others to check & verify my way too, as I wasn't completely sure I hadn't missed something! And if I had just re-enabling it would hav been quicker. Guido PS What do people think of having messages to pkg-xen-changes set the reply-to to pkg-xen-devel? I'd find that useful as we often need to reply to changes...