Harmonisé les noms des différentes fonctions get_pkg_ver...

[hvlinux.git] / stage4 / packages-update

diff --git a/stage4/packages-update b/stage4/packages-update
index 957e213..69f3f29 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -10,26 +10,28 @@ 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
-           # Install only specific driver
+           # Install only specified video driver
             for ext in wget md5; do
-                sed -i -e "/xf86-video-${XORG_VIDEO_DRIVER}/!d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+                # 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}
             done
        else
-            # Remove unwanted drivers
+            # 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}
+                    sed -i -e "/.*xf86-video-${excldrv}.*/d" \
+                        ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
                 done
             done
         fi
@@ -50,7 +52,7 @@ for module in ${XORG_MODULES_LIST}; do
 
     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 "[0-9]" 1> /dev/null 2>&1; then
+    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}"
@@ -59,6 +61,8 @@ 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}
@@ -66,6 +70,7 @@ 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 gnu ${GPERF}
 
@@ -101,7 +106,6 @@ 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 -s "tcl" ${TK}
-fpkg -m gnu ${EMACS}
 fpkg ${WINDOWMAKER} ${WMAKER_URL}
 fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}