[Pkg-xen-changes] r765 - in trunk/xen: . debian debian/bin debian/patches

Bastian Blank waldi at alioth.debian.org
Fri May 28 10:57:24 UTC 2010


Author: waldi
Date: Fri May 28 10:57:12 2010
New Revision: 765

Log:
Merge /trunk/xen-3, 3.4.3-1 release.

* debian/changelog: Update.
* debian/patches/tools-blktap2-disable.patch: Remove.

Added:
   trunk/xen/debian/patches/tools-disable.diff
      - copied, changed from r763, trunk/xen-3/debian/patches/tools-disable.diff
   trunk/xen/debian/patches/tools-libxc-device.diff
      - copied, changed from r763, trunk/xen-3/debian/patches/tools-libxc-device.diff
Deleted:
   trunk/xen/debian/patches/config-ioemu-disable.diff
   trunk/xen/debian/patches/tools-blktap2-disable.patch
Modified:
   trunk/xen/   (props changed)
   trunk/xen/debian/bin/genorig.py
   trunk/xen/debian/changelog
   trunk/xen/debian/libxen-dev.install
   trunk/xen/debian/patches/series
   trunk/xen/debian/rules.defs

Modified: trunk/xen/debian/bin/genorig.py
==============================================================================
--- trunk/xen/debian/bin/genorig.py	Fri May 28 10:27:39 2010	(r764)
+++ trunk/xen/debian/bin/genorig.py	Fri May 28 10:57:12 2010	(r765)
@@ -24,7 +24,6 @@
         import tempfile
         self.dir = tempfile.mkdtemp(prefix = 'genorig', dir = 'debian')
         try:
-            self.do_update()
             self.do_version()
 
             self.orig_dir = "%s-%s" % (self.source, self.version)
@@ -36,15 +35,6 @@
         finally:
             shutil.rmtree(self.dir)
 
-    def do_update(self):
-        if not self.options.tag:
-            return
-
-        self.log('Updating to tag %s.\n' % self.options.tag)
-        p = subprocess.Popen(('hg', 'update', '-r', self.options.tag), cwd=self.repo)
-        if p.wait():
-            raise RuntimeError
-
     def do_version(self):
         if self.options.version:
             self.version = self.options.version
@@ -55,7 +45,7 @@
         self.log("Create archive.\n")
 
         arg_dir = os.path.join(os.path.realpath(self.dir), self.orig_dir)
-        args = ('hg', 'archive', arg_dir)
+        args = ('hg', 'archive', '-r', self.options.tag, arg_dir)
         p = subprocess.Popen(args, cwd=self.repo)
         if p.wait():
             raise RuntimeError
@@ -64,7 +54,7 @@
         self.log("Exporting changelog.\n")
 
         log = open("%s/%s/Changelog" % (self.dir, self.orig_dir), 'w')
-        args = ('hg', 'log')
+        args = ('hg', 'log', '-r', '%s:0' % self.options.tag)
         p = subprocess.Popen(args, cwd=self.repo, stdout=log)
         if p.wait():
             raise RuntimeError
@@ -82,7 +72,7 @@
 if __name__ == '__main__':
     from optparse import OptionParser
     p = OptionParser(prog=sys.argv[0], usage='%prog [OPTION]... DIR')
-    p.add_option("-t", "--tag", dest="tag")
+    p.add_option("-t", "--tag", dest="tag", default='tip')
     p.add_option("-v", "--version", dest="version")
     options, args = p.parse_args()
     if len(args) != 1:

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Fri May 28 10:27:39 2010	(r764)
+++ trunk/xen/debian/changelog	Fri May 28 10:57:12 2010	(r765)
@@ -1,3 +1,9 @@
+xen (4.0.0-1~experimental.2) UNRELEASED; urgency=low
+
+  * Merge changes from 3.4.3-1.
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 28 May 2010 12:42:22 +0200
+
 xen (4.0.0-1~experimental.1) experimental; urgency=low
 
   * New upstream version.
@@ -8,6 +14,23 @@
 
  -- Bastian Blank <waldi at debian.org>  Thu, 06 May 2010 15:47:38 +0200
 
+xen-3 (3.4.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Disable blktap support, it is unusable with current kernels.
+  * Disable libaio, was only used by blktap.
+  * Drop device creation support. (closes: #583283)
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 28 May 2010 11:43:18 +0200
+
+xen-3 (3.4.3~rc6-1) unstable; urgency=low
+
+  * New upstream release candidate.
+    - Relocate multiboot modules. (closes: #580045)
+    - Support grub2 in pygrub. (closes: #573311)
+
+ -- Bastian Blank <waldi at debian.org>  Sat, 08 May 2010 11:32:29 +0200
+
 xen-3 (3.4.3~rc3-2) unstable; urgency=low
 
   * Again list the complete version in the hypervisor.

Modified: trunk/xen/debian/libxen-dev.install
==============================================================================
--- trunk/xen/debian/libxen-dev.install	Fri May 28 10:27:39 2010	(r764)
+++ trunk/xen/debian/libxen-dev.install	Fri May 28 10:57:12 2010	(r765)
@@ -1,7 +1,5 @@
-usr/lib/libblktap.a
 usr/lib/{libxenctrl.a,libxenguest.a}
 usr/lib/libxenstore.{a,so}
-usr/include/blktaplib.h
 usr/include/{xenctrl.h,xenguest.h}
 usr/include/{xs.h,xs_lib.h}
 usr/include/xen

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Fri May 28 10:27:39 2010	(r764)
+++ trunk/xen/debian/patches/series	Fri May 28 10:57:12 2010	(r765)
@@ -38,8 +38,7 @@
 tools-python-xen-xm-relative-path.diff
 tools-misc-xend-startup.diff
 
-config-ioemu-disable.diff
-tools-blktap2-disable.patch
+tools-disable.diff
 
 tools-blktap-crypto.patch
 
@@ -48,3 +47,5 @@
 tools-xentrace-install.diff
 
 tools-python-shebang.diff
+
+tools-libxc-device.diff

Copied and modified: trunk/xen/debian/patches/tools-disable.diff (from r763, trunk/xen-3/debian/patches/tools-disable.diff)
==============================================================================
--- trunk/xen-3/debian/patches/tools-disable.diff	Fri May 28 09:43:44 2010	(r763, copy source)
+++ trunk/xen/debian/patches/tools-disable.diff	Fri May 28 10:57:12 2010	(r765)
@@ -1,15 +1,21 @@
 --- a/tools/Makefile
 +++ b/tools/Makefile
-@@ -19,12 +19,9 @@
+@@ -20,10 +20,7 @@
  SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
  SUBDIRS-$(VTPM_TOOLS) += vtpm
  SUBDIRS-y += xenstat
 -SUBDIRS-$(CONFIG_Linux) += libaio
+ SUBDIRS-$(CONFIG_Linux) += memshr 
 -SUBDIRS-$(CONFIG_Linux) += blktap
- SUBDIRS-y += libfsimage
+-SUBDIRS-$(CONFIG_Linux) += blktap2
+ SUBDIRS-$(CONFIG_NetBSD) += libaio
+ SUBDIRS-$(CONFIG_NetBSD) += blktap2
+ SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
+@@ -31,7 +28,6 @@
  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
  SUBDIRS-$(CONFIG_Linux) += fs-back
+ SUBDIRS-$(CONFIG_NetBSD) += fs-back
 -SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
  SUBDIRS-y += xenpmd
- 
- # These don't cross-compile
+ SUBDIRS-y += libxl
+ SUBDIRS-y += remus

Copied and modified: trunk/xen/debian/patches/tools-libxc-device.diff (from r763, trunk/xen-3/debian/patches/tools-libxc-device.diff)
==============================================================================
--- trunk/xen-3/debian/patches/tools-libxc-device.diff	Fri May 28 09:43:44 2010	(r763, copy source)
+++ trunk/xen/debian/patches/tools-libxc-device.diff	Fri May 28 10:57:12 2010	(r765)
@@ -1,7 +1,7 @@
-diff -r d11bdc25b36d tools/libxc/xc_linux.c
---- a/tools/libxc/xc_linux.c	Thu May 13 10:40:19 2010 +0100
-+++ b/tools/libxc/xc_linux.c	Thu May 27 18:24:03 2010 +0200
-@@ -167,97 +167,14 @@
+diff -r 370fd9f97c70 tools/libxc/xc_linux.c
+--- a/tools/libxc/xc_linux.c	Sat May 22 07:18:16 2010 +0100
++++ b/tools/libxc/xc_linux.c	Fri May 28 12:41:44 2010 +0200
+@@ -316,91 +316,14 @@
                        (unsigned long)hypercall);
  }
  
@@ -18,16 +18,10 @@
 -    if ( (fp = fopen(MTAB, "r")) == NULL )
 -        return -1;
 -
--    while ( fscanf(fp, "%*s %"
--                   STR(MAX_PATH)
--                   "s %"
--                   STR(MAX_PATH)
--                   "s %*s %*d %*d\n",
+-    while ( fscanf(fp, "%*s %"STR(MAX_PATH)"s %"STR(MAX_PATH)"s %*s %*d %*d\n",
 -                   sysfsdir, type) == 2 )
--    {
 -        if ( strncmp(type, "sysfs", 5) == 0 )
 -            break;
--    }
 -
 -    fclose(fp);
 -
@@ -92,28 +86,28 @@
      if ( (fd = open(EVTCHN_DEV_NAME, O_RDWR)) == -1 )
      {
 -        if ( (errno == ENOENT) &&
--            ((mkdir("/dev/xen", 0755) == 0) || (errno == EEXIST)) &&
+-             ((mkdir("/dev/xen", 0755) == 0) || (errno == EEXIST)) &&
 -             (mknod(EVTCHN_DEV_NAME, S_IFCHR|0600, devnum) == 0) )
 -            goto reopen;
 -
          PERROR("Could not open event channel interface");
          return -1;
      }
-@@ -380,25 +297,10 @@
+@@ -523,25 +446,10 @@
  
  int xc_gnttab_open(void)
  {
 -    struct stat st;
      int fd;
 -    int devnum;
-     
+ 
 -    devnum = xc_find_device_number("gntdev");
--    
+-
 -    /* Make sure any existing device file links to correct device. */
 -    if ( (lstat(GNTTAB_DEV_NAME, &st) != 0) || !S_ISCHR(st.st_mode) ||
 -         (st.st_rdev != devnum) )
 -        (void)unlink(GNTTAB_DEV_NAME);
--    
+-
 -reopen:
      if ( (fd = open(GNTTAB_DEV_NAME, O_RDWR)) == -1 )
      {
@@ -121,14 +115,14 @@
 -             ((mkdir("/dev/xen", 0755) == 0) || (errno == EEXIST)) &&
 -             (mknod(GNTTAB_DEV_NAME, S_IFCHR|0600, devnum) == 0) )
 -            goto reopen;
--        
+-
          PERROR("Could not open grant table interface");
          return -1;
      }
-diff -r d11bdc25b36d tools/libxc/xc_minios.c
---- a/tools/libxc/xc_minios.c	Thu May 13 10:40:19 2010 +0100
-+++ b/tools/libxc/xc_minios.c	Thu May 27 18:24:03 2010 +0200
-@@ -128,12 +128,6 @@
+diff -r 370fd9f97c70 tools/libxc/xc_minios.c
+--- a/tools/libxc/xc_minios.c	Sat May 22 07:18:16 2010 +0100
++++ b/tools/libxc/xc_minios.c	Fri May 28 12:41:44 2010 +0200
+@@ -152,12 +152,6 @@
      return call.result;
  }
  
@@ -141,10 +135,10 @@
  int xc_evtchn_open(void)
  {
      int fd = alloc_fd(FTYPE_EVTCHN), i;
-diff -r d11bdc25b36d tools/libxc/xenctrl.h
---- a/tools/libxc/xenctrl.h	Thu May 13 10:40:19 2010 +0100
-+++ b/tools/libxc/xenctrl.h	Thu May 27 18:24:03 2010 +0200
-@@ -96,16 +96,6 @@
+diff -r 370fd9f97c70 tools/libxc/xenctrl.h
+--- a/tools/libxc/xenctrl.h	Sat May 22 07:18:16 2010 +0100
++++ b/tools/libxc/xenctrl.h	Fri May 28 12:41:44 2010 +0200
+@@ -101,16 +101,6 @@
  int xc_interface_close(int xc_handle);
  
  /*

Modified: trunk/xen/debian/rules.defs
==============================================================================
--- trunk/xen/debian/rules.defs	Fri May 28 10:27:39 2010	(r764)
+++ trunk/xen/debian/rules.defs	Fri May 28 10:57:12 2010	(r765)
@@ -1,4 +1,4 @@
-KERNELVERSION := 2.6.32-4
+KERNELVERSION := 2.6.32-5
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates



More information about the Pkg-xen-changes mailing list