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

diff --git a/stage4/packages-update b/stage4/packages-update
index c184a5f..fe676be 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -1,96 +1,77 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage4"
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-USE_HV_PATCHES=1
+source ../functions/main
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../functions-update
-source ../packages-list
+update_packages_init ${*}
 
-# Execute a return statement instead of exit, to be able to continue with
-# downloading other packages
-export RCMD_NO_EXIT=1
+lpkg     2 ${PYTHON}
+lpkg     2 ${GLIB}
 
-update_packages_init
+XORG_MODULES_LIST="app driver font lib proto"
 
-XORG_MODULES_LIST="${XORG_APP} ${XORG_DATA} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
-
-BLFS_XORG_URL=http://anduin.linuxfromscratch.org/files/BLFS/svn/xorg
-XORG_URL=http://xorg.freedesktop.org/releases/individual
+VERSIONS_DIR="${SCRDIR}/versions"
 
 for module in ${XORG_MODULES_LIST}; do
     MOD_NAME=$(get_pkg_name ${module})
-    DEST=${LFS_PKG_DIR}/${MOD_NAME}
-
-    ARCH_EXT=wget fpkg ${module} ${BLFS_XORG_URL}
-    ARCH_EXT=md5  fpkg ${module} ${BLFS_XORG_URL}
-    unset ARCH_EXT
-
-    if [ "${MOD_NAME}" = "driver" ]; then
-        # Remove unwanted drivers
-        for ext in wget md5; do
-            sed -i -e '/.*xf86-video-vmware.*/d' ${LFS_PKG_DIR}/${module}.${ext}
-            sed -i -e '/.*xf86-video-newport.*/d' ${LFS_PKG_DIR}/${module}.${ext}
-            sed -i -e '/.*xf86-video-xgixp.*/d' ${LFS_PKG_DIR}/${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}/${module}.${ext}
-            sed -i -e '/.*xclock-.*/d' ${LFS_PKG_DIR}/${module}.${ext}
-        done
-    fi
 
-    SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${module}.wget | sed 's!\.tar\.bz2$!!')"
-    
-    mkdir -v -p ${DEST} >> ${LFS_LOG_FILE} 2>&1
+    SUBMODS="$(grep -v '^#' ${VERSIONS_DIR}/${module}.md5 | \
+        awk '{print $2}' | \
+        sed 's!\.tar\.bz2$!!')"
 
-    export FETCH_DIR=${DEST}
     for submod in ${SUBMODS}; do
-        fpkg ${submod} ${XORG_URL}/${MOD_NAME}
+        fpkg -m xorg -s ${MOD_NAME} ${submod}
     done
-    unset FETCH_DIR
 
-    pushd ${DEST} >> ${LFS_LOG_FILE}
-    md5sum -c ${LFS_PKG_DIR}/${module}.md5 >> ${LFS_LOG_FILE}
+    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    ${LIBXAU}           ${XORG_URL}/lib
-fpkg    ${LIBXDMCP}         ${XORG_URL}/lib
-fpkg_sf ${LESSTIF}
-fpkg    ${XBITMAPS}         ${XORG_URL}/data
-fpkg    ${LIBPTHREAD_STUBS} http://xcb.freedesktop.org/dist
-fpkg    ${LIBDRM}           http://dri.freedesktop.org/libdrm
-fpkg    ${MESALIB}          ftp://ftp.freedesktop.org/pub/mesa/$(get_pkg_ver ${MESALIB})
-fpkg    ${XCURSOR_THEMES}   ${XORG_URL}/data
-fpkg    ${XKEYBOARD_CONFIG} http://xlibs.freedesktop.org/xkbdesc
-fpkg    ${LUIT}             ${XORG_URL}/app
-fpkg    ${PIXMAN} "http://cairographics.org/releases"
-
-fpkg       ${LIBFFI} "ftp://sourceware.org/pub/libffi"
-fpkg       ${DBUS} "http://dbus.freedesktop.org/releases/dbus"
-fpkg_gnome ${GLIB}
-fpkg_gnome ${GOBJECT_INSTROSPECTION}
-fpkg       ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib"
-fpkg       ${EGGDBUS} "http://hal.freedesktop.org/releases"
-fpkg       ${POLKIT} "http://hal.freedesktop.org/releases"
-fpkg       ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
-fpkg       ${POLICYKIT} "http://hal.freedesktop.org/releases"
-fpkg       ${HAL} http://hal.freedesktop.org/releases
-fpkg       ${HAL_INFO} http://hal.freedesktop.org/releases
-
-fpkg    ${XORG_SERVER}      ${XORG_URL}/xserver
-
-ARCH_EXT=tgz fpkg ${XTERM} ftp://invisible-island.net/xterm
-unset ARCH_EXT
+fpkg -m xorg -s util ${XORG_UTIL_MACROS}
+fpkg -m xorg -s lib ${LIBXAU}
+fpkg -m xorg -s lib ${LIBXDMCP}
+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" -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 -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}
+
+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"
+
+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 -e "tar.bz2" -s "dejavu" ${DEJAVUFONTS}
+
+fpkg -m sf -s "tcl" ${TK}
+
+fpkg ${XDG_UTILS} "http://portland.freedesktop.org/download"
+fpkg -e "tar.gz" ${WINDOWMAKER} ${WMAKER_URL}
+fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}
 
 exit $?