X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fhv-install-1;h=5829337d988719e6bd09d796a7aa4f65539bc48b;hb=f085c6a18cb44b803e0ff64642c9f78c886bee61;hp=8c93bd8c0532bb55e2f411f501d51411fe84f648;hpb=6c12bfa548bb72b6a4137896f53d1b2c5fb83bc5;p=hvlinux.git

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 8c93bd8..5829337 100755
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -18,38 +18,32 @@ ipkg_xorg()
 {
     local MODULE=${1}
     shift
-    local CONFIGURE_OPTS=${*}
+    local MY_CONFIGURE_OPTS=${*}
 
-    ipkg ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
+    ipkg ${MODULE} ${XORG_CONFIG} ${MY_CONFIGURE_OPTS}
 }
 
 # Install all submodules in a module
 #
-# Arg #1: module name and version
-# Arg #2: optional configure arguments
+# Arg #1: module name
 install_xorg_modules()
 {
     local MODULE=${1}
-    shift
-    local CONFIGURE_OPTS=${*}
-
-    local MY_XORG_CONFIG
 
-    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}
+    for package in $(grep -v '^#' ${VERSIONS_DIR}/${MODULE}.md5 | \
+        awk '{print $2}' | sed 's!\.tar\.bz2$!!'); do
+        ipkg_xorg ${package}
     done
 }
 
 ipkg_xorg ${XORG_UTIL_MACROS}
-install_xorg_modules ${XORG_PROTO}
-ipkg_xorg ${XORG_MAKEDEPEND}
+install_xorg_modules proto
 ipkg_xorg ${LIBXAU}
 ipkg_xorg ${LIBXDMCP}
 ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG}
 ipkg ${XCB_PROTO} ${XORG_CONFIG}
 ipkg ${LIBXCB} ${XORG_CONFIG}
-install_xorg_modules ${XORG_LIB}
+install_xorg_modules lib
 ipkg ${XCB_UTIL} ${XORG_CONFIG}
 ipkg -m acnb ${LESSTIF}
 ipkg_xorg ${XBITMAPS}
@@ -67,11 +61,10 @@ ipkg -m acnb ${LLVM} "\
     --enable-optimized"
 
 ipkg -m acnb ${MESALIB}
-install_xorg_modules ${XORG_APP}
+install_xorg_modules app
 ipkg_xorg ${XCURSOR_THEMES}
-install_xorg_modules ${XORG_FONT}
+install_xorg_modules font
 ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
-ipkg_xorg ${LUIT}
 ipkg ${PIXMAN}
 ipkg ${DBUS}
 ipkg ${GLIB}
@@ -82,16 +75,18 @@ ipkg -m acnb ${DBUS_GLIB} \
 
 ipkg -m acnb -j ${LIBEPOXY}
 ipkg_xorg ${XORG_SERVER} "\
-    --with-module-dir=/usr/lib/X11/modules \
     --with-xkb-output=/var/lib/xkb \
+    --enable-dmx \
+    --enable-glamor \
     --enable-install-setuid \
-    --disable-config-hal"
+    --enable-suid-wrapper"
 
 ipkg -m acnb ${MTDEV} "--disable-static"
 
-install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=/usr/lib/X11/modules
+ipkg ${LIBEVDEV} ${XORG_CONFIG}
+install_xorg_modules driver
 
-ipkg_xorg ${XDM}
+ipkg_xorg ${XDM} "--with-xdmlibdir=/usr/lib/xorg/xdm"
 
 rscr once "Configuring X.org" configure-xorg