Add libepoxy

[hvlinux.git] / stage4 / hv-install-1

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 9ca6f6a..8c93bd8 100755 (executable)
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -6,6 +6,8 @@ source /etc/profile
 check_for_root_user
 init_log_file
 
+VERSIONS_DIR="${SCRDIR}/versions"
+
 export XORG_CONFIG="\
     --mandir=/usr/share/man \
     --localstatedir=/var"
@@ -33,7 +35,7 @@ install_xorg_modules()
 
     local MY_XORG_CONFIG
 
-    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE}.wget); do
+    for package in $(grep -v '^#' ${VERSIONS_DIR}/${MODULE}.wget); do
         SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
         ipkg_xorg ${SUBMOD} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
     done
@@ -78,6 +80,7 @@ ipkg -m acnb ${DBUS_GLIB} \
     --disable-tests \
     --libexecdir=/usr/lib/dbus-1.0/dbus-1
 
+ipkg -m acnb -j ${LIBEPOXY}
 ipkg_xorg ${XORG_SERVER} "\
     --with-module-dir=/usr/lib/X11/modules \
     --with-xkb-output=/var/lib/xkb \
@@ -88,10 +91,6 @@ ipkg -m acnb ${MTDEV} "--disable-static"
 
 install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=/usr/lib/X11/modules
 
-if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
-    ipkg ${XORG_VIDEO_NOUVEAU} ${XORG_CONFIG} --with-xorg-module-dir=/usr/lib/X11/modules
-fi
-
 ipkg_xorg ${XDM}
 
 rscr once "Configuring X.org" configure-xorg