* added packages needed by the smart metapackager backend

* split packages required by the different meta-packagers (currently for SUSE
  only, as other distros do not [yet?] support more than one meta-packager)
* tested smart & yum on 32-bit, both work ok

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

5 files changed, 100 insertions, 46 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
index 66de610f..b0304130 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
@@ -180,17 +180,29 @@ sub initDistroInfo
 		i586/udev-085-29.i586.rpm i586/udev-085-30.15.i586.rpm
 		i586/util-linux-2.12r-35.i586.rpm
 		noarch/suse-build-key-1.0-685.noarch.rpm
-		i586/libxml2-2.6.23-13.i586.rpm
-		i586/libxml2-python-2.6.23-15.i586.rpm
-		i586/python-2.4.2-18.i586.rpm
-		i586/python-elementtree-1.2.6-18.i586.rpm
-		i586/python-sqlite-1.1.6-17.i586.rpm
-		i586/python-urlgrabber-2.9.7-15.i586.rpm
-		i586/rpm-python-4.4.2-40.i586.rpm
-		i586/sqlite-3.2.8-14.i586.rpm
-		i586/yum-2.4.2-13.i586.rpm
 	";
 
+	$self->{config}->{'metapackager-packages'} = {
+		'smart' => "
+			i586/python-2.4.2-18.i586.rpm
+			i586/python-elementtree-1.2.6-18.i586.rpm
+			i586/python-xml-2.4.2-18.i586.rpm
+			i586/rpm-python-4.4.2-40.i586.rpm
+			i586/smart-0.41-23.2.i586.rpm
+		",
+		'yum' => "
+			i586/libxml2-2.6.23-13.i586.rpm
+			i586/libxml2-python-2.6.23-15.i586.rpm
+			i586/python-2.4.2-18.i586.rpm
+			i586/python-elementtree-1.2.6-18.i586.rpm
+			i586/python-sqlite-1.1.6-17.i586.rpm
+			i586/python-urlgrabber-2.9.7-15.i586.rpm
+			i586/rpm-python-4.4.2-40.i586.rpm
+			i586/sqlite-3.2.8-14.i586.rpm
+			i586/yum-2.4.2-13.i586.rpm
+		",
+	};
+
 	$self->{config}->{'selection'} = {
 		'default' => "
 		",
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
index 7675be79..fb6b810b 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1_x86_64.pm
@@ -181,17 +181,29 @@ sub initDistroInfo
 		x86_64/udev-085-29.x86_64.rpm x86_64/udev-085-30.15.x86_64.rpm
 		x86_64/util-linux-2.12r-35.x86_64.rpm
 		noarch/suse-build-key-1.0-685.noarch.rpm
-		x86_64/libxml2-2.6.23-13.x86_64.rpm
-		x86_64/libxml2-python-2.6.23-15.x86_64.rpm
-		x86_64/python-2.4.2-18.x86_64.rpm
-		x86_64/python-elementtree-1.2.6-18.x86_64.rpm
-		x86_64/python-sqlite-1.1.6-17.x86_64.rpm
-		x86_64/python-urlgrabber-2.9.7-15.x86_64.rpm
-		x86_64/rpm-python-4.4.2-40.x86_64.rpm
-		x86_64/sqlite-3.2.8-14.x86_64.rpm
-		x86_64/yum-2.4.2-13.x86_64.rpm
 	";
 
+	$self->{config}->{'metapackager-packages'} = {
+		'smart' => "
+			x86_64/python-2.4.2-18.x86_64.rpm
+			x86_64/python-elementtree-1.2.6-18.x86_64.rpm
+			x86_64/python-xml-2.4.2-18.x86_64.rpm
+			x86_64/rpm-python-4.4.2-40.x86_64.rpm
+			x86_64/smart-0.41-23.2.x86_64.rpm
+		",
+		'yum' => "
+			x86_64/libxml2-2.6.23-13.x86_64.rpm
+			x86_64/libxml2-python-2.6.23-15.x86_64.rpm
+			x86_64/python-2.4.2-18.x86_64.rpm
+			x86_64/python-elementtree-1.2.6-18.x86_64.rpm
+			x86_64/python-sqlite-1.1.6-17.x86_64.rpm
+			x86_64/python-urlgrabber-2.9.7-15.x86_64.rpm
+			x86_64/rpm-python-4.4.2-40.x86_64.rpm
+			x86_64/sqlite-3.2.8-14.x86_64.rpm
+			x86_64/yum-2.4.2-13.x86_64.rpm
+		",
+	};
+
 	$self->{config}->{'selection'} = {
 		'default' => "
 		",
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
index b65bf5f7..f5a5b3ff 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
@@ -137,8 +137,6 @@ sub initDistroInfo
 		i586/findutils-4.2.28-24.i586.rpm
 		i586/gawk-3.1.5-41.i586.rpm
 		i586/gdbm-1.8.3-261.i586.rpm
-		i586/glib2-2.12.4-15.i586.rpm
-		i586/gnome-filesystem-0.1-288.i586.rpm
 		i586/gpg-1.4.5-24.i586.rpm
 		i586/grep-2.5.1a-40.i586.rpm
 		i586/gzip-1.3.5-178.i586.rpm
@@ -153,8 +151,6 @@ sub initDistroInfo
 		i586/libstdc++41-4.1.2_20061115-5.i586.rpm
 		i586/libvolume_id-103-12.i586.rpm
 		i586/libxcrypt-2.4-30.i586.rpm
-		i586/libxml2-2.6.26-26.i586.rpm
-		i586/libxml2-python-2.6.26-29.i586.rpm
 		i586/libzio-0.2-20.i586.rpm
 		i586/limal-1.2.9-5.i586.rpm
 		i586/limal-bootloader-1.2.4-6.i586.rpm
@@ -177,24 +173,39 @@ sub initDistroInfo
 		i586/perl-Bootloader-0.4.5-3.i586.rpm
 		i586/perl-gettext-1.05-31.i586.rpm
 		i586/permissions-2006.11.13-5.i586.rpm
-		i586/python-2.5-19.i586.rpm
-		i586/python-sqlite-1.1.8-11.i586.rpm
-		i586/python-urlgrabber-3.1.0-18.i586.rpm
-		i586/python-xml-2.5-19.i586.rpm
 		i586/readline-5.1-55.i586.rpm
 		i586/reiserfs-3.6.19-37.i586.rpm
-		i586/rpm-python-4.4.2-76.i586.rpm
 		i586/sed-4.1.5-21.i586.rpm
-		i586/sqlite-3.3.8-14.i586.rpm
 		i586/sysvinit-2.86-47.i586.rpm
 		i586/udev-103-12.i586.rpm
 		i586/util-linux-2.12r-61.i586.rpm
-		i586/yum-3.0.1-9.i586.rpm
-		i586/yum-metadata-parser-1.0.2-23.i586.rpm
 		noarch/pciutils-ids-2006.11.18-2.noarch.rpm
 		noarch/suse-build-key-1.0-707.noarch.rpm
 	";
 
+	$self->{config}->{'metapackager-packages'} = {
+		'smart' => "
+			i586/python-2.5-19.i586.rpm
+			i586/python-xml-2.5-19.i586.rpm
+			i586/rpm-python-4.4.2-76.i586.rpm
+			i586/smart-0.42-43.i586.rpm
+		",
+		'yum' => "
+			i586/glib2-2.12.4-15.i586.rpm
+			i586/gnome-filesystem-0.1-288.i586.rpm
+			i586/libxml2-2.6.26-26.i586.rpm
+			i586/libxml2-python-2.6.26-29.i586.rpm
+			i586/python-2.5-19.i586.rpm
+			i586/python-sqlite-1.1.8-11.i586.rpm
+			i586/python-urlgrabber-3.1.0-18.i586.rpm
+			i586/python-xml-2.5-19.i586.rpm
+			i586/rpm-python-4.4.2-76.i586.rpm
+			i586/sqlite-3.3.8-14.i586.rpm
+			i586/yum-3.0.1-9.i586.rpm
+			i586/yum-metadata-parser-1.0.2-23.i586.rpm
+		",
+	};
+
 	$self->{config}->{'selection'} = {
 		'default' => "
 			nbd
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
index aff06f2c..106a3f9d 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2_x86_64.pm
@@ -169,20 +169,31 @@ sub initDistroInfo
 		x86_64/util-linux-2.12r-61.x86_64.rpm
 		noarch/pciutils-ids-2006.11.18-2.noarch.rpm
 		noarch/suse-build-key-1.0-707.noarch.rpm
-		x86_64/glib2-2.12.4-15.x86_64.rpm
-		x86_64/gnome-filesystem-0.1-288.x86_64.rpm
-		x86_64/libxml2-2.6.26-26.x86_64.rpm
-		x86_64/libxml2-python-2.6.26-29.x86_64.rpm
-		x86_64/rpm-python-4.4.2-76.x86_64.rpm
-		x86_64/python-2.5-19.x86_64.rpm
-		x86_64/python-sqlite-1.1.8-11.x86_64.rpm
-		x86_64/python-urlgrabber-3.1.0-18.x86_64.rpm
-		x86_64/python-xml-2.5-19.x86_64.rpm
-		x86_64/sqlite-3.3.8-14.x86_64.rpm
-		x86_64/yum-3.0.1-9.x86_64.rpm
-		x86_64/yum-metadata-parser-1.0.2-23.x86_64.rpm
 	";
 
+	$self->{config}->{'metapackager-packages'} = {
+		'smart' => "
+			x86_64/python-2.5-19.x86_64.rpm
+			x86_64/python-xml-2.5-19.x86_64.rpm
+			x86_64/rpm-python-4.4.2-76.x86_64.rpm
+			x86_64/smart-0.42-43.x86_64.rpm
+		",
+		'yum' => "
+			x86_64/glib2-2.12.4-15.x86_64.rpm
+			x86_64/gnome-filesystem-0.1-288.x86_64.rpm
+			x86_64/libxml2-2.6.26-26.x86_64.rpm
+			x86_64/libxml2-python-2.6.26-29.x86_64.rpm
+			x86_64/python-2.5-19.x86_64.rpm
+			x86_64/python-sqlite-1.1.8-11.x86_64.rpm
+			x86_64/python-urlgrabber-3.1.0-18.x86_64.rpm
+			x86_64/python-xml-2.5-19.x86_64.rpm
+			x86_64/rpm-python-4.4.2-76.x86_64.rpm
+			x86_64/sqlite-3.3.8-14.x86_64.rpm
+			x86_64/yum-3.0.1-9.x86_64.rpm
+			x86_64/yum-metadata-parser-1.0.2-23.x86_64.rpm
+		",
+	};
+
 	$self->{config}->{'selection'} = {
 		'default' => "
 			nbd
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 006e31a4..d53cc6ab 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -383,6 +383,8 @@ sub readDistroInfo
 	my $bootstrap_prereq_packages
 		= $self->{distro}->{config}->{'bootstrap-prereq-packages'};
 	my $bootstrap_packages = $self->{distro}->{config}->{'bootstrap-packages'};
+	my $metapackager_packages 
+		= $self->{distro}->{config}->{'metapackager-packages'};
 	my $file = "$self->{'distro-info-dir'}/settings.local";
 	if (-e $file) {
 		vlog 2, "reading configuration file $file...";
@@ -405,6 +407,7 @@ sub readDistroInfo
 		'prereq-packages' => $prereq_packages,
 		'bootstrap-prereq-packages' => $bootstrap_prereq_packages,
 		'bootstrap-packages' => $bootstrap_packages,
+		'metapackager-packages' => $metapackager_packages,
 		'repository' => \%repository,
 		'selection' => \%selection,
 		'excludes' => \%excludes,
@@ -741,12 +744,17 @@ sub stage1B_chrootAndBootstrap
 
 	@pkgs = string2Array($self->{'distro-info'}->{'bootstrap-prereq-packages'});
 	my @bootstrapPrereqPkgs = $self->downloadBaseFiles(\@pkgs);
-	$self->{'local-bootstrap-prereq-packages'} = \@bootstrapPrereqPkgs;
+	$self->{'bootstrap-prereq-packages'} = \@bootstrapPrereqPkgs;
 
 	@pkgs = string2Array($self->{'distro-info'}->{'bootstrap-packages'});
+	push @pkgs, string2Array(
+		$self->{'distro-info'}->{'metapackager-packages'}->{
+			$self->{distro}->{'meta-packager-type'}
+		}
+	);
 	my @bootstrapPkgs = $self->downloadBaseFiles(\@pkgs);
 	my @allPkgs = (@prereqPkgs, @bootstrapPrereqPkgs, @bootstrapPkgs);
-	$self->{'local-bootstrap-packages'}	= \@allPkgs;
+	$self->{'bootstrap-packages'}	= \@allPkgs;
 }
 
 sub setupStage1C
@@ -767,7 +775,7 @@ sub stage1C_chrootAndInstallBasicVendorOS
 	my $stage1cDir = "/$self->{stage1cSubdir}";
 	# install all prerequired bootstrap packages
 	$self->{packager}->installPrerequiredPackages(
-		$self->{'local-bootstrap-prereq-packages'}, $stage1cDir
+		$self->{'bootstrap-prereq-packages'}, $stage1cDir
 	);
 
 	# import any additional trusted package keys to rpm-DB:
@@ -783,7 +791,7 @@ sub stage1C_chrootAndInstallBasicVendorOS
 
 	# install all other bootstrap packages
 	$self->{packager}->installPackages(
-		$self->{'local-bootstrap-packages'}, $stage1cDir
+		$self->{'bootstrap-packages'}, $stage1cDir
 	);
 }