X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=69f3f291292ab40b7b9af55b898fd35efef487f0;hb=46a6cd65aaf72c044223fa7c33a28d6e99fa1f20;hp=f8da0ae74eed4d0303a3cc40d408b1466c8b0afa;hpb=16e556be676ab727a73d9a98bcd7d68fb5a29f4f;p=hvlinux.git

diff --git a/stage4/packages-update b/stage4/packages-update
index f8da0ae..69f3f29 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -21,15 +21,17 @@ for module in ${XORG_MODULES_LIST}; do
 
     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}"
@@ -104,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}