Ajout support pour archives xz, et ajout fonction pour vérifier qu'on est bien l...

[hvlinux.git] / stage6 / hv-install-1

diff --git a/stage6/hv-install-1 b/stage6/hv-install-1
index 091286f..379356f 100755 (executable)
--- a/stage6/hv-install-1
+++ b/stage6/hv-install-1
@@ -14,11 +14,7 @@ fi
 
 init_log_file
 
-# GNOME-2.X configuration
-#action_checkbox "Configuring ${GNOME2_VER}" ./cis-gnome-config
-#action_checkbox "Reloading /etc/profile" source /etc/profile
-
-# Gnome 2 core packages
+# Gnome core packages
 ##ipkg_gnome ${ORBIT2}
 ipkg_gnome ${LIBBONOBO}
 ###ipkg  ${GCONF} cis-gconf
@@ -32,7 +28,7 @@ ipkg ${GNOME_ICON_THEME}
 ##ipkg_gnome ${GNOME_KEYRING}
 ipkg_gnome ${LIBGNOMEUI}
 ipkg ${GNOME_THEMES}
-ipkg -m acnb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/opt/${GNOME2_VER}/share/omf"
+ipkg -m acnb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/usr/share/omf"
 ipkg_gnome ${GNOME_DOC_UTILS}
 ipkg_gnome ${GNOME_DESKTOP}
 ipkg_gnome ${GNOME_BACKGROUNDS}
@@ -96,7 +92,6 @@ ipkg_gnome ${GNOME_SOUND_JUICER}
 ipkg_gnome ${GNOME_TOTEM}
 ipkg ${GDM}
 ipkg ${LIBNOTIFY}
-ipkg -m gnomenb ${GNOME_MOUNT}
 
 ipkg ${RHYTHMBOX} "--disable-python"
 
@@ -108,4 +103,7 @@ ipkg ${ABIWORD}  "--disable-spellcheck"
 ipkg_gnome ${EVOLUTION} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr"
 ipkg_gnome ${EVOLUTION_EXCHANGE}
 
+write_completed_stage
+display_stage_build_stats
+
 exit $?