X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=dd607d55298bb5e6418e116289eb65ab49975c26;hb=821ad284a625db292e9425a805e6d84d17b81ec4;hp=adb5fa5652185518565821c28cc04bf6153355ef;hpb=d7900cf1804af891098cd22b0ff32aee9df51969;p=hvlinux.git

diff --git a/stage4/packages-update b/stage4/packages-update
index adb5fa5..dd607d5 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -1,6 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage4"
 USE_LFS_PATCHES=1
 USE_BLFS_PATCHES=1
 USE_HV_PATCHES=1
@@ -8,7 +7,7 @@ USE_HV_PATCHES=1
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
-source ../functions-update
+source ../functions-fpkg
 source ../packages-list
 
 # Execute a return statement instead of exit, to be able to continue with
@@ -23,7 +22,7 @@ fi
 
 lpkg     3 ${PYTHON}
 
-XORG_MODULES_LIST="${XORG_APP} ${XORG_DATA} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
+XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
 
 for module in ${XORG_MODULES_LIST}; do
     MOD_NAME=$(get_pkg_name ${module})
@@ -35,9 +34,9 @@ for module in ${XORG_MODULES_LIST}; do
     if [ "${MOD_NAME}" = "driver" ]; then
         # Remove unwanted drivers
         for ext in wget md5; do
-            sed -i -e '/.*xf86-video-vmware.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-            sed -i -e '/.*xf86-video-newport.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
-            sed -i -e '/.*xf86-video-xgixp.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+            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
     if [ "${MOD_NAME}" = "app" ]; then
@@ -86,7 +85,7 @@ fpkg       ${HAL} "http://hal.freedesktop.org/releases"
 fpkg       ${HAL_INFO} "http://hal.freedesktop.org/releases"
 
 fpkg_xorg  ${XORG_SERVER} xserver
-fpkg       ${XDM} app
+fpkg_xorg  ${XDM} app
 
 fpkg -e tgz ${XTERM} "ftp://invisible-island.net/xterm"