X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=161784582ebb7fa185e43d953ed54e3efd9df8ef;hb=bdd3347ff8920ece383a232d12aef0d3720c8bff;hp=293dae4ef37ab15374212a5a04ad8d64bdbe923a;hpb=0dcecf1e56bd53b7925216333e2d089712eaf5a6;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 293dae4..1617845 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -17,11 +17,12 @@ ipkg -m noac ${SPLIX}
 ipkg ${FOOMATIC_FILTERS}
 ipkg -m noac ${FOO2ZJS}
 
+ipkg ${ITSTOOL}
+
 ipkg ${GLIB_NETWORKING} "\
     --libexecdir=/usr/lib/glib-networking \
     --with-ca-certificates=/etc/ssl/ca-bundle.crt \
     --disable-static"
-ipkg -s "icu" ${ICU}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -34,7 +35,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
     ipkg ${ATK}
-    ipkg ${GDK_PIXBUF}
+    ipkg ${GDK_PIXBUF} "--with-x11"
     ipkg ${GTK} "--disable-gtk-doc"
     ipkg ${ATKMM}
     ipkg ${GTKMM} "--disable-documentation"
@@ -49,7 +50,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${WMNOTIFY}
 
     ipkg ${DESKTOP_FILE_UTILS}
-    ipkg -m acnb ${SHARED_MIME_INFO}
+    ipkg -m acnb -j ${SHARED_MIME_INFO}
     ipkg ${STARTUP_NOTIFICATION}
     ipkg ${LIBWNCK}
     ipkg ${ISO_CODES}
@@ -58,6 +59,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -m acnb ${GCONF}
     ipkg ${GNOME_KEYRING}
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
+
+    ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
 fi
 
 ipkg ${GPARTED} "--disable-doc"
@@ -120,6 +123,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${VTE} "--libexecdir=/usr/lib/vte --disable-gtk-doc"
         ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
+        ipkg ${ID3LIB}
         ipkg -m acnb ${EASYTAG}
         ipkg -m acnb ${FONTFORGE} "--enable-double"
 
@@ -155,37 +159,53 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg ${LIBNOTIFY}
     ipkg ${LIBVPX} "--enable-shared"
 
-    ipkg -m acnb -t -j ${WEBKIT} "\
-        --libexecdir=/usr/lib/WebKitGTK \
-        --with-gstreamer=0.10 \
-        --enable-introspection \
-        --with-gtk=2.0 \
-        --disable-geolocation \
-        --disable-gtk-doc"
-    ipkg ${VALA}
-    NOCOLOR=1 ipkg ${MIDORI}
+    if [ "x${USE_WEBKIT}" = "xyes" ]; then
+        ipkg -m acnb -t -j ${WEBKIT} "\
+            --libexecdir=/usr/lib/WebKitGTK \
+            --with-gstreamer=0.10 \
+            --enable-introspection \
+            --with-gtk=2.0 \
+            --disable-geolocation \
+            --disable-gtk-doc"
+        ipkg ${VALA}
+        NOCOLOR=1 ipkg ${MIDORI}
+    fi
 
+    ipkg ${LIBEVENT}
+    ipkg -m noac ${NSPR} "--with-mozilla --with-pthreads \
+        $([ $(uname -m) = x86_64 ] && echo --enable-64bit)"
+    ipkg -m noac ${NSS}
     ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
     ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
 
+    ipkg -m noac ${KEYUTILS}
+    ipkg -s ecryptfs-utils ${ECRYPTFS_UTILS}
+
     ipkg -s qt ${QT}
     source /etc/profile
     ipkg -m noac ${LUA}
     ipkg -m acnb ${VLC}  "--enable-mozilla --enable-qt4 --enable-ncurses"
     ipkg ${SDL}
     ipkg -m noac ${AGG}
-    ipkg ${GNASH}
+    if [ "x${USE_GNASH}" = "xyes" ]; then
+        ipkg ${GNASH}
+    fi
 fi
 
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"
 ipkg ${MENU_CACHE}
 ipkg ${GVFS}
 ipkg ${XARCHIVER}
+ipkg ${GNOME_MENUS}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
 
-ipkg -s apache ${HTTPD} # Apache
-ipkg ${LIGHTTPD}
+if [ "x${USE_HTTPD}" = "xyes" ]; then
+    ipkg -s apache ${HTTPD}
+fi
+if [ "x${USE_LIGHTTPD}" = "xyes" ]; then
+    ipkg ${LIGHTTPD}
+fi
 ipkg ${PHP}
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -211,16 +231,20 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
 
-    # Subversion server (client was already installed in stage2)
-    ipkg ${SUBVERSION}
-
-    ipkg ${LIBGSF}
-    ipkg -m acnb ${GOFFICE}
-    ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"
-    ipkg ${WV}
-    ipkg ${ABIWORD} "--disable-spellcheck"
+    if [ x"${SVN_SERVER}" == xyes ]; then
+        # Subversion server (client was already installed in stage3)
+        ipkg ${SUBVERSION}
+    fi
 fi
 
+ipkg ${LIBGSF}
+ipkg -m acnb ${GOFFICE}
+ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"
+ipkg ${WV}
+ipkg ${ABIWORD} "--disable-spellcheck"
+
+ipkg -m noac ${MERCURIAL}
+
 ipkg ${INDENT}
 
 if [ "x${USE_SAMBA}" = "xyes" ]; then
@@ -232,20 +256,25 @@ if [ "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${LTSP_UTILS}
 fi
 
-ipkg -m acnb ${KVM}
+ipkg -j ${QEMU} "--libexecdir=/usr/lib/qemu \
+    --docdir=/usr/share/doc/qemu-1.7.0 \
+    --target-list=x86_64-softmmu"
 ipkg -m acnb ${BRIDGE_UTILS}
 ipkg -m noac ${TUNCTL}
 
-ipkg ${LIBEVENT}
 ipkg ${TRANSMISSION} "--disable-daemon"
 
 # Électronique
-#ipkg ${LIBGEDA}
-#ipkg ${GEDA_SYMBOLS}
-#ipkg ${GEDA_GSCHEM}
-#ipkg ${GEDA_GNETLIST}
-#ipkg ${GEDA_SYMCHECK}
-#ipkg ${GEDA_GATTRIB}
+ipkg ${GEDA_GAF}
+ipkg ${AVRDUDE} "--disable-parport"
+
+# Astronomie
+ipkg -m noac ${STELLARIUM}
+ipkg ${GTKGLEXT}
+ipkg -m acnb ${CELESTIA} "--with-gtk"
+
+ipkg -m noac ${I2C_TOOLS}
+ipkg -m noac ${HDPARM}
 
 rscr mult  "Performing post-install" post-install