Remove subdirectories for storing xorg packages

diff --git a/functions/fpkg b/functions/fpkg
index 3f8e624..bcb1b1a 100644 (file)
--- a/functions/fpkg
+++ b/functions/fpkg
@@ -533,10 +533,6 @@ fpkg()
                    echo "${FUNCNAME}(), mode 'xorg' needs '-s' option"
                    return 1
                 fi
-                if [ -z "${DEST_DIR}" ]; then
-                    # Default fetch (write to) directory
-                    DEST_DIR=${LFS_PKG_DIR}/${SRC_DIR}
-                fi
                 ;;
            fd)
                 # Most common layout:

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 4be71f0..9ca6f6a 100755 (executable)
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -6,25 +6,19 @@ source /etc/profile
 check_for_root_user
 init_log_file
 
-LFS_PKG_DIR_ORIG=${LFS_PKG_DIR}
-
 export XORG_CONFIG="\
     --mandir=/usr/share/man \
     --localstatedir=/var"
 
 # Arg #1: module name and version
-# Arg #2: subdirectory
-# Arg #3: optional configure arguments
+# Arg #2: optional configure arguments
 ipkg_xorg()
 {
     local MODULE=${1}
-    local SUBDIR=${2}
-    shift 2
+    shift
     local CONFIGURE_OPTS=${*}
 
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR}
     ipkg ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
 }
 
 # Install all submodules in a module
@@ -37,29 +31,26 @@ install_xorg_modules()
     shift
     local CONFIGURE_OPTS=${*}
 
-    local MODULE_NAME=$(get_pkg_name ${MODULE})
-
     local MY_XORG_CONFIG
 
-    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE_NAME}/${MODULE}.wget); do
+    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE}.wget); do
         SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
-
-        ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
+        ipkg_xorg ${SUBMOD} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
     done
 }
 
-ipkg_xorg ${XORG_UTIL_MACROS} "util"
+ipkg_xorg ${XORG_UTIL_MACROS}
 install_xorg_modules ${XORG_PROTO}
-ipkg_xorg ${XORG_MAKEDEPEND} "util"
-ipkg_xorg ${LIBXAU} "lib"
-ipkg_xorg ${LIBXDMCP} "lib"
+ipkg_xorg ${XORG_MAKEDEPEND}
+ipkg_xorg ${LIBXAU}
+ipkg_xorg ${LIBXDMCP}
 ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG}
 ipkg ${XCB_PROTO} ${XORG_CONFIG}
 ipkg ${LIBXCB} ${XORG_CONFIG}
 install_xorg_modules ${XORG_LIB}
 ipkg ${XCB_UTIL} ${XORG_CONFIG}
 ipkg -m acnb ${LESSTIF}
-ipkg_xorg ${XBITMAPS} "data"
+ipkg_xorg ${XBITMAPS}
 ipkg ${LIBDRM} "\
     --enable-udev \
     --enable-nouveau-experimental-api"
@@ -75,10 +66,10 @@ ipkg -m acnb ${LLVM} "\
 
 ipkg -m acnb ${MESALIB}
 install_xorg_modules ${XORG_APP}
-ipkg_xorg ${XCURSOR_THEMES} "data"
+ipkg_xorg ${XCURSOR_THEMES}
 install_xorg_modules ${XORG_FONT}
 ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
-ipkg_xorg ${LUIT} "app"
+ipkg_xorg ${LUIT}
 ipkg ${PIXMAN}
 ipkg ${DBUS}
 ipkg ${GLIB}
@@ -87,7 +78,7 @@ ipkg -m acnb ${DBUS_GLIB} \
     --disable-tests \
     --libexecdir=/usr/lib/dbus-1.0/dbus-1
 
-ipkg_xorg ${XORG_SERVER} "xserver" "\
+ipkg_xorg ${XORG_SERVER} "\
     --with-module-dir=/usr/lib/X11/modules \
     --with-xkb-output=/var/lib/xkb \
     --enable-install-setuid \
@@ -101,7 +92,7 @@ if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
     ipkg ${XORG_VIDEO_NOUVEAU} ${XORG_CONFIG} --with-xorg-module-dir=/usr/lib/X11/modules
 fi
 
-ipkg_xorg ${XDM} "app"
+ipkg_xorg ${XDM}
 
 rscr once "Configuring X.org" configure-xorg
 

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