Merge install and package update log init functions

[hvlinux.git] / stage4 / packages-update

diff --git a/stage4/packages-update b/stage4/packages-update
index c5af9dc..eeb4f64 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -14,53 +14,52 @@ XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PR
 
 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 -w ${module} ${BLFS_XORG_URL}
-    fpkg -d ${DEST_DIR} -e md5  -w ${module} ${BLFS_XORG_URL}
+    fpkg -e wget -w ${module} ${BLFS_XORG_URL}
+    fpkg -e md5  -w ${module} ${BLFS_XORG_URL}
 
     if [ "${MOD_NAME}" = "driver" ]; then
        if [ -n "${XORG_VIDEO_DRIVER}" ]; then
            # Install only specified video driver, with also VESA
             for ext in wget md5; do
                 # 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}
+                sed -e "/xf86-video-${XORG_VIDEO_DRIVER}/!s/\(.*xf86-video.*\)/#\1/" -i ${LFS_PKG_DIR}/${module}.${ext}
                 # Re-add VESA if necessary
-                sed -e "s/#\(.*xf86-video-vesa.*\)/\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+                sed -e "s/#\(.*xf86-video-vesa.*\)/\1/" -i ${LFS_PKG_DIR}/${module}.${ext}
             done
        else
             # 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}
+                        ${LFS_PKG_DIR}/${module}.${ext}
                 done
             done
         fi
 
         # Always install synaptics driver
         for ext in wget md5; do
-            sed -e "s/#\(.*xf86-input-synaptics.*\)/\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+            sed -e "s/#\(.*xf86-input-synaptics.*\)/\1/" -i ${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}/${MOD_NAME}/${module}.${ext}
-            sed -i -e '/.*xclock-.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+            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}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')"
+    SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${module}.wget | sed 's!\.tar\.bz2$!!')"
 
     for submod in ${SUBMODS}; do
         fpkg -m xorg -s ${MOD_NAME} ${submod}
     done
 
-    pushd ${DEST_DIR} >> ${LFS_LOG_FILE}
+    pushd ${LFS_PKG_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 -q "[0-9]"; then
-        md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE}
+    if cat ${LFS_PKG_DIR}/${module}.md5 | grep -q "[0-9]"; then
+        md5sum -c ${LFS_PKG_DIR}/${module}.md5 >> ${LFS_LOG_FILE}
         if [ $? -ne 0 ]; then
             echo "  md5sum error for ${module}"
         fi