X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fstage4-install;h=0bffeb0a7ca1244d08673a9860672964e36dbb4e;hb=80b7cf97e54dcc2b102b89d00e7963161c4cb639;hp=445c19c99b3567beb55d701decfbee5c63be84ea;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage4/stage4-install b/stage4/stage4-install
index 445c19c..0bffeb0 100755
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-export LFS_PKG_DIR="$(dirname $(dirname $(pwd)))/packages/stage4"
-export LFS_LOG_DIR=/var/log/hvlinux-install/stage4
-export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
-export LFS_TMP=/tmp
+LFS_STAGE=stage4
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
@@ -11,6 +8,11 @@ source ../functions
 source ../packages-list
 source /etc/profile
 
+export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
+export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE}
+export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
+export LFS_TMP=${LFS}/tmp
+
 if [ "x${USER}" != "xroot" ]; then
     echo "You must be the superuser to install hvlinux."
     exit 1
@@ -18,102 +20,30 @@ fi
 
 init_log_file
 
-# GNOME-2.X configuration
-
-action_checkbox "Configuring ${GNOME2_VER}" ./cis-gnome-config
-action_checkbox "Reloading /etc/profile" source /etc/profile
-
-# Gnome 2 core packages
-ipkg_gnome ${ORBIT2}
-ipkg_gnome ${LIBBONOBO}
-ipkg_gnome ${GCONF}
-ipkg       ${GNOME_MIME_DATA} cis-gnome-mime-data
-ipkg_gnome ${GNOME_VFS}
-ipkg_gnome ${LIBGNOME}
-ipkg_gnome ${LIBGNOMECANVAS}
-ipkg_gnome ${LIBBONOBOUI}
-ipkg_ac    ${GNOME_ICON_THEME}
-ipkg_gnome ${GNOME_KEYRING}
-ipkg_gnome ${LIBGNOMEUI}
-ipkg_ac    ${GNOME_THEMES}
-ipkg       ${SCROLLKEEPER} cis-scrollkeeper
-ipkg_gnome ${GNOME_DOC_UTILS}
-ipkg_gnome ${GNOME_DESKTOP}
-ipkg_gnome ${GNOME_BACKGROUNDS}
-ipkg_gnome ${GNOME_MENUS}
-ipkg_gnome ${GNOME_PANEL}
-ipkg_ac    ${GSTREAMER}
-ipkg_ac    ${GST_PLUGINS_BASE}
-ipkg_ac    ${GST_PLUGINS_GOOD}
-ipkg_ac    ${GST_PLUGINS_UGLY}
-ipkg_ac    ${GST_FFMPEG}
-ipkg       ${VTE} cis-vte
-ipkg_gnome ${GNOME_TERMINAL}
-ipkg_gnome ${LIBGTOP}
-ipkg_gnome ${LIBGNOMEKBD}
-ipkg       ${GAIL} cis-gail
-ipkg       ${GNOME_APPLETS} cis-gnome-applets
-ipkg_gnome ${EEL}
-ipkg_gnome ${NAUTILUS}
-ipkg_gnome ${YELP}
-ipkg       ${METACITY} cis-metacity
+# Scripts directory
+export SCRDIR=$(pwd)
 
-ipkg_gnome ${GNOME_CONTROL_CENTER}
-ipkg_gnome ${GNOME_SESSION}
-ipkg_gnome ${GNOME_USER_DOCS}
-action_checkbox "Updating the MIME-type application database" update-desktop-database
+export XORG_PREFIX=/usr
+export XORG_CONFIG="\
+    --mandir=${XORG_PREFIX}/share/man \
+    --localstatedir=/var"
 
-# Gnome 2 additional packages - Libraries
-ipkg_gnome ${LIBGNOMECUPS}
-ipkg_gnome ${LIBGNOMEPRINT}
-ipkg_gnome ${LIBGNOMEPRINTUI}
-ipkg_gnome ${GTKHTML}
-ipkg       ${EVOLUTION_DATA_SERVER} cis-evolution-data-server
-ipkg_gnome ${GTKSOURCEVIEW}
-ipkg       ${SYSTEM_TOOLS_BACKENDS} cis-gnome-nobuild
-ipkg       ${GNOME_AUDIO} cis-gnome-audio
+MOD_NAME=$(get_pkg_name ${XORG_PROTO})
 
-# Gnome 2 additional packages - Utilities
-ipkg       ${GEDIT} cis-gedit
-ipkg_gnome ${EOG}
-ipkg_gnome ${EVINCE}
-ipkg_gnome ${GGV} # Gnome Ghostview
-ipkg_gnome ${FILE_ROLLER}
-ipkg_gnome ${GCONF_EDITOR}
-ipkg_gnome ${GNOME_UTILS}
-ipkg_gnome ${GNOME_SYSTEM_MONITOR}
-ipkg_gnome ${NAUTILUS_CD_BURNER}
-ipkg_gnome ${GNOME_MEDIA}
-ipkg_gnome ${GNOME_NETSTATUS}
-ipkg       ${GCALCTOOL} cis-gnome-nobuild
-ipkg_gnome ${GUCHARMAP}
-ipkg_gnome ${ZENITY}
-ipkg_gnome ${GNOME_KEYRING_MANAGER}
+LFS_PKG_DIR_ORIG=${LFS_PKG_DIR}
 
-# Needs hal, which needs D-BUS...
-ipkg_gnome ${GNOME_VOLUME_MANAGER}
+# build packages
+for package in $(grep -v '^#' ${LFS_PKG_DIR}/${XORG_PROTO}.wget); do
+    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${MOD_NAME}
+    SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
+    ##echo PKG=$SUBMOD
+    ipkg_ac ${SUBMOD} ${XORG_CONFIG}
+done
 
-ipkg       ${LIBMUSICBRAINZ} cis-libmusicbrainz
-ipkg_gnome ${GNOME_SOUND_JUICER}
-ipkg_ac    ${ISO_CODES}
-ipkg_gnome ${GNOME_TOTEM}
-ipkg       ${GDM} cis-gdm
-ipkg_ac    ${LIBNOTIFY}
-ipkg       ${GNOME_MOUNT} cis-gnome-nobuild
 
-ipkg_ac    ${LIBGSF}
-ipkg       ${PCRE} cis-pcre
-ipkg       ${GOFFICE} cis-ac-nobuild # Depends on libgsf and pcre
-ipkg       ${GNUMERIC} cis-gnumeric # Depends on GOffice
 
-ipkg_ac    ${WV} # Needed by Abiword
-ipkg_ac    ${ABIWORD} "--disable-spellcheck"
-ipkg       ${EVOLUTION}          cis-evolution
-ipkg       ${EVOLUTION_EXCHANGE} cis-evolution-exchange
+#source /etc/profile
 
-ipkg_ac    ${LIBGPG_ERROR}
-ipkg_ac    ${LIBGCRYPT}
-ipkg_ac    ${GNUTLS}
-ipkg_ac    ${PIDGIN}
+#rscr mult  "Performing post-install" cis-post-install
 
 exit $?