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

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 798e25d..37297bd 100755
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -1,10 +1,6 @@
 #!/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
@@ -56,15 +52,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"