X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=stage4%2Fpackages-update;h=f2ffa4fa423ee4dabba698163b4601a2456b21aa;hb=2d1f978cb0d80f379521294e190acc2c8dad8382;hp=c63655740e7553215dc9d129f007b3b99a0178ea;hpb=564ec1bbb321286571c30da20b81620c33b18e6f;p=hvlinux.git

diff --git a/stage4/packages-update b/stage4/packages-update
index c636557..f2ffa4f 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -9,6 +9,7 @@ source ../functions/main
 update_packages_init ${*}
 
 lpkg     3 ${PYTHON}
+lpkg     2 ${GLIB}
 
 XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO}"
 
@@ -21,15 +22,17 @@ for module in ${XORG_MODULES_LIST}; do
 
     if [ "${MOD_NAME}" = "driver" ]; then
 	if [ -n "${XORG_VIDEO_DRIVER}" ]; then
-	    # Install only specific driver
+	    # Install only specified video driver
             for ext in wget md5; do
-                sed -i -e "/xf86-video-${XORG_VIDEO_DRIVER}/!d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+                # Comment all xf86-video entries, except for specified driver:
+                sed -e "/xf86-video-${XORG_VIDEO_DRIVER}/!s/\(.*xf86-video.*\)/#\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
             done
 	else
-            # Remove unwanted drivers
+            # Install all drivers, except some unwanted drivers
             for ext in wget md5; do
                 for excldrv in vmware newport xgixp geode; do
-                    sed -i -e "/.*xf86-video-${excldrv}.*/d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+                    sed -i -e "/.*xf86-video-${excldrv}.*/d" \
+                        ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
                 done
             done
         fi
@@ -72,30 +75,29 @@ fpkg -m fd -o "xcb" -s "dist" ${LIBXCB}
 fpkg -m fd -o "xcb" -s "dist" ${XCB_UTIL}
 fpkg -m gnu ${GPERF}
 
-fpkg -m hv ${LIBDRM}
+fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
 fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
+fpkg -e "tar.gz" ${LLVM} "http://llvm.org/releases/3.0"
 fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} \
     ftp://ftp.freedesktop.org/pub/mesa
 fpkg -m xorg -s data ${XCURSOR_THEMES}
-fpkg -m fd -o "xlibs" -s "xkbdesc" -e "tar.bz2" ${XKEYBOARD_CONFIG}
+fpkg -m xorg -s data/xkeyboard-config ${XKEYBOARD_CONFIG}
 
 fpkg -m xorg -s app ${LUIT}
 fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
-fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
 
 fpkg -m fd -s "releases/dbus" ${DBUS}
-fpkg -m gnome ${GLIB}
 fpkg -m gnome ${GOBJECT_INSTROSPECTION}
 fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB}
-fpkg -m fd -o "hal" ${EGGDBUS}
-fpkg -m fd -o "hal" ${POLKIT}
-fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
-fpkg -m fd -o "hal" ${POLICYKIT}
-fpkg -m fd ${HAL}
-fpkg -m fd -o "hal" ${HAL_INFO}
+######fpkg -m fd -o "hal" ${EGGDBUS}
+#######fpkg -m fd -o "hal" ${POLKIT}
+#fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
+###fpkg -m fd -o "hal" ${POLICYKIT}
+#####fpkg -m fd ${HAL}
+#####fpkg -m fd -o "hal" ${HAL_INFO}
 
 if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
-    fpkg -m hv ${XORG_VIDEO_NOUVEAU}
+    fpkg ${XORG_VIDEO_NOUVEAU} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/Xorg"
 fi
 fpkg -m xorg -s xserver ${XORG_SERVER}
 fpkg -m xorg -s app ${XDM}
@@ -104,7 +106,6 @@ fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm"
 fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
 
 fpkg -m sf -s "tcl" ${TK}
-fpkg -m gnu ${EMACS}
 fpkg ${WINDOWMAKER} ${WMAKER_URL}
 fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}