projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction permissions répertoire emacs site-lisp
[hvlinux.git]
/
stage4
/
packages-update
diff --git
a/stage4/packages-update
b/stage4/packages-update
index
5bd7d05
..
69f3f29
100755
(executable)
--- a/
stage4/packages-update
+++ b/
stage4/packages-update
@@
-16,20
+16,22
@@
for module in ${XORG_MODULES_LIST}; do
MOD_NAME=$(get_pkg_name ${module})
DEST_DIR=${LFS_PKG_DIR}/${MOD_NAME}
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
if [ "${MOD_NAME}" = "driver" ]; then
if [ -n "${XORG_VIDEO_DRIVER}" ]; then
- # Install only specifi
c
driver
+ # Install only specifi
ed video
driver
for ext in wget md5; do
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
done
else
- #
Remov
e unwanted drivers
+ #
Install all drivers, except som
e unwanted drivers
for ext in wget md5; do
for excldrv in vmware newport xgixp geode; do
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
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
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}"
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 -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}
fpkg ${WINDOWMAKER} ${WMAKER_URL}
fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}