Mise à niveau début du stage3 avant X-window

[hvlinux.git] / stage3 / stage3-install

diff --git a/stage3/stage3-install b/stage3/stage3-install
index ada115a..73083fa 100755 (executable)
--- a/stage3/stage3-install
+++ b/stage3/stage3-install
@@ -1,7 +1,9 @@
 #!/bin/sh
 
-export LFS_PKG_DIR="$(dirname $(pwd))/packages/stage3"
-export LFS_LOG_DIR=/var/log/hvlinux-install/stage3
+LFS_STAGE=stage3
+
+export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
+export LFS_LOG_DIR=/var/log/hvlinux-install/${LFS_STAGE}
 export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
 export LFS_TMP=/tmp
 
@@ -18,62 +20,72 @@ fi
 
 init_log_file
 
-# For updating dynamic DNS entries.
-if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then
-    ipkg_cust ${DDCLIENT} cis-ddclient
-fi
+ipkg_ac    ${PCRE} \
+    --docdir=/usr/share/doc/pcre \
+    --enable-utf8 \
+    --enable-unicode-properties \
+    --enable-pcregrep-libz \
+    --enable-pcregrep-libbz2
+ipkg_ac    ${STRACE}
 
 # Networking
 ipkg_cust  ${INETUTILS} cis-inetutils
-
-# Network/debugging tools
+if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then
+    # For updating dynamic DNS entries.
+    ipkg_cust ${DDCLIENT} cis-ddclient
+fi
 ipkg_ac    ${LIBPCAP} "--enable-yydebug"
 ipkg_ac    ${TCPDUMP}
 ipkg_ac_nb ${NMAP}
-ipkg_ac    ${STRACE}
-
-# Bind server
-ipkg_cust ${BIND} cis-bind
+ipkg_cust  ${BIND} cis-bind
+ipkg_cust  ${IPTABLES} cis-iptables
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    ipkg_cust ${IPTABLES} cis-iptables
     ipkg_cust ${MYSQL} cis-mysql
 fi
 
-ipkg_cust  ${UNZIP} cis-unzip
 ipkg_cust  ${ZIP}   cis-zip
+ipkg_cust  ${UNZIP} cis-unzip
+ipkg_cust  ${UNRAR} cis-unrar
 ipkg_ac    ${CPIO}
-
-# Installing only CVS client.
-ipkg_ac    ${CVS_PACKAGE} "--disable-server"
-
 ipkg_ac    ${PARTED}
-
+ipkg_ac    ${CURL}
 ipkg_ac    ${RSYNC}
+ipkg_ac    ${ED}
+ipkg_ac    ${BC} "--with-readline"
+INIT_D_PATH=/etc/rc.d/init.d \
+    ipkg_ac_nb ${FUSE}
+ipkg_cust  ${DOSFSTOOLS} cis-dosfstools
+ipkg_ac    ${CVS} "--disable-server"
+ipkg_ac_nb ${GIT}
+ipkg_cust  ${GIT_MANPAGES} cis-git-manpages
 
-# Graphic libraries
+# Graphic libraries without X-Window dependencies
 ipkg_ac    ${LIBJPEG} "--enable-static --enable-shared"
+ipkg_cust  ${LIBOPENJPEG}
 ipkg_ac    ${LIBPNG}
-ipkg_ac    ${LIBTIFF}
-ipkg_ac    ${GIFLIB}
-ipkg_ac_nb ${LCMS}
-ipkg_cust  ${LIBMNG}   cis-libmng
-ipkg_ac    ${LIBEXIF}
 ipkg_ac    ${LIBART}
+ipkg_ac    ${LIBEXIF}
 ipkg_ac    ${FRIBIDI}
 
-# X
+# X-Window
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg_ac   ${FREETYPE}
     ipkg_cust ${FONTCONFIG}  cis-fontconfig
-    ipkg_cust ${T1LIB}       cis-t1lib
     ipkg_cust ${XFREE86}     cis-xfree86
     source /etc/profile
 
-    # Some packages (Gnome control center) require a more
-    # recent version of libxft than the one installed by XFree86.
-    ipkg_ac   ${LIBXFT}  "--prefix=/usr/X11R6"
+    ipkg_cust ${T1LIB}       cis-t1lib
+    ipkg_cust ${TK}  cis-tk
+fi
+
+# Graphic libraries with optional X-Window dependencies
+ipkg_ac    ${LIBTIFF}
+ipkg_ac    ${GIFLIB}
+ipkg_ac_nb ${LCMS}
+ipkg_cust  ${LIBMNG}   cis-libmng
 
+if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg_cust ${WINDOWMAKER} cis-windowmaker
     ipkg_ac   ${WINDOWMAKER_EXTRA}
 
@@ -83,11 +95,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_cust ${EMACS} cis-emacs
 fi
 
-ipkg_cust ${TK}  cis-tk
-
-ipkg_ac ${PYTHON} "--enable-shared"
-
-ipkg_cust${LIBBOOST} cis-boost
+ipkg_ac   ${PYTHON} "--enable-shared"
+ipkg_cust ${LIBBOOST} cis-boost
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     # DocBook
@@ -140,11 +149,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_ac    ${CAIRO} "--enable-glitz"
     ipkg_ac    ${PANGO}
     ipkg_ac    ${ATK}
-    ipkg_ac    ${GTK2} "--without-libjasper"
+    ipkg_ac    ${GTK} "--without-libjasper"
     ipkg_ac    ${GTK_ENGINES}
     ipkg_ac    ${PYGOBJECT}
     ipkg_ac    ${PYGTK}
-
     ipkg_ac    ${LIBSIGCPP}
     ipkg_ac    ${GC}
     ipkg_ac    ${GLIBMM}
@@ -166,6 +174,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_ac    ${LIBIDL}
 fi
 
+ipkg_ac   ${HELP2MAN}
 ipkg_ac   ${INTLTOOL}
 ipkg_ac   ${GSL}
 ipkg_cust ${CUPS}     cis-cups
@@ -185,12 +194,13 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_ac    ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
 fi
 
-ipkg_ac   ${BC} "--with-readline"
 ipkg_cust ${CDRTOOLS} cis-cdrtools
 ipkg_cust ${DVDRWTOOLS} cis-dvd-rw-tools
+ipkg_ac   ${LIBDVDCSS}
+ipkg_ac   ${LIBDVDREAD} "--with-libdvdcss"
+ipkg_cust ${DVDFS} cis-dvdfs
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    ipkg_ac   ${ED}
     ipkg_cust ${TETEX_SRC} cis-tetex
     ipkg_cust ${JADETEX}   cis-jadetex
 fi
@@ -300,7 +310,6 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     # Apache
     ipkg_cust ${HTTPD} cis-apache
-    ipkg_ac   ${CURL}
     ipkg_cust ${PHP}   cis-php
 
     ipkg_cust ${SQUIRRELMAIL} cis-squirrelmail
@@ -313,9 +322,6 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg_ac   ${INDENT}
 fi
 
-    ipkg_ac_nb ${GIT}
-    ipkg_cust  ${GIT_MANPAGES} cis-git-manpages
-
 if [ "x${USE_SAMBA}" = "xyes" ]; then
     ipkg_cust ${SAMBA} cis-samba
 fi
@@ -336,23 +342,12 @@ ipkg_cust  ${CKERMIT} cis-ckermit
 # BitTorrent client
 ipkg_ac    ${TRANSMISSION} "--disable-daemon"
 
-# For bitbake
-ipkg_ac    ${HELP2MAN}
-
-ipkg_ac    ${LIBDVDCSS}
-ipkg_ac    ${LIBDVDREAD} "--with-libdvdcss"
-INIT_D_PATH=/etc/rc.d/init.d \
-    ipkg_ac_nb ${FUSE}
-ipkg_cust  ${DVDFS} cis-dvdfs
-
-ipkg_cust  ${DOSFSTOOLS} cis-dosfstools
-
 ipkg_ac    ${LIBFFI}
 ipkg_ac    ${GOBJECT_INSTROSPECTION}
 
 ipkg_cust  ${POLKIT} cis-polkit
 ipkg_ac    ${GNUPG} "--libexecdir=/usr/lib"
 
-./cis-postinstall
+rscr mult  "Performing post-install" cis-post-install
 
 exit $?