Modified sysinfos for SATA cdrom

[hvlinux.git] / stage4 / stage4-install

diff --git a/stage4/stage4-install b/stage4/stage4-install
index b91aa61..fee1687 100755 (executable)
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -30,6 +30,21 @@ export XORG_CONFIG="\
 
 LFS_PKG_DIR_ORIG=${LFS_PKG_DIR}
 
+# Arg #1: module name and version
+# Arg #2: subdirectory
+# Arg #3: optional configure arguments
+ipkg_xorg()
+{
+    local MODULE=${1}
+    local SUBDIR=${2}
+    shift 2
+    local CONFIGURE_OPTS=${*}
+
+    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR}
+    ipkg_ac ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
+    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
+}
+
 # Install all submodules in a module
 #
 # Arg #1: module name and version
@@ -44,8 +59,7 @@ install_xorg_modules()
 
     local MY_XORG_CONFIG
 
-    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE}.wget); do
-        LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${MODULE_NAME}
+    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE_NAME}/${MODULE}.wget); do
         SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
 
         # Special configure options for specific packages
@@ -63,16 +77,14 @@ install_xorg_modules()
                 #;;
         esac
 
-        ipkg_ac ${SUBMOD} ${XORG_CONFIG} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
+        ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
     done
-
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
 }
 
 install_xorg_modules ${XORG_PROTO}
 install_xorg_modules ${XORG_UTIL}
-ipkg_ac   ${LIBXAU} ${XORG_CONFIG}
-ipkg_ac   ${LIBXDMCP} ${XORG_CONFIG}
+ipkg_xorg ${LIBXAU} "lib"
+ipkg_xorg ${LIBXDMCP} "lib"
 install_xorg_modules ${XORG_LIB}
 ipkg_cust ${LESSTIF} cis-lesstif \
     --sysconfdir=/etc/X11 \
@@ -82,18 +94,17 @@ ipkg_cust ${LESSTIF} cis-lesstif \
     --with-xdnd \
     --x-includes=$XORG_PREFIX/include \
     --x-libraries=$XORG_PREFIX/lib
-ipkg_ac   ${XBITMAPS} ${XORG_CONFIG}
+ipkg_xorg ${XBITMAPS} "data"
 ipkg_ac   ${LIBPTHREAD_STUBS}
 ipkg_ac   ${LIBDRM} --enable-udev
 ipkg_cust ${MESALIB} cis-mesalib --enable-motif
 install_xorg_modules ${XORG_APP}
-ipkg_ac   ${XCURSOR_THEMES} ${XORG_CONFIG}
+ipkg_xorg ${XCURSOR_THEMES} "data"
 install_xorg_modules ${XORG_FONT}
 rscr once "Configuring fonts" configure-fonts
 ipkg_ac   ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
-ipkg_ac   ${LUIT} ${XORG_CONFIG}
+ipkg_xorg ${LUIT} "app"
 ipkg_ac   ${PIXMAN}
-
 ipkg_ac   ${LIBFFI}
 ipkg_cust ${DBUS} cis-dbus
 ipkg_cust ${GLIB} cis-glib --with-pcre=system
@@ -112,7 +123,7 @@ ipkg_cust ${POLICYKIT} cis-policykit
 ipkg_cust ${HAL} cis-hal
 ipkg_ac   ${HAL_INFO}
 
-ipkg_ac   ${XORG_SERVER} ${XORG_CONFIG} "\
+ipkg_xorg ${XORG_SERVER} "xserver" "\
     --with-module-dir=${XORG_PREFIX}/lib/X11/modules \
     --with-xkb-output=/var/lib/xkb \
     --enable-install-setuid"
@@ -121,7 +132,7 @@ ipkg_ac   ${XORG_SERVER} ${XORG_CONFIG} "\
 # To fix this problrem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget.
 install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=${XORG_PREFIX}/lib/X11/modules
 
-ipkg_ac   ${XDM} ${XORG_CONFIG}
+ipkg_xorg ${XDM} "app"
 
 rscr once "Configuring X.org" configure-xorg