From 8fca20d4d8af779f2f26e13356df813b81b62239 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 21 Sep 2010 14:16:58 +0200 Subject: [PATCH] Preliminary support for Ubuntu 11.04 (Natty) and Debian 7.0 (Wheezy) --- Makefile | 2 ++ bin/xen-create-image | 8 ++++---- debian/changelog | 2 ++ etc/xen-tools.conf | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d028a74..bb70cdf 100644 --- a/Makefile +++ b/Makefile @@ -167,6 +167,7 @@ install-hooks: -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 @@ -186,6 +187,7 @@ install-hooks: 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 --git a/bin/xen-create-image b/bin/xen-create-image index 9c9ae3b..b028287 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1346,14 +1346,14 @@ sub setupDefaultOptions $CONFIG{ 'mirror' } = ''; # Initialize per distribution mirror defaults: Debian - foreach my $debdist (qw(etch lenny squeeze sid testing stable unstable)) { + foreach my $debdist (qw(etch lenny squeeze wheezy sid testing stable unstable)) { $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' } } foreach my $debdist (qw(sarge)) { $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 intrepid jaunty karmic lucid maverick natty)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu'; } foreach my $ubuntudist (qw(edgy feisty gutsy)) { @@ -1902,9 +1902,9 @@ sub checkArguments } # - # 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; } diff --git a/debian/changelog b/debian/changelog index 66c5594..efb2daa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ xen-tools (4.2-1) UNRELEASED; urgency=low 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) * Does no more try extract the upstream changelog during package build. The commit which introduced this problem has been reverted. Document more clearly in debian/README.source how to build diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index 76d45ea..2a0bb17 100644 --- a/etc/xen-tools.conf +++ b/etc/xen-tools.conf @@ -264,6 +264,7 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_sarge = 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 @@ -274,6 +275,7 @@ mirror = `xt-guess-suite-and-mirror --mirror` # 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 #