X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fhv-install-1;h=e96602efbf253d1ad656bacd1bffc85187f14964;hb=166111908c2cff78986972e0d2668feb7ee9d42b;hp=798e25ddcb93cfe6366aa90aefc320b6ee426e4b;hpb=0315072ae3bd307eee71718e1a59f923edcbdaca;p=hvlinux.git

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 798e25d..e96602e 100755
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -1,17 +1,9 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-hvtrap_setup
-source ../config/packages-list
+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
 
 LFS_PKG_DIR_ORIG=${LFS_PKG_DIR}
@@ -56,15 +48,17 @@ install_xorg_modules()
     done
 }
 
-install_xorg_modules ${XORG_UTIL}
+ipkg_xorg ${XORG_UTIL_MACROS} "util"
 install_xorg_modules ${XORG_PROTO}
+ipkg_xorg ${XORG_MAKEDEPEND} "util"
 ipkg_xorg ${LIBXAU} "lib"
 ipkg_xorg ${LIBXDMCP} "lib"
 ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG}
 ipkg ${XCB_PROTO} ${XORG_CONFIG}
+ipkg ${LIBXCB} ${XORG_CONFIG}
+install_xorg_modules ${XORG_LIB}
 ipkg ${GPERF}
 ipkg ${XCB_UTIL} ${XORG_CONFIG}
-install_xorg_modules ${XORG_LIB}
 ipkg -m acnb ${LESSTIF}
 ipkg_xorg ${XBITMAPS} "data"
 ipkg ${LIBDRM} "--enable-udev"
@@ -86,7 +80,7 @@ ipkg -m acnb ${DBUS_GLIB} \
     --disable-tests \
     --libexecdir=/usr/lib/dbus-1.0/dbus-1
 ipkg ${EGGDBUS}
-ipkg ${POLKIT}
+ipkg -m acnb ${POLKIT}
 ipkg -m acnb ${CONSOLEKIT} \
     --libexecdir=/usr/lib/ConsoleKit \
     --localstatedir=/var \
@@ -121,4 +115,7 @@ ipkg ${PYTHON} "--enable-shared"
 ipkg -m acnb ${WINDOWMAKER}
 ipkg ${WINDOWMAKER_EXTRA}
 
+write_completed_stage
+display_stage_build_stats
+
 exit $?