* added 64-bit targets for Ubuntu 6.10, 7.04 and Debian 4.0 (3.1 does

  not officially support the amd64 architecture)
* Debian-4.0_amd64 is now the OpenSLX build platform for 64-bit


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1318 95ad53e4-c205-0410-b2fa-d234c58c8868

7 files changed, 326 insertions, 20 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
index 4908bf76..a903947d 100644
--- a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
@@ -76,9 +76,10 @@ sub initDistroInfo
 			kde
 		",
 
-		# current build platform for OpenSLX:
+		# current 32-bit build platform for OpenSLX:
 		'openslx-build' => "
 			<<<default>>>
+			bzip2
 			gcc
 			libc6-dev
 			make
diff --git a/installer/OpenSLX/OSSetup/Distro/Debian_4_0_amd64.pm b/installer/OpenSLX/OSSetup/Distro/Debian_4_0_amd64.pm
new file mode 100644
index 00000000..4bfd6841
--- /dev/null
+++ b/installer/OpenSLX/OSSetup/Distro/Debian_4_0_amd64.pm
@@ -0,0 +1,91 @@
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# Debian_4_0_amd64.pm
+#	- provides Debian-4.0_amd64-specific overrides of the OpenSLX OSSetup API.
+# -----------------------------------------------------------------------------
+package OpenSLX::OSSetup::Distro::Debian_4_0_amd64;
+
+use strict;
+use warnings;
+
+use base qw(OpenSLX::OSSetup::Distro::Debian);
+
+use OpenSLX::Basics;
+
+################################################################################
+### implementation
+################################################################################
+sub new
+{
+	my $class = shift;
+	my $self = {
+		'base-name'    => 'debian-4.0_amd64',
+		'arch'         => 'amd64',
+		'release-name' => 'etch',
+	};
+	return bless $self, $class;
+}
+
+sub initDistroInfo
+{
+	my $self = shift;
+
+	$self->{config}->{'repository'} = {
+		'base' => {
+			'urls' => "
+				http://debian.intergenia.de/debian
+			",
+			'name' => 'Debian 4.0',
+			'repo-subdir'  => 'dists',
+			'distribution' => 'etch',
+			'components'   => 'main',
+		},
+	};
+
+	$self->{config}->{'package-subdir'} = 'pool';
+
+	$self->{config}->{'prereq-packages'} = "
+		main/d/debootstrap/debootstrap_0.3.3.2etch1_all.deb
+	";
+
+	$self->{config}->{'bootstrap-packages'} = "
+	";
+
+	$self->{config}->{'selection'} = {
+		'default' => "
+			linux-image-amd64
+			locales-all
+		",
+
+		'gnome' => "
+			<<<default>>>
+			gnome
+		",
+
+		'kde' => "
+			<<<default>>>
+			kde
+		",
+
+		# current 64-bit build platform for OpenSLX:
+		'openslx-build' => "
+			<<<default>>>
+			bzip2
+			gcc
+			libc6-dev
+			make
+		",
+	};
+
+	return;
+}
+
+1;
diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm
index 4d3f1192..006ade0a 100644
--- a/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm
@@ -70,7 +70,7 @@ sub initDistroInfo
 	$self->{config}->{'package-subdir'} = 'pool';
 
 	$self->{config}->{'prereq-packages'} = "
-		main/d/debootstrap/debootstrap_0.3.3.3ubuntu3~edgy1_all.deb
+		main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 	";
 
 	$self->{config}->{'bootstrap-packages'} = "
diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10_amd64.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10_amd64.pm
new file mode 100644
index 00000000..a37b364d
--- /dev/null
+++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10_amd64.pm
@@ -0,0 +1,102 @@
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# Ubuntu_6_10_amd64.pm
+#	- provides Ubuntu-6.10_amd64-specific overrides of the OpenSLX OSSetup API.
+# -----------------------------------------------------------------------------
+package OpenSLX::OSSetup::Distro::Ubuntu_6_10_amd64;
+
+use strict;
+use warnings;
+
+use base qw(OpenSLX::OSSetup::Distro::Ubuntu);
+
+use OpenSLX::Basics;
+
+################################################################################
+### implementation
+################################################################################
+sub new
+{
+	my $class = shift;
+	my $self = {
+		'base-name'    => 'ubuntu-6.10_amd64',
+		'arch'         => 'amd64',
+		'release-name' => 'edgy',
+	};
+	return bless $self, $class;
+}
+
+sub initDistroInfo
+{
+	my $self = shift;
+	$self->{config}->{'repository'} = {
+		'base' => {
+			'urls' => "
+				http://ubuntu.intergenia.de/ubuntu
+			",
+			'name' => 'Ubuntu 6.10',
+			'repo-subdir'  => 'dists',
+			'distribution' => 'edgy',
+			'components'   => 'main restricted',
+		},
+		'base_updates' => {
+			'urls' => "
+				ftp://localhost/pub/ubuntu
+			",
+			'name' => 'Ubuntu 6.10 Updates',
+			'repo-subdir'  => 'dists',
+			'distribution' => 'edgy-updates',
+			'components'   => 'main restricted',
+		},
+		'base_security' => {
+			'urls' => "
+				ftp://localhost/pub/ubuntu
+			",
+			'name' => 'Ubuntu 6.10 Security',
+			'repo-subdir'  => 'dists',
+			'distribution' => 'edgy-security',
+			'components'   => 'main restricted',
+		},
+	};
+
+	$self->{config}->{'package-subdir'} = 'pool';
+
+	$self->{config}->{'prereq-packages'} = "
+		main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
+	";
+
+	$self->{config}->{'bootstrap-packages'} = "
+	";
+
+	$self->{config}->{'selection'} = {
+		'default' => "
+			language-pack-de
+			linux-image-generic
+		",
+		'gnome' => "
+			<<<default>>>
+			ubuntu-desktop
+		",
+
+		'kde' => "
+			<<<default>>>
+			kubuntu-desktop
+		",
+
+		'xfce' => "
+			<<<default>>>
+			xubuntu-desktop
+		",
+	};
+	return;
+}
+
+1;
\ No newline at end of file
diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm
index 306481f2..09cbf034 100644
--- a/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm
@@ -70,7 +70,7 @@ sub initDistroInfo
 	$self->{config}->{'package-subdir'} = 'pool';
 
 	$self->{config}->{'prereq-packages'} = "
-		main/d/debootstrap/debootstrap_0.3.3.3ubuntu3~feisty1_all.deb
+		main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 	";
 
 	$self->{config}->{'bootstrap-packages'} = "
diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04_amd64.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04_amd64.pm
new file mode 100644
index 00000000..4a08e63f
--- /dev/null
+++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04_amd64.pm
@@ -0,0 +1,103 @@
+# Copyright (c) 2006, 2007 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# Ubuntu_7_04_amd64.pm
+#	- provides Ubuntu-7.04_amd64-specific overrides of the OpenSLX OSSetup API.
+# -----------------------------------------------------------------------------
+package OpenSLX::OSSetup::Distro::Ubuntu_7_04_amd64;
+
+use strict;
+use warnings;
+
+use base qw(OpenSLX::OSSetup::Distro::Ubuntu);
+
+use OpenSLX::Basics;
+
+################################################################################
+### implementation
+################################################################################
+sub new
+{
+	my $class = shift;
+	my $self = {
+		'base-name'    => 'ubuntu-7.04_amd64',
+		'arch'         => 'amd64',
+		'release-name' => 'feisty',
+	};
+	return bless $self, $class;
+}
+
+sub initDistroInfo
+{
+	my $self = shift;
+	$self->{config}->{'repository'} = {
+		'base' => {
+			'urls' => "
+				http://ubuntu.intergenia.de/ubuntu
+			",
+			'name' => 'Ubuntu 7.04',
+			'repo-subdir'  => 'dists',
+			'distribution' => 'feisty',
+			'components'   => 'main restricted',
+		},
+		'base_updates' => {
+			'urls' => "
+				ftp://localhost/pub/ubuntu
+			",
+			'name' => 'Ubuntu 7.04 Updates',
+			'repo-subdir'  => 'dists',
+			'distribution' => 'feisty-updates',
+			'components'   => 'main restricted',
+		},
+		'base_security' => {
+			'urls' => "
+				ftp://localhost/pub/ubuntu
+			",
+			'name' => 'Ubuntu 7.04 Security',
+			'repo-subdir'  => 'dists',
+			'distribution' => 'feisty-security',
+			'components'   => 'main restricted',
+		},
+	};
+
+	$self->{config}->{'package-subdir'} = 'pool';
+
+	$self->{config}->{'prereq-packages'} = "
+		main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
+	";
+
+	$self->{config}->{'bootstrap-packages'} = "
+	";
+
+	$self->{config}->{'selection'} = {
+		'default' => "
+			language-pack-de
+			linux-image-generic
+		",
+
+		'gnome' => "
+			<<<default>>>
+			ubuntu-desktop
+		",
+
+		'kde' => "
+			<<<default>>>
+			kubuntu-desktop
+		",
+
+		'xfce' => "
+			<<<default>>>
+			xubuntu-desktop
+		",
+	};
+	return;
+}
+
+1;
\ No newline at end of file
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 6a3324de..198dfa9c 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -34,55 +34,64 @@ use vars qw(%supportedDistros);
 
 %supportedDistros = (
 	'debian-3.1' => {
-		module => 'Debian_3_1',       support => 'clone,install'
+		module => 'Debian_3_1',       	support => 'clone,install'
 	},
 	'debian-4.0' => {
-		module => 'Debian_4_0',       support => 'clone,install'
+		module => 'Debian_4_0',       	support => 'clone,install'
+	},
+	'debian-4.0_amd64' => {
+		module => 'Debian_4_0_amd64', 	support => 'clone,install'
 	},
 	'fedora-6' => {
-		module => 'Fedora_6',         support => 'clone,install'
+		module => 'Fedora_6',         	support => 'clone,install'
 	},
 	'fedora-6_x86_64' => {
-		module => 'Fedora_6_x86_64',  support => 'clone,install'
+		module => 'Fedora_6_x86_64',  	support => 'clone,install'
 	},
 	'gentoo-2005.1' => {
-		module => 'Gentoo',    		  support => 'clone'
+		module => 'Gentoo',    		  	support => 'clone'
 	},
 	'gentoo-2006.1' => {
-		module => 'Gentoo',           support => 'clone'
+		module => 'Gentoo',           	support => 'clone'
 	},
 	'mandriva-2007.0' => {
-		module => 'Mandriva_2007_0',  support => 'clone'
+		module => 'Mandriva_2007_0',  	support => 'clone'
 	},
 	'suse-9.3' => {
-		module => 'SUSE_9_3',         support => 'clone'
+		module => 'SUSE_9_3',         	support => 'clone'
 	},
 	'suse-10.0'	=> {
-		module => 'SUSE_10_0',        support => 'clone'
+		module => 'SUSE_10_0',        	support => 'clone'
 	},
 	'suse-10.0_x86_64' => {
-		module => 'SUSE_10_0_x86_64', support => 'clone'
+		module => 'SUSE_10_0_x86_64', 	support => 'clone'
 	},
 	'suse-10.1' => {
-		module => 'SUSE_10_1',        support => 'clone,install'
+		module => 'SUSE_10_1',        	support => 'clone,install'
 	},
 	'suse-10.1_x86_64' => {
-		module => 'SUSE_10_1_x86_64', support => 'clone,install'
+		module => 'SUSE_10_1_x86_64', 	support => 'clone,install'
 	},
 	'suse-10.2' => {
-		module => 'SUSE_10_2',        support => 'clone,install'
+		module => 'SUSE_10_2',        	support => 'clone,install'
 	},
 	'suse-10.2_x86_64' => {
-		module => 'SUSE_10_2_x86_64', support => 'clone,install'
+		module => 'SUSE_10_2_x86_64', 	support => 'clone,install'
 	},
 	'ubuntu-6.06' => {
-		module => 'Ubuntu_6_06',      support => 'clone'
+		module => 'Ubuntu_6_06',      	support => 'clone'
 	},
 	'ubuntu-6.10' => {
-		module => 'Ubuntu_6_10',      support => 'clone,install'
+		module => 'Ubuntu_6_10',      	support => 'clone,install'
+	},
+	'ubuntu-6.10_amd64' => {
+		module => 'Ubuntu_6_10_amd64',	support => 'clone,install'
 	},
 	'ubuntu-7.04' => { 
-		module => 'Ubuntu_7_04',      support => 'clone,install'
+		module => 'Ubuntu_7_04',      	support => 'clone,install'
+	},
+	'ubuntu-7.04_amd64' => { 
+		module => 'Ubuntu_7_04_amd64',	support => 'clone,install'
 	},
 );