X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=fe676be4bd7835a44e49e9a2f27a73d1a99b45fd;hb=42066f08a9c168bffa3fccf2bed23e4d65151935;hp=d88a1de074247542e73511df44b366c8d0916d9b;hpb=794cdf620a0a9fb935ef29d219d72008515f64aa;p=hvlinux.git

diff --git a/stage4/packages-update b/stage4/packages-update
index d88a1de..fe676be 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_LFS_OLD_PATCHES=1
-USE_BLFS_PATCHES=1
-USE_HV_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
@@ -12,94 +7,58 @@ update_packages_init ${*}
 lpkg     2 ${PYTHON}
 lpkg     2 ${GLIB}
 
-XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO}"
+XORG_MODULES_LIST="app driver font lib proto"
+
+VERSIONS_DIR="${SCRDIR}/versions"
 
 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 -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
-	    # Install only specified video driver, with also VESA
-            for ext in wget md5; do
-                # 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}
-                # Re-add VESA if necessary
-                sed -e "s/#\(.*xf86-video-vesa.*\)/\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-            done
-	else
-            # 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}
-                done
-            done
-        fi
-
-        # Always install synaptics driver
-        for ext in wget md5; do
-            sed -e "s/#\(.*xf86-input-synaptics.*\)/\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-        done
-    fi
-    if [ "${MOD_NAME}" = "app" ]; then
-        # Remove unneeded apps
-        for ext in wget md5; do
-            sed -i -e '/.*twm-.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-            sed -i -e '/.*xclock-.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-        done
-    fi
 
-    SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')"
+    SUBMODS="$(grep -v '^#' ${VERSIONS_DIR}/${module}.md5 | \
+        awk '{print $2}' | \
+        sed 's!\.tar\.bz2$!!')"
 
     for submod in ${SUBMODS}; do
         fpkg -m xorg -s ${MOD_NAME} ${submod}
     done
 
-    pushd ${DEST_DIR} >> ${LFS_LOG_FILE}
-    # The "driver" md5 file maybe empty if the nouveau driver was selected
-    if cat ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 | grep -q "[0-9]"; then
-        md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE}
-        if [ $? -ne 0 ]; then
-            echo "  md5sum error for ${module}"
-        fi
+    pushd ${LFS_PKG_DIR} >> ${LFS_LOG_FILE}
+    md5sum -c ${VERSIONS_DIR}/${module}.md5 >> ${LFS_LOG_FILE}
+    if [ $? -ne 0 ]; then
+        echo "  md5sum error for ${module}"
     fi
     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 sf -e "tgz" -f "${MOTIF}-src" ${MOTIF}
 fpkg -m xorg -s data ${XBITMAPS}
 
 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 fd -o "xcb" -s "dist" ${XCB_UTIL_KSYMS}
 
 fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
 fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
-fpkg -e "tar.gz" -f "${LLVM}.src" ${LLVM} "http://llvm.org/releases/$(get_pkg_ver ${LLVM})"
-fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} \
-    ftp://ftp.freedesktop.org/pub/mesa
+fpkg -e "tar.gz" -f "${LLVM}.src" -v 0 ${LLVM} "http://llvm.org/releases"
+fpkg -v 0 ${MESALIB} "ftp://ftp.freedesktop.org/pub/mesa"
+fpkg ${GLU} "ftp://ftp.freedesktop.org/pub/mesa/glu"
+fpkg -m sf ${FREEGLUT}
 fpkg -m xorg -s data ${XCURSOR_THEMES}
 fpkg -s data/xkeyboard-config ${XKEYBOARD_CONFIG} ${XORG_URL}
 
-fpkg -m xorg -s app ${LUIT}
 fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
 
 fpkg -m fd -s "releases/dbus" ${DBUS}
 fpkg -m gnome ${GOBJECT_INSTROSPECTION}
 fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB}
 
-if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
-    fpkg ${XORG_VIDEO_NOUVEAU} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/Xorg"
-fi
+fpkg ${LIBEPOXY} "http://crux.nu/files"
+fpkg -e "tar.xz" ${LIBEVDEV} "http://www.freedesktop.org/software/libevdev"
 fpkg -m xorg -s xserver ${XORG_SERVER}
 fpkg -m xorg -s app ${XDM}
 fpkg ${MTDEV} "http://bitmath.org/code/mtdev"