Fini la mise à jour pour répertoire pkg. Stage4 compile OK et driver xorg nouveau OK

[hvlinux.git] / stage4 / packages-update

diff --git a/stage4/packages-update b/stage4/packages-update
index dd607d5..dac089b 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -5,14 +5,10 @@ USE_BLFS_PATCHES=1
 USE_HV_PATCHES=1
 
 # Reading system configuration informations, functions and package versions.
-source ../sysinfos
+source ../config/sysinfos
 source ../functions
 source ../functions-fpkg
-source ../packages-list
-
-# Execute a return statement instead of exit, to be able to continue with
-# downloading other packages
-export RCMD_NO_EXIT=1
+source ../config/packages-list
 
 update_packages_init
 
@@ -32,12 +28,19 @@ for module in ${XORG_MODULES_LIST}; do
     fpkg -d ${DEST_DIR} -e md5 ${module} ${BLFS_XORG_URL}
 
     if [ "${MOD_NAME}" = "driver" ]; then
-        # Remove 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}
+       if [ -n "${XORG_VIDEO_DRIVER}" ]; then
+           # Install only specific driver
+            for ext in wget md5; do
+                sed -i -e "/xf86-video-${XORG_VIDEO_DRIVER}/!d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
             done
-        done
+       else
+            # Remove 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
     fi
     if [ "${MOD_NAME}" = "app" ]; then
         # Remove unneeded apps
@@ -48,15 +51,18 @@ for module in ${XORG_MODULES_LIST}; do
     fi
 
     SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')"
-    
+
     for submod in ${SUBMODS}; do
         fpkg_xorg ${submod} ${MOD_NAME}
     done
 
     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}"
+    # The "driver" md5 file maybe empty if the nouveau driver was selected
+    if cat ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 | grep "[0-9]" 1> /dev/null 2>&1; then
+        md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE}
+        if [ $? -ne 0 ]; then
+            echo "  md5sum error for ${module}"
+        fi
     fi
     popd >> ${LFS_LOG_FILE}
 done
@@ -66,35 +72,40 @@ 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       ${XCB_PROTO} "http://xcb.freedesktop.org/dist"
+fpkg_gnu   ${GPERF}
+fpkg       ${XCB_UTIL} "http://xcb.freedesktop.org/dist"
+
+fpkg_hv    ${LIBDRM}
+fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
 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 -e "tar.gz" ${PIXMAN} "http://cairographics.org/releases"
+fpkg -e "tar.gz" ${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 -e "tar.gz" ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib"
+fpkg -e "tar.gz" ${EGGDBUS} "http://hal.freedesktop.org/releases"
+fpkg -e "tar.gz" ${POLKIT} "http://hal.freedesktop.org/releases"
 fpkg       ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
-fpkg       ${POLICYKIT} "http://hal.freedesktop.org/releases"
+fpkg -e "tar.gz" ${POLICYKIT} "http://hal.freedesktop.org/releases"
 fpkg       ${HAL} "http://hal.freedesktop.org/releases"
 fpkg       ${HAL_INFO} "http://hal.freedesktop.org/releases"
 
+fpkg_hv    ${XORG_VIDEO_NOUVEAU}
 fpkg_xorg  ${XORG_SERVER} xserver
 fpkg_xorg  ${XDM} app
 
-fpkg -e tgz ${XTERM} "ftp://invisible-island.net/xterm"
+fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm"
 
-fpkg       ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
+fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
 
-fpkg_sf    ${TK} tcl
-                                                                 
-fpkg_gnu   ${EMACS}                                                                                                                                                                                                                     
-fpkg       ${WINDOWMAKER}       "http://windowmaker.info/pub/source/release"
-fpkg       ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release"
+fpkg_sf ${TK} tcl
+fpkg_gnu ${EMACS}
+fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release"
+fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release"
 
 exit $?