X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fhv-install-1;h=6434fe700dd8dfe842ee261e5cfa93089d3bd55e;hb=f09e4ad6942319f2d272034fc6e15dc6159dee37;hp=f2c52ad9b4b8bcd586e9084d60846a1130336295;hpb=19609cec14f0e747c491985785c4d714f7f654de;p=hvlinux.git

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index f2c52ad..6434fe7 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-hvtrap_setup
-source ../packages-list
+source ../functions/main
 source /etc/profile
 
 if [ "x${USER}" != "xroot" ]; then
@@ -24,7 +20,7 @@ ipkg -m noac ${PCIUTILS}
 ipkg -m acnb ${LIBUSB}
 ipkg ${LIBUSB_COMPAT}
 ipkg ${USBUTILS}
-ipkg ${FCRON}
+ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
 ipkg ${EXPAT}
@@ -33,7 +29,7 @@ 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"
+ipkg -j ${SUBVERSION} "--without-berkeley-db"
 ipkg ${SUDO}
 ipkg ${STRACE}
 ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
@@ -63,6 +59,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}
@@ -122,6 +119,79 @@ 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 ${GUILE} \
+    --enable-posix \
+    --disable-static \
+    --enable-networking \
+    --enable-regex
+ipkg ${LIBGPG_ERROR}
+ipkg ${LIBGCRYPT}
+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 -m acnb ${SSMTP}
+fi
+
+ipkg ${GNUPG} "--libexecdir=/usr/lib"
+ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl"
+
+if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    # Audio
+    if [ "x${SOUND_CARD}" = "xyes" ]; then
+        # Needed by some packages, mostly audio applications.
+        #ipkg ${LIBOIL}
+
+        ipkg -m acnb ${NASM}
+
+        ipkg ${ALSA_LIB}
+        ipkg -m acnb ${ALSA_UTILS}
+
+        # Audio raw utilities
+        ipkg ${LIBSAMPLERATE}
+
+        # Audio file formats
+	ipkg ${LIBOGG}
+	ipkg ${LIBVORBIS}
+	ipkg -m acnb ${FLAC}
+	ipkg ${LAME}
+        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 ${LIBSNDFILE}
+
+        # Audio servers
+        ipkg ${SPEEX}
+	ipkg ${JACK} "--disable-portaudio"
+
+	ipkg ${ALSA_PLUGINS} # Depends on pulseaudio
+	ipkg ${VORBIS_TOOLS}
+
+	ipkg ${MOC}
+    fi
+fi
+
+write_completed_stage
+display_stage_build_stats
 
 exit $?