X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=8e4f869d8bb3ffebafac6cfc54a00cd47da7d60c;hb=cd68b17a1d099da4165c6502f3c37a99ddbe306c;hp=55940a69659bb8ea639644bc0543d5f21eda6c6e;hpb=76d0fb8907b4f4d497ff9f6d20293907ff2a5589;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 55940a6..8e4f869 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -15,18 +15,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     # Gtk
     ipkg ${LIBSIGCPP}
     ipkg ${JASPER} "--enable-shared"
-    ipkg ${GTK_DOC}
-    ipkg ${GLIBMM}
+    ipkg -m acnb ${GLIBMM}
     ipkg ${CAIRO}
     ipkg ${CAIROMM}
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
     ipkg ${ATK}
-    ipkg ${GTK}
-    ipkg ${GTKMM}
+    ipkg ${GDK_PIXBUF}
+    ipkg ${GTK} "--disable-gtk-doc-html"
+    ipkg ${ATKMM}
+    ipkg ${GTKMM} "--disable-documentation"
     ipkg ${GTK_ENGINES}
+    ipkg -m acnb ${PYCAIRO}
     ipkg ${PYGOBJECT}
-    ipkg ${PYCAIRO}
     ipkg ${PYGTK}
     ipkg ${GC}
 
@@ -36,25 +37,16 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
 
     # Needed by GNOME-2
     ipkg ${DESKTOP_FILE_UTILS}
-    ipkg ${SHARED_MIME_INFO}
+    ipkg -m acnb ${SHARED_MIME_INFO}
     ipkg ${STARTUP_NOTIFICATION}
     ipkg ${LIBWNCK}
     ipkg ${ISO_CODES}
     ipkg ${LIBXKLAVIER}
     ipkg ${LIBGLADE}
-    ipkg ${LIBTASN1}
-    ipkg ${GUILE} \
-        --enable-posix \
-        --disable-static \
-        --enable-networking \
-        --enable-regex
-    ipkg ${LIBGPG_ERROR}
-    ipkg ${LIBGCRYPT}
-    ipkg -m acnb ${GNUTLS}
-    ipkg ${LIBIDL}
+    ipkg ${LIBIDL} # Dépendence de quoi??
 
     # GNOME-2.X configuration
-    rscr mult "Configuring ${GNOME2_VER}" ./cis-gnome-config
+    rscr mult "Configuring ${GNOME2_VER}" gnome-config
     source /etc/profile
 
     ipkg_gnome ${ORBIT2}
@@ -71,7 +63,8 @@ ipkg -m noac ${CUPS_PDF}
 ipkg ${SPLIX}
 ipkg ${GHOSTSCRIPT}
 
-if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+if [ "x${INST_TYPE}" = "xworkstation" -o \
+    "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${IMAGE_MAGICK} "--with-modules --with-gslib=/usr/lib"
     # xpdf headers needed by inkscape
     ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib"
@@ -92,6 +85,12 @@ ipkg ${LIBDVDCSS}
 ipkg ${LIBDVDREAD} "--with-libdvdcss"
 ipkg -m noac ${DVDFS}
 
+
+
+exit 1
+
+
+
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${TETEX_SRC} cis-tetex
 
@@ -118,42 +117,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         # Needed by some packages, mostly audio applications.
         ipkg ${LIBOIL}
 
-        # ALSA
-	ipkg ${ALSA_LIB}
-	ipkg ${ALSA_UTILS}
-	ipkg ${ALSA_OSS}
-
-        # 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 ${ESOUND} # Necessary????
-        ipkg ${SPEEX}
-        ##ipkg ${PULSEAUDIO}
-	ipkg ${JACK} "--disable-portaudio"
-
-	ipkg ${ALSA_PLUGINS} # Depends on pulseaudio
-	ipkg ${VORBIS_TOOLS}
-
         # Audio applications
 	ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
@@ -175,14 +138,6 @@ fi
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"
 ipkg ${PCMANFM}
 
-# Mail
-ipkg ${SASL2}
-if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    ipkg ${OPENLDAP}
-fi
-ipkg ${KERBEROS5}
-ipkg -m noac ${SENDMAIL} # Replace by SSMTP for workstation...
-
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${PROCMAIL}
     ipkg -m noac ${LIBSPF2}
@@ -208,13 +163,13 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
-    ipkg ${MUTT} "--enable-imap --with-ssl"
 
-    # Subversion server (client was already installed in stage2) 
+    # Subversion server (client was already installed in stage2)
     ipkg ${SUBVERSION}
-    ipkg ${INDENT}
 fi
 
+ipkg ${INDENT}
+
 if [ "x${USE_SAMBA}" = "xyes" ]; then
     ipkg ${SAMBA}
 fi
@@ -228,12 +183,9 @@ ipkg -m acnb ${KVM}
 ipkg -m acnb ${BRIDGE_UTILS}
 ipkg ${UML_UTILITIES}
 
-ipkg -s ckermit ${CKERMIT}
-
 ipkg ${TRANSMISSION} "--disable-daemon"
 
-ipkg ${GNUPG} "--libexecdir=/usr/lib"
-
+# Électronique
 ipkg ${LIBGEDA}
 ipkg ${GEDA_SYMBOLS}
 ipkg ${GEDA_GSCHEM}
@@ -243,4 +195,7 @@ ipkg ${GEDA_GATTRIB}
 
 rscr mult  "Performing post-install" cis-post-install
 
+write_completed_stage
+display_stage_build_stats
+
 exit $?