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

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 8e4f869..cd4b8be 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -3,11 +3,7 @@
 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
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
@@ -16,7 +12,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBSIGCPP}
     ipkg ${JASPER} "--enable-shared"
     ipkg -m acnb ${GLIBMM}
-    ipkg ${CAIRO}
+    ipkg ${CAIRO} "--enable-tee"
     ipkg ${CAIROMM}
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
@@ -35,7 +31,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${HVCLOCK}
     ipkg ${WMNOTIFY}
 
-    # Needed by GNOME-2
+    # Needed by Gnome
     ipkg ${DESKTOP_FILE_UTILS}
     ipkg -m acnb ${SHARED_MIME_INFO}
     ipkg ${STARTUP_NOTIFICATION}
@@ -44,24 +40,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBXKLAVIER}
     ipkg ${LIBGLADE}
     ipkg ${LIBIDL} # Dépendence de quoi??
-
-    # GNOME-2.X configuration
-    rscr mult "Configuring ${GNOME2_VER}" gnome-config
-    source /etc/profile
-
-    ipkg_gnome ${ORBIT2}
-    ipkg ${GCONF}
+    ipkg ${ORBIT2}
+    ipkg -m acnb ${GCONF}
     ipkg ${LIBPROXY} "--with-gnome"
-    ipkg_gnome ${GNOME_KEYRING}
-    ipkg ${LIBSOUP}
+    ipkg ${GNOME_KEYRING}
+    ipkg ${LIBSOUP} "--without-gnome"
 fi
 
 ipkg ${HELP2MAN}
 ipkg ${GSL}
 ipkg -m acnb ${CUPS}
 ipkg -m noac ${CUPS_PDF}
-ipkg ${SPLIX}
-ipkg ${GHOSTSCRIPT}
+ipkg -m noac ${SPLIX}
+ipkg -m acnb ${GHOSTSCRIPT}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -73,35 +64,23 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${GEGL}
     ipkg ${GIMP} "--disable-print"
     ipkg -m acnb ${GUTENPRINT}
-    ipkg -m noac ${BOOST}
-    # inkscape-0.47 has a problem with poppler >= 0.12.2
-    # Try 0.48.1
+    ipkg -s boost -m noac ${BOOST}
     ipkg ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
 fi
 
-ipkg ${CDRTOOLS}
-ipkg ${DVDRWTOOLS}
+ipkg -m noac ${CDRTOOLS}
+ipkg -m noac ${DVDRWTOOLS}
 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
-
-    # 'Five years old' bug --> Change the date to something in 2004 before
-    # installing.
-    # jadetex is installed automatically by TeX-Live
-    ipkg ${JADETEX}
+    rscr once "Installing TexLive texmf" install-texlive-texmf
+    ipkg -s texlive ${TEXLIVE}
 fi
 
 if [ "x${SANE_SUPPORT}" = "xyes" ]; then
-    ipkg ${SANE_BACKENDS}
+    ipkg -m acnb ${SANE_BACKENDS}
     ipkg ${XSANE}
 fi
 
@@ -118,21 +97,24 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${LIBOIL}
 
         # Audio applications
-	ipkg -m acnb ${GRIP} "--disable-id3"
+	###ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
-        ipkg ${EASYTAG}
-        ipkg -m acnb ${LILYPOND}
+        ipkg -m acnb ${EASYTAG}
+        ipkg -m acnb ${FONTFORGE}
+        ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
 
-        ipkg -m acnb ${FFMPEG}
+        ipkg ${FFMPEG}
     fi
 
     ipkg ${SYLPHEED} "--enable-ssl --enable-ldap"
-    ipkg ${NSS}
-    ipkg ${FIREFOX}
+    ipkg ${LIBNOTIFY}
+    ipkg ${YASM}
+    ipkg -m noac ${FIREFOX}
 
-    # Plugins for Firefox
-    ipkg ${AGG}
+    # VLC
+    #./configure --prefix=/usr --sysconfdir=/etc  --disable-lua --disable-qt4 --disable-skins2 --enable-mozilla
     ipkg ${GNASH}
+    # GtkGLExt gstreamer SDL xulrunner
 fi
 
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"
@@ -179,21 +161,21 @@ if [ "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${LTSP_UTILS}
 fi
 
-ipkg -m acnb ${KVM}
-ipkg -m acnb ${BRIDGE_UTILS}
-ipkg ${UML_UTILITIES}
+#ipkg -m acnb ${KVM}
+#ipkg -m acnb ${BRIDGE_UTILS}
+#ipkg ${UML_UTILITIES}
 
 ipkg ${TRANSMISSION} "--disable-daemon"
 
 # Électronique
-ipkg ${LIBGEDA}
-ipkg ${GEDA_SYMBOLS}
-ipkg ${GEDA_GSCHEM}
-ipkg ${GEDA_GNETLIST}
-ipkg ${GEDA_SYMCHECK}
-ipkg ${GEDA_GATTRIB}
-
-rscr mult  "Performing post-install" cis-post-install
+#ipkg ${LIBGEDA}
+#ipkg ${GEDA_SYMBOLS}
+#ipkg ${GEDA_GSCHEM}
+#ipkg ${GEDA_GNETLIST}
+#ipkg ${GEDA_SYMCHECK}
+#ipkg ${GEDA_GATTRIB}
+
+#rscr mult  "Performing post-install" post-install
 
 write_completed_stage
 display_stage_build_stats