X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=c36d41033103fca81a79d02436a399bcee303347;hb=bd4976a460cc6af4da09164c6f1d1581480a9771;hp=d93cddb42ca254f7eaa9174c95a7ee42df4de8c3;hpb=58a778d599dc76a8fff2d9fee9a6714344d5e1dc;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index d93cddb..c36d410 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-hvtrap_setup
-source ../config/packages-list
+source ../functions/main
 source /etc/profile
 
 if [ "x${USER}" != "xroot" ]; then
@@ -70,8 +66,8 @@ fi
 
 ipkg ${HELP2MAN}
 ipkg ${GSL}
-ipkg ${CUPS}
-ipkg ${CUPS_PDF}
+ipkg -m acnb ${CUPS}
+ipkg -m noac ${CUPS_PDF}
 ipkg ${SPLIX}
 ipkg ${GHOSTSCRIPT}
 
@@ -84,7 +80,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg ${GEGL}
     ipkg ${GIMP} "--disable-print"
     ipkg -m acnb ${GUTENPRINT}
-    ipkg ${BOOST} cis-boost
+    ipkg -m noac ${BOOST}
     # inkscape-0.47 has a problem with poppler >= 0.12.2
     # Try 0.48.1
     ipkg ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
@@ -94,7 +90,7 @@ ipkg ${CDRTOOLS}
 ipkg ${DVDRWTOOLS}
 ipkg ${LIBDVDCSS}
 ipkg ${LIBDVDREAD} "--with-libdvdcss"
-ipkg ${DVDFS}
+ipkg -m noac ${DVDFS}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${TETEX_SRC} cis-tetex
@@ -172,7 +168,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg ${FIREFOX}
 
     # Plugins for Firefox
-    ipkg ${JAVA}
     ipkg ${AGG}
     ipkg ${GNASH}
 fi
@@ -186,11 +181,12 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${OPENLDAP}
 fi
 ipkg ${KERBEROS5}
-ipkg ${SENDMAIL} # Replace by SSMTP for workstation...
+ipkg -m noac ${SENDMAIL} # Replace by SSMTP for workstation...
+ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl"
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    ipkg ${PROCMAIL}
-    ipkg ${LIBSPF2}
+    ipkg -m noac ${PROCMAIL}
+    ipkg -m noac ${LIBSPF2}
     ipkg ${MILTER_SPF}
     ipkg ${MILTER_GREYLIST}
     ipkg ${CLAMAV}
@@ -199,35 +195,20 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m pm ${PERL_MOD_HTML_TAGSET}
     ipkg -m pm ${PERL_MOD_HTML_PARSER}
     ipkg -m pm ${PERL_MOD_APACHE_LOGGED_AUTH_DBI}
-    ############ipkg -m pm ${PERL_MOD_DB_FILE}
-# Berkeley DB n'est plus installé...
-########PERL_MOD_DB_FILE="DB_File-1.814"
     ipkg -m pm ${PERL_MOD_DIGEST_SHA1}
     ipkg -m pm ${PERL_MOD_URI}
     ipkg -m pm ${PERL_MOD_LWP}
     ipkg -m pm ${PERL_MOD_NET_DNS} "--no-online-tests"
-
-    # Needed by OpenOffice ???
-    #ipkg -m pm ${PERL_MOD_ARCHIVE_ZIP}
-    #ipkg -m pm ${PERL_MOD_COMPRESS_ZLIB}
-    #ipkg -m pm ${PERL_MOD_IO_COMPRESS_BASE}
-    #ipkg -m pm ${PERL_MOD_COMPRESS_RAW_ZLIB}
-    #ipkg -m pm ${PERL_MOD_IO_COMPRESS_ZLIB}
-PERL_MOD_ARCHIVE_ZIP="Archive-Zip-1.30"
-PERL_MOD_COMPRESS_ZLIB="Compress-Zlib-2.015"
-PERL_MOD_IO_COMPRESS_BASE="IO-Compress-Base-2.024"
-PERL_MOD_IO_COMPRESS_ZLIB="IO-Compress-Zlib-2.024"
-PERL_MOD_COMPRESS_RAW_ZLIB="Compress-Raw-Zlib-2.024"
-
+    ipkg -m pm ${PERL_MOD_COMPRESS_ZLIB}
     ipkg -m pm ${SPAMASSASSIN}
+
     ipkg ${UW_IMAP}
 
     ipkg ${HTTPD} # Apache
     ipkg ${PHP}
 
-    ipkg ${SQUIRRELMAIL}
+    ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
-    ipkg ${MUTT} "--enable-imap --with-ssl"
 
     # Subversion server (client was already installed in stage2) 
     ipkg ${SUBVERSION}
@@ -247,7 +228,7 @@ ipkg -m acnb ${KVM}
 ipkg -m acnb ${BRIDGE_UTILS}
 ipkg ${UML_UTILITIES}
 
-ipkg ${CKERMIT}
+ipkg -s ckermit ${CKERMIT}
 
 ipkg ${TRANSMISSION} "--disable-daemon"
 
@@ -262,4 +243,7 @@ ipkg ${GEDA_GATTRIB}
 
 rscr mult  "Performing post-install" cis-post-install
 
+write_completed_stage
+display_stage_build_stats
+
 exit $?