X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fhv-install-1;h=eb8620f7648ce97e9eddd5e13fa7ca18052a4e59;hb=0fc5131983e80de7e1e6abf98c8430736f4c9c16;hp=a0f6897bc5c97ff6bb60571773397909e9857526;hpb=2ad910e22979500192ea43d5599ad003440744a4;p=hvlinux.git

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index a0f6897..eb8620f 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -1,17 +1,9 @@
 #!/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
-    echo "You must be the superuser to install hvlinux."
-    exit 1
-fi
-
+check_for_root_user
 init_log_file
 
 ipkg ${WHICH}
@@ -19,12 +11,12 @@ ipkg -m acnb ${REISERFSPROGS}
 ipkg -m acnb ${POPT}
 ipkg ${PAM}
 ipkg -m noac ${OPENSSL}
-ipkg ${WGET}
+ipkg ${WGET} "--with-ssl=openssl"
 ipkg -m noac ${PCIUTILS}
 ipkg -m acnb ${LIBUSB}
 ipkg ${LIBUSB_COMPAT}
-ipkg ${USBUTILS}
-ipkg ${FCRON}
+ipkg -s usbutils ${USBUTILS}
+ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
 ipkg ${EXPAT}
@@ -32,8 +24,9 @@ ipkg ${APR} "--with-installbuilddir=/usr/lib/apr-1/build"
 ipkg ${APR_UTIL} "--with-apr=/usr/bin/apr-1-config"
 ipkg ${NEON} "--with-ssl"
 ipkg -s tcl ${TCL}
-ipkg ${SQLITE}
-ipkg ${SUBVERSION} "--without-berkeley-db"
+CFLAGS="${CFLAGS} -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY=1" \
+    ipkg ${SQLITE} "--enable-threadsafe --enable-readline --enable-dynamic-extensions"
+ipkg -j ${SUBVERSION} "--without-berkeley-db"
 ipkg ${SUDO}
 ipkg ${STRACE}
 ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
@@ -45,7 +38,9 @@ ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
 # Networking
 ipkg -m noac -s tcp_wrappers ${TCPWRAPPERS}
 ipkg -m noac ${PORTMAP}
-ipkg -m acnb ${NFS_UTILS} "--disable-nfsv4 \
+ipkg -m acnb ${NFS_UTILS} "\
+    --disable-nfsv4 \
+    --disable-nfsv41 \
     --sbindir=/sbin \
     --disable-tirpc \
     --disable-gss"
@@ -63,6 +58,7 @@ ipkg ${BIND} "--localstatedir=/var \
 ipkg ${IPTABLES}
 ipkg ${CURL}
 ipkg ${RSYNC}
+ipkg -m noac ${GETDATE}
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${MYSQL}
@@ -75,20 +71,23 @@ ipkg -m noac ${UNRAR}
 ipkg ${CPIO}
 
 ipkg ${PARTED} "--disable-device-mapper"
-ipkg ${ED}
 ipkg ${BC} "--with-readline"
 INIT_D_PATH=/etc/rc.d/init.d \
     ipkg -m acnb ${FUSE}
 ipkg -m noac ${DOSFSTOOLS}
-ipkg -m acnb ${GIT}
 
 # Perl modules
 ipkg -m pm ${PERL_MOD_PDL}
 ipkg -m pm ${PERL_MOD_XML_WRITER}
 ipkg -m pm ${PERL_MOD_XML_PARSER}
 
+# Grep alternative
+ipkg -m noac ${ACK}
+ipkg -m noac ${COLORDIFF}
+
 ipkg ${INTLTOOL}
-ipkg ${PYTHON} "--enable-shared"
+
+ipkg -m acnb ${GIT}
 
 # DocBook
 ipkg -m acnb ${SGML_COMMON}
@@ -107,21 +106,101 @@ ipkg -m noac ${XMLTOMAN}
 ipkg ${XMLTO}
 
 # Graphic libraries
-ipkg ${LIBJPEG} "--enable-static --enable-shared"
-ipkg -m noac ${LIBOPENJPEG}
 ipkg ${LIBPNG}
+ipkg ${TIFF}
+ipkg -m acnb ${LCMS}
+ipkg ${LIBJPEG} "--enable-static --enable-shared"
+ipkg -m acnb ${LIBOPENJPEG}
 ipkg ${LIBART}
 ipkg ${LIBEXIF}
 ipkg ${FRIBIDI}
 ipkg -m acnb ${HICOLOR_ICON_THEME}
-ipkg ${TIFF}
 ipkg ${GIFLIB}
-ipkg -m acnb ${LCMS}
 ipkg -m noac ${LIBMNG}
 
 ipkg ${FREETYPE}
 ipkg ${FONTCONFIG}
 
-echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
+ipkg -m noac ${CKERMIT}
+
+ipkg ${LIBTASN1}
+ipkg ${LIBUNISTRING}
+ipkg ${BDWGC}
+ipkg ${GUILE} \
+    --enable-posix \
+    --disable-static \
+    --enable-networking \
+    --enable-regex
+ipkg ${LIBGPG_ERROR}
+ipkg ${LIBGCRYPT}
+ipkg ${NETTLE}
+ipkg -m acnb ${GNUTLS}
+
+# Mail
+ipkg -l "${SASL2}-pass1" -s "cyrus-sasl" ${SASL2}
+ipkg ${OPENLDAP}
+ipkg -l "${SASL2}-pass2" -s "cyrus-sasl" ${SASL2}
+ipkg -s "krb5" ${KERBEROS5}
+
+if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    ipkg -m noac ${SENDMAIL}
+else
+    ipkg ${MSMTP}
+fi
+
+ipkg ${GNUPG} "--libexecdir=/usr/lib"
+ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl --enable-hcache"
+
+# Audio
+if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    if [ "x${SOUND_CARD}" = "xyes" ]; then
+        # Utilitaires
+        ipkg -m acnb ${NASM}
+
+        ipkg ${ALSA_LIB}
+        ipkg -m acnb ${ALSA_UTILS}
+
+        ipkg -m acnb ${CDPARANOIA}
+
+        ipkg -m noac -s "ladspa" ${LADSPA}
+
+        # Audio file formats
+	ipkg ${LIBOGG}
+	ipkg ${LIBVORBIS}
+	ipkg -m acnb ${FLAC}
+
+	ipkg ${LIBSNDFILE}
+        ipkg -m acnb ${VAMP}
+        ipkg ${FFTW} "--with-pic"
+        ipkg ${LIBSAMPLERATE}
+	ipkg ${LAME}
+        CFLAGS="-fPIC ${CFLAGS}" ipkg ${LIBA52} "--enable-shared"
+
+	ipkg ${LIBID3TAG}
+	ipkg ${LIBMAD}
+
+        ipkg -m acnb ${LIBFAAC}
+        ipkg -m acnb ${LIBFAAD2}
+        ipkg ${LIBTHEORA}
+        ipkg ${XVIDCORE}
+
+        # Audio libraries
+	ipkg -m acnb ${AUDIOFILE}
+        ipkg ${PORTAUDIO}
+        ipkg -m acnb ${RUBBERBAND}
+
+        # Audio servers
+        ipkg ${SPEEX}
+	ipkg ${JACK} "--disable-portaudio --libdir=/usr/lib"
+
+	ipkg ${ALSA_PLUGINS}
+	ipkg ${VORBIS_TOOLS}
+
+	ipkg ${MOC}
+    fi
+fi
+
+write_completed_stage
+display_stage_build_stats
 
 exit $?