X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fhv-install-1;h=60b91d7f1c7679d1a239d40911daae252aa78adf;hb=b9d631f0388fefe31b05813855ed35e1624707dd;hp=798e25ddcb93cfe6366aa90aefc320b6ee426e4b;hpb=f920c7ef750f2163b9e407cc453b192ede2c185a;p=hvlinux.git

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 798e25d..60b91d7 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,44 +48,45 @@ 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"
+ipkg ${LIBDRM} "\
+    --enable-udev \
+    --enable-nouveau-experimental-api"
 
 ipkg -m acnb ${TALLOC}
+ipkg -m acnb ${LLVM} "\
+    --enable-shared \
+    --enable-libffi \
+    --enable-targets=all \
+    --disable-expensive-checks \
+    --disable-assertions \
+    --enable-optimized"
+
 ipkg -m acnb ${MESALIB}
 install_xorg_modules ${XORG_APP}
 ipkg_xorg ${XCURSOR_THEMES} "data"
 install_xorg_modules ${XORG_FONT}
-rscr once "Configuring fonts" configure-fonts
 ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
 ipkg_xorg ${LUIT} "app"
 ipkg ${PIXMAN}
-ipkg ${LIBFFI}
 ipkg ${DBUS}
 ipkg ${GLIB}
 ipkg ${GOBJECT_INSTROSPECTION} "--disable-tests"
 ipkg -m acnb ${DBUS_GLIB} \
     --disable-tests \
     --libexecdir=/usr/lib/dbus-1.0/dbus-1
-ipkg ${EGGDBUS}
-ipkg ${POLKIT}
-ipkg -m acnb ${CONSOLEKIT} \
-    --libexecdir=/usr/lib/ConsoleKit \
-    --localstatedir=/var \
-    --enable-pam-module
-ipkg ${POLICYKIT}
-ipkg ${HAL}
-ipkg ${HAL_INFO}
 
 ipkg_xorg ${XORG_SERVER} "xserver" "\
     --with-module-dir=/usr/lib/X11/modules \
@@ -101,6 +94,8 @@ ipkg_xorg ${XORG_SERVER} "xserver" "\
     --enable-install-setuid \
     --disable-config-hal"
 
+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
@@ -118,7 +113,14 @@ ipkg -s tk ${TK}
 # Re-installing python now that tk is present???
 ipkg ${PYTHON} "--enable-shared"
 
-ipkg -m acnb ${WINDOWMAKER}
+ipkg -m noac ${DEJAVUFONTS}
+
+ipkg -m acnb ${XDG_UTILS} "--mandir=/usr/share/man"
+
+ipkg -m acnb ${WINDOWMAKER} "--with-gnustepdir=/usr/share/GNUstep"
 ipkg ${WINDOWMAKER_EXTRA}
 
+write_completed_stage
+display_stage_build_stats
+
 exit $?