Set META_PACKAGER if SLX_META_PACKAGER is not set from a settings file.

We now use yum by default for SUSE and Fedora systems.

Move the packages of required by the meta packager to the end of the
SLX_BASE_BOOTSTRAP_PACKAGES list.  This might alow us to easily split
them of to a separat list later.

Remove smart and add yum to the package lists of suse101 and
opensuse102 systems.


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

7 files changed, 66 insertions, 48 deletions

diff --git a/installer/systems/opensuse102-x86_64/settings b/installer/systems/opensuse102-x86_64/settings
index 37df1a40..579eb9ba 100644
--- a/installer/systems/opensuse102-x86_64/settings
+++ b/installer/systems/opensuse102-x86_64/settings
@@ -9,7 +9,7 @@ gpg-pubkey-9c800aca-40d8063e.asc
 gpg-pubkey-a1912208-446a0899.asc
 "
 SLX_INST_SOURCE_NAME_opensuse102="openSUSE 10.2"
-SLX_INST_SOURCE_TYPE_opensuse102="yast2"
+SLX_INST_SOURCE_REPO_SUBDIR_opensuse102="suse"
 SLX_INST_SOURCE_BASEURL_opensuse102update="http://ftp.gwdg.de/pub/suse/update/10.2"
 SLX_INST_SOURCE_NAME_opensuse102update="openSUSE 10.2 updates"
 SLX_BASE_PREREQ_PACKAGES="
@@ -82,8 +82,16 @@ x86_64/udev-103-12.x86_64.rpm
 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-xml-2.5-19.x86_64.rpm
 x86_64/python-2.5-19.x86_64.rpm
-x86_64/smart-0.42-43.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
 "
diff --git a/installer/systems/opensuse102/settings b/installer/systems/opensuse102/settings
index e940ca7a..dfec96a8 100644
--- a/installer/systems/opensuse102/settings
+++ b/installer/systems/opensuse102/settings
@@ -9,7 +9,7 @@ gpg-pubkey-9c800aca-40d8063e.asc
 gpg-pubkey-a1912208-446a0899.asc
 "
 SLX_INST_SOURCE_NAME_opensuse102="openSUSE 10.2"
-SLX_INST_SOURCE_TYPE_opensuse102="yast2"
+SLX_INST_SOURCE_REPO_SUBDIR_opensuse102="suse"
 SLX_INST_SOURCE_BASEURL_opensuse102update="http://ftp.gwdg.de/pub/suse/update/10.2"
 SLX_INST_SOURCE_NAME_opensuse102update="openSUSE 10.2 updates"
 SLX_BASE_PREREQ_PACKAGES="
@@ -82,8 +82,16 @@ i586/udev-103-12.i586.rpm
 i586/util-linux-2.12r-61.i586.rpm
 noarch/pciutils-ids-2006.11.18-2.noarch.rpm
 noarch/suse-build-key-1.0-707.noarch.rpm
+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/rpm-python-4.4.2-76.i586.rpm
-i586/python-xml-2.5-19.i586.rpm
 i586/python-2.5-19.i586.rpm
-i586/smart-0.42-43.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/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
 "
diff --git a/installer/systems/suse100-x86_64/settings b/installer/systems/suse100-x86_64/settings
index c3cf50a9..27ba8912 100644
--- a/installer/systems/suse100-x86_64/settings
+++ b/installer/systems/suse100-x86_64/settings
@@ -1,6 +1,5 @@
 SLX_INST_SOURCE_BASEURL="http://ftp.gwdg.de/pub/opensuse/distribution/SL-10.0-OSS/inst-source"
 SLX_INST_SOURCE_PACKAGE_SUBDIR="suse"
-SLX_META_PACKAGER="yum"
 SLX_INST_SOURCE_PACKAGEKEYS="
 gpg-pubkey-15c17deb-3f9e80c9.asc
 gpg-pubkey-9c800aca-40d8063e.asc
@@ -55,8 +54,6 @@ x86_64/libgcc-4.0.2_20050901-3.x86_64.rpm
 x86_64/libselinux-1.23.11-3.x86_64.rpm
 x86_64/libstdc++-4.0.2_20050901-3.x86_64.rpm
 x86_64/libxcrypt-2.2-5.x86_64.rpm
-x86_64/libxml2-2.6.20-4.x86_64.rpm
-x86_64/libxml2-python-2.6.20-4.x86_64.rpm
 x86_64/libzio-0.1-6.x86_64.rpm
 x86_64/limal-1.0.8-2.x86_64.rpm
 x86_64/limal-bootloader-1.0.5-2.x86_64.rpm
@@ -77,22 +74,23 @@ x86_64/perl-5.8.7-5.x86_64.rpm
 x86_64/perl-Bootloader-0.2-37.x86_64.rpm
 x86_64/perl-gettext-1.05-2.x86_64.rpm
 x86_64/permissions-2005.8.30-2.x86_64.rpm
-x86_64/python-2.4.1-3.x86_64.rpm
-x86_64/python-elementtree-1.2.6-2.x86_64.rpm
-x86_64/python-urlgrabber-2.9.6-2.x86_64.rpm
-x86_64/python-sqlite-1.1.6-2.x86_64.rpm
-x86_64/python-xml-2.4.1-3.x86_64.rpm
 x86_64/readline-5.0-9.x86_64.rpm
 x86_64/reiserfs-3.6.18-5.x86_64.rpm
-x86_64/rpm-python-4.1.1-222.x86_64.rpm
 x86_64/sed-4.1.4-5.x86_64.rpm
-x86_64/sqlite-3.2.2-5.x86_64.rpm
 x86_64/suse-release-oss-10.0-8.x86_64.rpm
 x86_64/sysvinit-2.85-52.x86_64.rpm
 x86_64/tar-1.15.1-9.x86_64.rpm
 x86_64/udev-068git20050831-9.x86_64.rpm
 x86_64/util-linux-2.12q-26.x86_64.rpm
-x86_64/yum-2.4.0-3.x86_64.rpm
 noarch/mkinitrd-1.2-48.noarch.rpm
 noarch/suse-build-key-1.0-668.noarch.rpm
+x86_64/libxml2-2.6.20-4.x86_64.rpm
+x86_64/libxml2-python-2.6.20-4.x86_64.rpm
+x86_64/python-2.4.1-3.x86_64.rpm
+x86_64/python-elementtree-1.2.6-2.x86_64.rpm
+x86_64/python-urlgrabber-2.9.6-2.x86_64.rpm
+x86_64/python-sqlite-1.1.6-2.x86_64.rpm
+x86_64/rpm-python-4.1.1-222.x86_64.rpm
+x86_64/sqlite-3.2.2-5.x86_64.rpm
+x86_64/yum-2.4.0-3.x86_64.rpm
 "
diff --git a/installer/systems/suse100/settings b/installer/systems/suse100/settings
index d6f804d9..9828a7ce 100644
--- a/installer/systems/suse100/settings
+++ b/installer/systems/suse100/settings
@@ -1,6 +1,5 @@
 SLX_INST_SOURCE_BASEURL="http://ftp.gwdg.de/pub/opensuse/distribution/SL-10.0-OSS/inst-source"
 SLX_INST_SOURCE_PACKAGE_SUBDIR="suse"
-SLX_META_PACKAGER="yum"
 SLX_INST_SOURCE_PACKAGEKEYS="
 gpg-pubkey-15c17deb-3f9e80c9.asc
 gpg-pubkey-9c800aca-40d8063e.asc
@@ -55,8 +54,6 @@ i586/libgcc-4.0.2_20050901-3.i586.rpm
 i586/libselinux-1.23.11-3.i586.rpm
 i586/libstdc++-4.0.2_20050901-3.i586.rpm
 i586/libxcrypt-2.2-5.i586.rpm
-i586/libxml2-2.6.20-4.i586.rpm
-i586/libxml2-python-2.6.20-4.i586.rpm
 i586/libzio-0.1-6.i586.rpm
 i586/limal-1.0.8-2.i586.rpm
 i586/limal-bootloader-1.0.5-2.i586.rpm
@@ -77,22 +74,23 @@ i586/perl-5.8.7-5.i586.rpm
 i586/perl-Bootloader-0.2-37.i586.rpm
 i586/perl-gettext-1.05-2.i586.rpm
 i586/permissions-2005.8.30-2.i586.rpm
-i586/python-2.4.1-3.i586.rpm
-i586/python-elementtree-1.2.6-2.i586.rpm
-i586/python-urlgrabber-2.9.6-2.i586.rpm
-i586/python-sqlite-1.1.6-2.i586.rpm
-i586/python-xml-2.4.1-3.i586.rpm
 i586/readline-5.0-9.i586.rpm
 i586/reiserfs-3.6.18-5.i586.rpm
-i586/rpm-python-4.1.1-222.i586.rpm
 i586/sed-4.1.4-5.i586.rpm
-i586/sqlite-3.2.2-5.i586.rpm
 i586/suse-release-oss-10.0-8.i586.rpm
 i586/sysvinit-2.85-52.i586.rpm
 i586/tar-1.15.1-9.i586.rpm
 i586/udev-068git20050831-9.i586.rpm
 i586/util-linux-2.12q-26.i586.rpm
-i586/yum-2.4.0-3.i586.rpm
 noarch/mkinitrd-1.2-48.noarch.rpm
 noarch/suse-build-key-1.0-668.noarch.rpm
+i586/libxml2-2.6.20-4.i586.rpm
+i586/libxml2-python-2.6.20-4.i586.rpm
+i586/python-2.4.1-3.i586.rpm
+i586/python-elementtree-1.2.6-2.i586.rpm
+i586/python-urlgrabber-2.9.6-2.i586.rpm
+i586/python-sqlite-1.1.6-2.i586.rpm
+i586/rpm-python-4.1.1-222.i586.rpm
+i586/sqlite-3.2.2-5.i586.rpm
+i586/yum-2.4.0-3.i586.rpm
 "
diff --git a/installer/systems/suse101-x86_64/settings b/installer/systems/suse101-x86_64/settings
index e13a9fb2..94afd8fc 100644
--- a/installer/systems/suse101-x86_64/settings
+++ b/installer/systems/suse101-x86_64/settings
@@ -8,7 +8,7 @@ gpg-pubkey-3d25d3d9-36e12d04.asc
 gpg-pubkey-9c800aca-40d8063e.asc
 "
 SLX_INST_SOURCE_NAME_suse101="SUSE Linux 10.1"
-SLX_INST_SOURCE_TYPE_suse101="yast2"
+SLX_INST_SOURCE_REPO_SUBDIR_suse101="suse"
 SLX_INST_SOURCE_BASEURL_suse101update="http://ftp.gwdg.de/pub/suse/update/10.1"
 SLX_INST_SOURCE_NAME_suse101update="SUSE Linux 10.1 updates"
 SLX_BOOTSTRAP_FAIL_WGET="no"
@@ -85,19 +85,22 @@ x86_64/perl-Bootloader-0.2.20-7.x86_64.rpm
 x86_64/perl-Bootloader-0.2.27-0.4.x86_64.rpm
 x86_64/perl-gettext-1.05-11.x86_64.rpm
 x86_64/permissions-2006.2.24-8.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-xml-2.4.2-18.x86_64.rpm
 x86_64/readline-5.1-22.x86_64.rpm
 x86_64/reiserfs-3.6.19-17.x86_64.rpm
-x86_64/rpm-python-4.4.2-40.x86_64.rpm
 x86_64/sed-4.1.4-15.x86_64.rpm
-x86_64/smart-0.41-23.x86_64.rpm
-x86_64/smart-0.41-23.2.x86_64.rpm
 x86_64/suse-release-10.1-9.x86_64.rpm
 x86_64/sysvinit-2.86-19.x86_64.rpm
 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
 "
diff --git a/installer/systems/suse101/settings b/installer/systems/suse101/settings
index cdf35ce5..bff9516a 100644
--- a/installer/systems/suse101/settings
+++ b/installer/systems/suse101/settings
@@ -8,7 +8,7 @@ gpg-pubkey-3d25d3d9-36e12d04.asc
 gpg-pubkey-9c800aca-40d8063e.asc
 "
 SLX_INST_SOURCE_NAME_suse101="SUSE Linux 10.1"
-SLX_INST_SOURCE_TYPE_suse101="yast2"
+SLX_INST_SOURCE_REPO_SUBDIR_suse101="suse"
 SLX_INST_SOURCE_BASEURL_suse101update="http://ftp.gwdg.de/pub/suse/update/10.1"
 SLX_INST_SOURCE_NAME_suse101update="SUSE Linux 10.1 updates"
 SLX_BOOTSTRAP_FAIL_WGET="no"
@@ -85,19 +85,22 @@ i586/perl-Bootloader-0.2.20-7.i586.rpm
 i586/perl-Bootloader-0.2.27-0.4.i586.rpm
 i586/perl-gettext-1.05-11.i586.rpm
 i586/permissions-2006.2.24-8.i586.rpm
-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/readline-5.1-22.i586.rpm
 i586/reiserfs-3.6.19-17.i586.rpm
-i586/rpm-python-4.4.2-40.i586.rpm
 i586/sed-4.1.4-15.i586.rpm
-i586/smart-0.41-23.i586.rpm
-i586/smart-0.41-23.2.i586.rpm
 i586/suse-release-10.1-9.i586.rpm
 i586/sysvinit-2.86-19.i586.rpm
 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
 "
diff --git a/installer/systems/suse93/settings b/installer/systems/suse93/settings
index 65ecb86a..c3dcd4f5 100644
--- a/installer/systems/suse93/settings
+++ b/installer/systems/suse93/settings
@@ -51,8 +51,6 @@ i586/libgcc-3.3.5-5.i586.rpm
 i586/libselinux-1.21.7-3.i586.rpm
 i586/libstdc++-3.3.5-5.i586.rpm
 i586/libxcrypt-2.2-3.i586.rpm
-i586/libxml2-2.6.17-4.i586.rpm
-i586/libxml2-python-2.6.17-4.i586.rpm
 i586/libzio-0.1-5.i586.rpm
 i586/logrotate-3.7-35.i586.rpm
 i586/mdadm-1.9.0-3.2.i586.rpm
@@ -69,13 +67,9 @@ i586/perl-5.8.6-5.i586.rpm
 i586/perl-Bootloader-0.2-17.i586.rpm
 i586/perl-gettext-1.01-579.i586.rpm
 i586/permissions-2005.3.1-3.i586.rpm
-i586/python-2.4-14.i586.rpm
-i586/python-xml-2.4-14.i586.rpm
 i586/readline-5.0-7.2.i586.rpm
 i586/reiserfs-3.6.18-3.i586.rpm
-i586/rpm-python-4.1.1-208.i586.rpm
 i586/sed-4.1.4-3.i586.rpm
-i586/sqlite-3.1.3-3.i586.rpm
 i586/suse-release-9.3-4.i586.rpm
 i586/sysvinit-2.85-38.4.i586.rpm
 i586/tar-1.15.1-5.i586.rpm
@@ -83,4 +77,10 @@ i586/udev-053-15.2.i586.rpm
 i586/util-linux-2.12q-7.2.i586.rpm
 noarch/mkinitrd-1.2-26.noarch.rpm
 noarch/suse-build-key-1.0-665.noarch.rpm
+i586/libxml2-2.6.17-4.i586.rpm
+i586/libxml2-python-2.6.17-4.i586.rpm
+i586/python-2.4-14.i586.rpm
+i586/python-xml-2.4-14.i586.rpm
+i586/rpm-python-4.1.1-208.i586.rpm
+i586/sqlite-3.1.3-3.i586.rpm
 "