X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=f8da0ae74eed4d0303a3cc40d408b1466c8b0afa;hb=16c81190b3ca1da2e26645020dd3cb9f8625521c;hp=e18e1c9954a6106c90b13b3abc9e16cff3b175f9;hpb=fd7d0d6a1ec9d227e64d48ab65849a8061fc2fe2;p=hvlinux.git

diff --git a/stage4/packages-update b/stage4/packages-update
index e18e1c9..f8da0ae 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -10,14 +10,14 @@ update_packages_init ${*}
 
 lpkg     3 ${PYTHON}
 
-XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
+XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO}"
 
 for module in ${XORG_MODULES_LIST}; do
     MOD_NAME=$(get_pkg_name ${module})
     DEST_DIR=${LFS_PKG_DIR}/${MOD_NAME}
 
-    fpkg -d ${DEST_DIR} -e wget ${module} ${BLFS_XORG_URL}
-    fpkg -d ${DEST_DIR} -e md5 ${module} ${BLFS_XORG_URL}
+    fpkg -d ${DEST_DIR} -e wget -w ${module} ${BLFS_XORG_URL}
+    fpkg -d ${DEST_DIR} -e md5  -w ${module} ${BLFS_XORG_URL}
 
     if [ "${MOD_NAME}" = "driver" ]; then
 	if [ -n "${XORG_VIDEO_DRIVER}" ]; then
@@ -59,14 +59,17 @@ for module in ${XORG_MODULES_LIST}; do
     popd >> ${LFS_LOG_FILE}
 done
 
+fpkg -m xorg -s util ${XORG_UTIL_MACROS}
+fpkg -m xorg -s util ${XORG_MAKEDEPEND}
 fpkg -m xorg -s lib ${LIBXAU}
 fpkg -m xorg -s lib ${LIBXDMCP}
 fpkg -m sf ${LESSTIF}
 fpkg -m xorg -s data ${XBITMAPS}
 
-fpkg -m fd -o "dist" -s "xcb" ${LIBPTHREAD_STUBS}
-fpkg -m fd -o "dist" -s "xcb" ${XCB_PROTO}
-fpkg -m fd -o "dist" -s "xcb" ${XCB_UTIL}
+fpkg -m fd -o "xcb" -s "dist" ${LIBPTHREAD_STUBS}
+fpkg -m fd -o "xcb" -s "dist" ${XCB_PROTO}
+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}
@@ -74,16 +77,16 @@ fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
 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" ${XKEYBOARD_CONFIG}
+fpkg -m fd -o "xlibs" -s "xkbdesc" -e "tar.bz2" ${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 -o "releases/dbus" ${DBUS}
+fpkg -m fd -s "releases/dbus" ${DBUS}
 fpkg -m gnome ${GLIB}
 fpkg -m gnome ${GOBJECT_INSTROSPECTION}
-fpkg -m fd -o "dbus" ${DBUS_GLIB}
+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"