[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Support for Natty and Wheezy in xen-tools for Squeeze?



Mehdi Dogguy wrote:
> > Attached the debdiff. I don't expect any further changes for 4.2 (and
> > therefore 4.2-1) except in changelogs, documentation, and source code
> > comments.
> 
> The attachement is missing.

Fsck. I knew this would happen again. Thanks for the hint. Hopefully
attached now. ;-)

		Regards, Axel
-- 
 ,''`.  |  Axel Beckert <abe@debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE
  `-    |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5
diff -Nru xen-tools-4.2~rc1/bin/xen-create-image xen-tools-4.2/bin/xen-create-image
--- xen-tools-4.2~rc1/bin/xen-create-image	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xen-create-image	2010-09-21 16:13:40.000000000 +0200
@@ -801,7 +801,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 #
@@ -1346,17 +1346,17 @@
     $CONFIG{ 'mirror' }        = '';
 
     # Initialize per distribution mirror defaults: Debian
-    foreach my $debdist (qw(etch lenny squeeze sid testing stable unstable)) {
+    foreach my $debdist (qw(lenny squeeze wheezy sid testing stable unstable)) {
         $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
     }
-    foreach my $debdist (qw(sarge)) {
+    foreach my $debdist (qw(sarge etch)) {
         $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
     }
     # Initialize per distribution mirror defaults: Ubuntu
-    foreach my $ubuntudist (qw(dapper hardy intrepid jaunty karmic lucid maverick)) {
+    foreach my $ubuntudist (qw(dapper hardy jaunty karmic lucid maverick natty)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
     }
-    foreach my $ubuntudist (qw(edgy feisty gutsy)) {
+    foreach my $ubuntudist (qw(edgy feisty gutsy intrepid)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
     }
     $CONFIG{ 'arch' }          = '';
@@ -1544,8 +1544,8 @@
             message => "must be an existing directory.\n",
         },
         serialDev => {
-            check   => qr/^(?:\/dev\/)?(?:tty|hvc)[0-9]+$/,
-            message => "must be a serial device (tty*, hvc*).\n",
+            check   => qr/^(?:\/dev\/)?(?:tty|[xh]vc)[0-9]+$/,
+            message => "must be a serial device (tty*, hvc* or xvc*).\n",
         },
         diskDev => {
             check   => qr/^(?:\/dev\/)?(?:tty|hvc)[0-9]+$/,
@@ -1902,9 +1902,9 @@
     }
 
     #
-    #  Lucid doesn't work without pygrub
+    #  Lucid and probably all later Ubuntus, too, don't work without pygrub
     #
-    if ( $CONFIG{ 'dist' } =~ /lucid|maverick/ )
+    if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty/ )
     {
         $CONFIG{ 'pygrub' } = 1;
     }
@@ -2106,11 +2106,21 @@
         exit 127;
     }
 
-    if ( $CONFIG{ 'image-dev' } && $CONFIG{ 'partitions' } )
+    if ( $CONFIG{ 'image-dev' } )
     {
-        logprint("Please choose either image-dev or partitions, not both!\n");
-        $FAIL = 1;
-        exit 127;
+        if ( $CONFIG{ 'partitions' } )
+        {
+            logprint("Please choose either image-dev or partitions, not both!\n");
+            $FAIL = 1;
+            exit 127;
+        }
+
+        if ( !$CONFIG{ 'swap-dev' } && !$CONFIG{ 'noswap' } )
+        {
+            logprint("Please choose swap-dev or noswap with image-dev!\n");
+            $FAIL = 1;
+            exit 127;
+        }
     }
 
 
diff -Nru xen-tools-4.2~rc1/bin/xen-create-nfs xen-tools-4.2/bin/xen-create-nfs
--- xen-tools-4.2~rc1/bin/xen-create-nfs	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xen-create-nfs	2010-09-21 16:13:40.000000000 +0200
@@ -131,7 +131,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 # store version number away.
diff -Nru xen-tools-4.2~rc1/bin/xen-delete-image xen-tools-4.2/bin/xen-delete-image
--- xen-tools-4.2~rc1/bin/xen-delete-image	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xen-delete-image	2010-09-21 16:13:40.000000000 +0200
@@ -170,7 +170,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 
diff -Nru xen-tools-4.2~rc1/bin/xen-list-images xen-tools-4.2/bin/xen-list-images
--- xen-tools-4.2~rc1/bin/xen-list-images	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xen-list-images	2010-09-21 16:13:40.000000000 +0200
@@ -102,7 +102,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 
diff -Nru xen-tools-4.2~rc1/bin/xen-resize-guest xen-tools-4.2/bin/xen-resize-guest
--- xen-tools-4.2~rc1/bin/xen-resize-guest	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xen-resize-guest	2010-09-21 16:13:40.000000000 +0200
@@ -116,7 +116,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 
diff -Nru xen-tools-4.2~rc1/bin/xen-update-image xen-tools-4.2/bin/xen-update-image
--- xen-tools-4.2~rc1/bin/xen-update-image	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xen-update-image	2010-09-21 16:13:40.000000000 +0200
@@ -121,7 +121,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 #
diff -Nru xen-tools-4.2~rc1/bin/xt-create-xen-config xen-tools-4.2/bin/xt-create-xen-config
--- xen-tools-4.2~rc1/bin/xt-create-xen-config	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xt-create-xen-config	2010-09-21 16:13:40.000000000 +0200
@@ -157,7 +157,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 
diff -Nru xen-tools-4.2~rc1/bin/xt-customize-image xen-tools-4.2/bin/xt-customize-image
--- xen-tools-4.2~rc1/bin/xt-customize-image	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xt-customize-image	2010-09-21 16:13:40.000000000 +0200
@@ -97,7 +97,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 
diff -Nru xen-tools-4.2~rc1/bin/xt-guess-suite-and-mirror xen-tools-4.2/bin/xt-guess-suite-and-mirror
--- xen-tools-4.2~rc1/bin/xt-guess-suite-and-mirror	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xt-guess-suite-and-mirror	2010-09-21 16:13:40.000000000 +0200
@@ -78,7 +78,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 # Init
 my $mirror = '';
diff -Nru xen-tools-4.2~rc1/bin/xt-install-image xen-tools-4.2/bin/xt-install-image
--- xen-tools-4.2~rc1/bin/xt-install-image	2010-08-15 19:00:54.000000000 +0200
+++ xen-tools-4.2/bin/xt-install-image	2010-09-21 16:13:40.000000000 +0200
@@ -116,7 +116,7 @@
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2';
 
 
 #
diff -Nru xen-tools-4.2~rc1/ChangeLog xen-tools-4.2/ChangeLog
--- xen-tools-4.2~rc1/ChangeLog	2010-09-22 13:27:05.000000000 +0200
+++ xen-tools-4.2/ChangeLog	2010-09-21 16:13:40.000000000 +0200
@@ -1,3 +1,142 @@
+commit 5a0964d32e16b57162a1ca395ec2dc56692a4b81
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 21 14:54:09 2010 +0200
+
+    TODO: I want to introduce Perl::Critic for the xen-tools developement
+
+commit 6414247eca9e4bd3c39a5429bf1b3f144a29791f
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 21 14:53:31 2010 +0200
+
+    Update TODO categories
+    
+    It's quite clear that there won't be any big changes to 4.2 anymore
+
+commit 53599dd64b10ed5512586d07e0bec60ad13bf284
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 21 14:37:32 2010 +0200
+
+    Also add Natty and Wheezy to README
+
+commit 35a8ed530b09e2d75e2b3749696f7a09faa043a6
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 21 14:29:14 2010 +0200
+
+    Fix debian/changelog entry
+    
+    rc -> release, package build -> debian package build
+
+commit 17f6bd30a1bd4f4426630845e901a1153e6b44ad
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 21 14:26:42 2010 +0200
+
+    Switch default mirror for EoL'ed Ubuntu 8.10 (Intrepid) and Debian 4.0 (Etch) to the distributions' archives for old releases
+
+commit 8fca20d4d8af779f2f26e13356df813b81b62239
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 21 14:16:58 2010 +0200
+
+    Preliminary support for Ubuntu 11.04 (Natty) and Debian 7.0 (Wheezy)
+
+commit 2c0f824f4cc8837d4ddd334d10a0cc87e652b506
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 21 13:57:30 2010 +0200
+
+    Add bugfix in last commit to debian/changelog
+
+commit 5f49bddca5f5cc0e7cd4772cf5efa479d5718135
+Author: Jorge Armando Medina <jmedina@e-compugraf.com>
+Date:   Tue Sep 21 13:33:49 2010 +0200
+
+    xen-create-image: allow xvc0 in --serial_device option.
+
+commit e80568ec17969ac67bd470641d7457a03e336d10
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Mon Sep 13 14:46:33 2010 +0200
+
+    Prepare 4.2 release
+
+commit d8f8d6c8169a03f074cfc80fba9b07dc725096b2
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Mon Sep 13 14:38:50 2010 +0200
+
+    Reformat README file, update authors
+
+commit 9d3f09b50d8d96cfacb106b8b0cccd123e71f0c0
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Mon Sep 13 14:37:11 2010 +0200
+
+    Document more clearly how to build the package from a git working copy.
+
+commit 5d51730054c0b677e666179dfb00306e7dbecf77
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Thu Sep 9 12:21:21 2010 +0200
+
+    Updates examples in xen-tools.conf to better reflect current state
+
+commit 94de43cf549f20c9590ea8ded33498f2afc0e26e
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Wed Sep 8 23:34:50 2010 +0200
+
+    make install: Fix broken reinstallation by removing all /usr/lib/xen-tools/*.d symlinks before creating new ones.
+    
+    Thanks to Roland Giesler for noticing and reporting this bug.
+
+commit 397299ed0ad1eafdfa088973c343adb8eedc440e
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 7 02:03:42 2010 +0200
+
+    Mention last commit/revert in the debian/changelog as it fixes a bug reported via Debian BTS
+
+commit bc811daa17bec6e2e2a8446a5cab574f44fe3ebe
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Sep 7 01:55:25 2010 +0200
+
+    Revert "Generate ChangeLog during package build"
+    
+    This reverts commit 0cb518bc5af166b9a221bc5780f323a563158779 and fixes
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=595883
+    
+    The changelog MUST not be generated during the Debian package build as
+    it relies on a checked out copy of the VCS repository -- what the
+    Debian package isn't. The Debian (and any other packaging) gets the
+    changelog from our tar.gz balls.
+    
+    We will have to fix the issue, which the reverted commit tried to fix,
+    differently.
+
+commit fd8f94935a8b6e9ef8942b536ae3ea05d3d43050
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Tue Aug 31 00:58:54 2010 +0200
+
+    Bump version number to 4.2 RC2 (may become 4.2 "final").
+    
+    Start new debian/changelog entry, mention Dmitry's fix for #484652.
+
+commit 1e8b4d57c6dede21ed76185678ea08c8cba4fd4a
+Author: Dmitry Nedospasov <dmitry@nedos.net>
+Date:   Mon Aug 30 22:34:31 2010 +0200
+
+    Fixed Debian Bug 484652, minor formating
+
+commit 80d002d8a81e50b8880076fe80b45b82a8b4af4e
+Author: Dmitry Nedospasov <dmitry@nedos.net>
+Date:   Mon Aug 30 22:23:58 2010 +0200
+
+    swap-dev or noswap must be set with image-dev
+
+commit 8189d013bc739404aedf86b24f096647a9b77773
+Author: Dmitry Nedospasov <dmitry@nedos.net>
+Date:   Mon Aug 30 19:44:10 2010 +0200
+
+    Added TODO
+
+commit 2d84d9c6819624af32a0a8c0d53df6a195bdff4a
+Author: Axel Beckert <abe@deuxchevaux.org>
+Date:   Wed Aug 25 15:05:20 2010 +0200
+
+    TODO: Refactor the code for less variants of calling cp, rm, mv, etc.
+
 commit f65d79851c249900c323c1493383ab03f9ce3aa6
 Author: Axel Beckert <abe@deuxchevaux.org>
 Date:   Sun Aug 15 19:37:52 2010 +0200
diff -Nru xen-tools-4.2~rc1/debian/changelog xen-tools-4.2/debian/changelog
--- xen-tools-4.2~rc1/debian/changelog	2010-09-22 13:27:05.000000000 +0200
+++ xen-tools-4.2/debian/changelog	2010-09-22 13:27:06.000000000 +0200
@@ -1,3 +1,25 @@
+xen-tools (4.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - Fixes several cases of broken or incomplete config files with
+      unexpected or seldom parameter combinations. (Closes: #484652)
+    - Updates examples in /etc/xen-tools.conf to better reflect current
+      state
+    - Allows usage of xvc* as serial console as used as default by older
+      Xen versions.
+    - Preliminary support for Ubuntu 11.04 (Natty) and Debian 7.0 (Wheezy)
+      (Closes: #597521)
+    - Switches default mirror for EoL'ed Ubuntu 8.10 (Intrepid) and Debian
+      4.0 (Etch) to the distributions' archives for old releases.
+  * Does no more try extract the upstream changelog during debian package
+    build. The commit which introduced this problem has been reverted.
+    Document more clearly in debian/README.source how to build the package
+    from a checked out copy of the git repository, especially that the
+    upstream changelog has to be generated first out of the VCS log.
+    (Closes: #595883)
+
+ -- Axel Beckert <abe@debian.org>  Tue, 21 Sep 2010 14:27:44 +0200
+
 xen-tools (4.2~rc1-1) unstable; urgency=low
 
   [Axel Beckert]
diff -Nru xen-tools-4.2~rc1/debian/README.source xen-tools-4.2/debian/README.source
--- xen-tools-4.2~rc1/debian/README.source	2010-09-22 13:27:05.000000000 +0200
+++ xen-tools-4.2/debian/README.source	2010-09-22 13:27:06.000000000 +0200
@@ -9,6 +9,7 @@
 
 If you just want to build the binary package, run
 
+$ make changelog
 $ dpkg-buildpackage -uc -us -b
 
 If you want to build source and binary packages, e.g. for an upload to
@@ -18,4 +19,4 @@
 $ dpkg-buildpackage
 
 
- -- Axel Beckert <abe@debian.org>, Mon, 17 May 2010 13:31:31 +0200
+ -- Axel Beckert <abe@debian.org>, Mon, 13 Sep 2010 14:30:05 +0200
diff -Nru xen-tools-4.2~rc1/debian/rules xen-tools-4.2/debian/rules
--- xen-tools-4.2~rc1/debian/rules	2010-09-22 13:27:05.000000000 +0200
+++ xen-tools-4.2/debian/rules	2010-09-22 13:27:06.000000000 +0200
@@ -28,7 +28,6 @@
 	dh_prep
 
 	make manpages
-	make changelog
 	make install prefix=`pwd`/debian/xen-tools
 
 	dh_installdirs
diff -Nru xen-tools-4.2~rc1/etc/xen-tools.conf xen-tools-4.2/etc/xen-tools.conf
--- xen-tools-4.2~rc1/etc/xen-tools.conf	2010-08-15 19:00:55.000000000 +0200
+++ xen-tools-4.2/etc/xen-tools.conf	2010-09-21 16:13:40.000000000 +0200
@@ -134,20 +134,9 @@
 image  = sparse   # Specify sparse vs. full disk images.
 
 #
-#  Currently supported and tested distributions include:
-#
-# via Debootstrap:
-#
-#  Debian:
-#   sid, sarge, etch, lenny.
-#
-#  Ubuntu:
-#   edgy, feisty, dapper.
-#
-# via Rinse:
-#   centos-4, centos-5.
-#   fedora-core-4, fedora-core-5, fedora-core-6, fedora-core-7
-#
+#  See the README for currently supported and tested distributions. You can
+# either find it in the root directory of the unpacked source or, on Debian
+# and Ubuntu based systems, in /usr/share/doc/xen-tools/README.gz
 #
 
 
@@ -273,18 +262,21 @@
 # http://wiki.debian.org/DebianGeoMirror):
 #
 # mirror_sarge = http://archive.debian.org/debian
+# mirror_etch = http://archive.debian.org/debian
 # mirror_lenny = http://cdn.debian.net/debian
 # mirror_squeeze = http://cdn.debian.net/debian
+# mirror_wheezy = http://cdn.debian.net/debian
 # mirror_sid = http://cdn.debian.net/debian
 # mirror_dapper = http://archive.ubuntu.com/ubuntu
 # mirror_edgy = http://old-releases.ubuntu.com/ubuntu
 # mirror_feisty = http://old-releases.ubuntu.com/ubuntu
 # mirror_gutsy = http://old-releases.ubuntu.com/ubuntu
 # mirror_hardy = http://archive.ubuntu.com/ubuntu
-# mirror_intrepid = http://archive.ubuntu.com/ubuntu
+# mirror_intrepid = http://old-releases.ubuntu.com/ubuntu
 # mirror_karmic = http://archive.ubuntu.com/ubuntu
 # mirror_lucid = http://archive.ubuntu.com/ubuntu
 # mirror_maverick = http://archive.ubuntu.com/ubuntu
+# mirror_natty = http://archive.ubuntu.com/ubuntu
 
 
 #
diff -Nru xen-tools-4.2~rc1/etc/xm.tmpl xen-tools-4.2/etc/xm.tmpl
--- xen-tools-4.2~rc1/etc/xm.tmpl	2010-08-15 19:00:55.000000000 +0200
+++ xen-tools-4.2/etc/xm.tmpl	2010-09-21 16:13:40.000000000 +0200
@@ -63,32 +63,20 @@
 #  Physical volumes
 #
 {
-    if ( ( $swap_vbd ) && ( $image_vbd ) )
-    {
-    $OUT .= "root  = '/dev/$device" . "2 ro'\n";
-
-    $OUT .= "disk  = [ ";
-
     if ( $image_vbd )
     {
-         $OUT .= "'$image_vbd," . $device . "2,w'";
-
-    }
-
-    if ( $swap_vbd )
-    {
-         if ( $image_vbd )
-         {
-            $OUT .= ",";
-         }
-
-         $OUT .= "'$swap_vbd," . $device . "1,w'";
-    }
-    $OUT .= " ]\n";
+        $OUT .= "root        = '/dev/$device" . "2 ro'\n";
+        $OUT .= "disk        = [\n";
+        $OUT .= "                  '$image_vbd," . $device . "2,w',\n";
+
+        if ( $swap_vbd )
+        {
+            $OUT .= "                  '$swap_vbd," . $device . "1,w',\n";
+        }
+        $OUT .= "              ]\n";
     }
 }
 
-
 #
 #  Hostname
 #
diff -Nru xen-tools-4.2~rc1/Makefile xen-tools-4.2/Makefile
--- xen-tools-4.2~rc1/Makefile	2010-08-15 19:00:55.000000000 +0200
+++ xen-tools-4.2/Makefile	2010-09-21 16:13:40.000000000 +0200
@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.2rc1
+VERSION     = 4.2
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = $(shell if git ls-files > /dev/null; then echo git; \
@@ -145,6 +145,7 @@
 #
 install-hooks:
 	for i in roles/* ; do if [ -f $$i ]; then cp $$i ${prefix}/etc/xen-tools/role.d; fi ; done
+	for i in ${prefix}/usr/lib/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
 	mkdir -p ${prefix}/usr/lib/xen-tools/centos-4.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/centos-5.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/fedora-core-6.d/
@@ -166,6 +167,7 @@
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d etch.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d squeeze.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d wheezy.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d testing.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d stable.d
@@ -185,6 +187,7 @@
 	cp -R hooks/karmic/*-* ${prefix}/usr/lib/xen-tools/karmic.d/
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
 	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
 
 
diff -Nru xen-tools-4.2~rc1/README xen-tools-4.2/README
--- xen-tools-4.2~rc1/README	2010-08-15 19:00:55.000000000 +0200
+++ xen-tools-4.2/README	2010-09-21 16:13:40.000000000 +0200
@@ -1,3 +1,5 @@
+xen-tools
+---------
 
 Homepage:
     http://www.xen-tools.org/software/xen-tools
@@ -6,13 +8,9 @@
     http://gitorious.org/xen-tools
 
 Mailing Lists:
-    http://xen-tools.org/software/xen-tools/lists.html
-
-
-
-xen-tools
----------
+    http://www.xen-tools.org/software/xen-tools/lists.html
 
+About:
   The xen-tools package contains a collection of Perl scripts for
  working with Xen guest images under Debian GNU/Linux.
 
@@ -32,6 +30,7 @@
 	  * Etch 4.0
 	  * Lenny 5.0
 	  * Squeeze 6.0
+	  * Wheezy 7.0 (preliminary support as it's not yet available)
 	  * Sid (works at least at the moment of writing :-)
 
 	Ubuntu:
@@ -45,6 +44,7 @@
 	  * Karmic Koala 9.10
 	  * Lucid Lynx 10.04 (see [2])
 	  * Maverick Meerkat 10.10 (works at least at the moment of writing :-)
+	  * Natty Narwhal 11.04 (preliminary support as it's not yet available)
 
   [1] There is an issue with debootstrap on hardy not installing ksyslogd
       This can be fixed by chrooting into the newly installed system
@@ -60,6 +60,7 @@
  a mirror that still hosts them. Currently the oldest Ubuntu Distribution
  on Canonical's archive.ubuntu.com is Hardy Heron.
 
+
 Requirements
 ------------
 
@@ -84,6 +85,15 @@
           http://xen-tools.org/software/xen-shell/
 
 
+Installation
+------------
+
+As root or with sudo, execute "make install".
+
+See debian/README.source how to build the Debian package from a
+checked out copy of the git repository (i.e. without a source tar
+ball).
+
 
 The Scripts
 -----------
@@ -93,7 +103,6 @@
  manpage.
 
 
-
 xen-create-image
 ----------------
 
@@ -159,6 +168,5 @@
     a Debian-derived distribution.
 
 
-Steve
---
-
+-- 
+The Xen-Tools Developer Team
diff -Nru xen-tools-4.2~rc1/TODO xen-tools-4.2/TODO
--- xen-tools-4.2~rc1/TODO	2010-08-15 19:00:55.000000000 +0200
+++ xen-tools-4.2/TODO	2010-09-21 16:13:40.000000000 +0200
@@ -3,8 +3,8 @@
 
 See KNOWN_BUGS for real bugs.
 
-Minor bugs to fix and features to add before a 4.2 release
-----------------------------------------------------------
+Bugs to fix and features to add for 5.0
+---------------------------------------
 
 * xen-create-image man page overhaul:
 
@@ -22,8 +22,11 @@
    Currently no locales are set and this causes several domU errors
    which appear in the domU's logs.
 
-Maybe for a 4.3 or 5.0 release
-------------------------------
+* Documentation overhaul
+
+   Better explain what roles /should be/ used for, and that roles
+   are examples, and shouldn't cover every single scenario. They
+   are also easy to write.
 
 * xen-create-image --dist=... / sources.list generation should be more fine-grained
 
@@ -118,12 +121,20 @@
    Like e.g. readConfigurationFile in xen-create-image and
    xen-resize-image which are not completely identical.
 
+* Refactor the code for less variants of calling cp, rm, mv, etc.
+
+   E.g. always use either cp() from File::Copy or /bin/cp, but not
+   both. To allow verbose copying, I (Axel) would prefer /bin/cp over
+   cp();
+
 * Parse numerical parameters transparently for the user
 
    The user shouldn't have to know weather he should specify size
    as <size>G or <size>Gb or <size>. This should be parsed without
    user interaction and rely on a common format.
 
+* Use Perl::Critic
+
 Stuff from Steve's TODO list / Generic TODOs
 --------------------------------------------
 

Attachment: signature.asc
Description: Digital signature


Reply to: