Stage2 semble compléter ok

[hvlinux.git] / stage4 / packages-update

diff --git a/stage4/packages-update b/stage4/packages-update
index d209fee..5d0f82a 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -1,6 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage4"
 USE_LFS_PATCHES=1
 USE_BLFS_PATCHES=1
 USE_HV_PATCHES=1
@@ -17,67 +16,62 @@ export RCMD_NO_EXIT=1
 
 update_packages_init
 
-lpkg     3 ${PYTHON}
+if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
+    export TEST_INTEGRITY=1
+fi
 
-XORG_MODULES_LIST="${XORG_APP} ${XORG_DATA} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
+lpkg     3 ${PYTHON}
 
-BLFS_XORG_URL=http://anduin.linuxfromscratch.org/files/BLFS/svn/xorg
-XORG_URL=http://xorg.freedesktop.org/releases/individual
+XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
 
 for module in ${XORG_MODULES_LIST}; do
     MOD_NAME=$(get_pkg_name ${module})
-    DEST=${LFS_PKG_DIR}/${MOD_NAME}
+    DEST_DIR=${LFS_PKG_DIR}/${MOD_NAME}
 
-    ARCH_EXT=wget fpkg ${module} ${BLFS_XORG_URL}
-    ARCH_EXT=md5  fpkg ${module} ${BLFS_XORG_URL}
-    unset ARCH_EXT
+    fpkg -d ${DEST_DIR} -e wget ${module} ${BLFS_XORG_URL}
+    fpkg -d ${DEST_DIR} -e md5 ${module} ${BLFS_XORG_URL}
 
     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}
+            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
     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}
+            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}/${module}.wget | sed 's!\.tar\.bz2$!!')"
+    SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')"
     
-    mkdir -v -p ${DEST} >> ${LFS_LOG_FILE} 2>&1
-
-    export FETCH_DIR=${DEST}
     for submod in ${SUBMODS}; do
-        fpkg ${submod} ${XORG_URL}/${MOD_NAME}
+        fpkg_xorg ${submod} ${MOD_NAME}
     done
-    unset FETCH_DIR
 
-    pushd ${DEST} >> ${LFS_LOG_FILE}
-    md5sum -c ${LFS_PKG_DIR}/${module}.md5 >> ${LFS_LOG_FILE}
+    pushd ${DEST_DIR} >> ${LFS_LOG_FILE}
+    md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${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_xorg  ${LIBXAU} lib
+fpkg_xorg  ${LIBXDMCP} lib
+fpkg_sf    ${LESSTIF}
+fpkg_xorg  ${XBITMAPS} data
+fpkg       ${LIBPTHREAD_STUBS} "http://xcb.freedesktop.org/dist"
+fpkg       ${LIBDRM}           "http://dri.freedesktop.org/libdrm"
+fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} ftp://ftp.freedesktop.org/pub/mesa
+fpkg_xorg  ${XCURSOR_THEMES} data
+fpkg       ${XKEYBOARD_CONFIG} "http://xlibs.freedesktop.org/xkbdesc"
+fpkg_xorg  ${LUIT} 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}
@@ -87,13 +81,13 @@ 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       ${HAL} "http://hal.freedesktop.org/releases"
+fpkg       ${HAL_INFO} "http://hal.freedesktop.org/releases"
 
-fpkg    ${XORG_SERVER}      ${XORG_URL}/xserver
+fpkg_xorg  ${XORG_SERVER} xserver
+fpkg_xorg  ${XDM} app
 
-ARCH_EXT=tgz fpkg ${XTERM} ftp://invisible-island.net/xterm
-unset ARCH_EXT
+fpkg -e tgz ${XTERM} "ftp://invisible-island.net/xterm"
 
 fpkg       ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"