From 5f02c8c4b5fe6640bcdb61d1006256289a57c222 Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 15 Feb 2010 21:41:07 +0000 Subject: [PATCH] xorg fonctionnel en mode vesa --- functions-update | 2 +- packages-list | 1 + {stage3 => stage4}/cis-emacs | 5 ++++ stage4/cis-xterm | 34 +++++++++++++++++++++++ stage4/configure-xorg | 11 ++++++-- stage4/packages-update | 3 ++ {stage3 => stage4}/resources/ColorGNU.xpm | 0 stage4/resources/emacs/buffer-cycle.el | 28 +++++++++++++++++++ {stage3 => stage4}/resources/emacsrc | 0 stage4/stage4-install | 3 +- 10 files changed, 82 insertions(+), 5 deletions(-) rename {stage3 => stage4}/cis-emacs (77%) create mode 100755 stage4/cis-xterm rename {stage3 => stage4}/resources/ColorGNU.xpm (100%) create mode 100644 stage4/resources/emacs/buffer-cycle.el rename {stage3 => stage4}/resources/emacsrc (100%) diff --git a/functions-update b/functions-update index e47d383..742d9f1 100644 --- a/functions-update +++ b/functions-update @@ -23,7 +23,7 @@ GNOME_URL="http://ftp.gnome.org/pub/gnome/sources" GNU_URL="http://ftp.gnu.org/pub/gnu" TETEX_URL="http://www.tug.org/ftp/tex-archive/systems/unix/teTeX" -WGETCMD="wget --directory-prefix=${LFS_PKG_DIR} --timeout=5 --tries=3 -nc -c -o ${WGET_LOG_FILE}" +WGETCMD="wget --directory-prefix=${LFS_PKG_DIR} --timeout=15 --tries=3 -nc -c -o ${WGET_LOG_FILE}" LFS_PATCHES_LIST=${LFS_PKG_DIR}/patches-list-lfs.html BLFS_PATCHES_LIST=${LFS_PKG_DIR}/patches-list-blfs.html diff --git a/packages-list b/packages-list index ddc6ad8..c11ef04 100644 --- a/packages-list +++ b/packages-list @@ -443,6 +443,7 @@ XORG_SERVER=xorg-server-1.7.1 XMLTO="xmlto-0.0.23" XMLTOMAN="xmltoman-0.4" +XTERM="xterm-253" XVIDCORE="xvidcore-1.2.2" XZ_UTILS="xz-4.999.9beta" diff --git a/stage3/cis-emacs b/stage4/cis-emacs similarity index 77% rename from stage3/cis-emacs rename to stage4/cis-emacs index 93e91ba..82e5b53 100755 --- a/stage3/cis-emacs +++ b/stage4/cis-emacs @@ -23,4 +23,9 @@ ldconfig install -m644 ${SCRDIR}/resources/emacsrc /etc/skel/.emacs install -m644 ${SCRDIR}/resources/emacsrc /root/.emacs +LOCAL_SITE_LIST=/usr/local/share/emacs/site-lisp + +install -v -m644 -d ${LOCAL_SITE_LIST} +install -m644 ${SCRDIR}/resources/buffer-cycle.el ${LOCAL_SITE_LIST} + exit $? diff --git a/stage4/cis-xterm b/stage4/cis-xterm new file mode 100755 index 0000000..c2568a6 --- /dev/null +++ b/stage4/cis-xterm @@ -0,0 +1,34 @@ +#!/bin/sh +set -o errexit + +# First argument of this script is the package name. +# Remaining arguments are additional configure options. + +# Reading system configuration informations, functions and package versions. +source ../sysinfos +source ../functions +source ../packages-list + +PACKAGE=${1} +shift +CONFIGURE_OPTS=${*} + +# Applying patches (if any) +apply_patches ${PACKAGE} + +cd ${LFS_TMP}/${PACKAGE} +sed -i '/v0/,+1s/new:/new:kb=^?:/' termcap +echo -e '\tkbs=\\177,' >>terminfo + +cd ${LFS_TMP}/${PACKAGE}-build +TERMINFO=/usr/lib/terminfo ../${PACKAGE}/configure \ + --enable-luit \ + --enable-wide-chars \ + --with-app-defaults=${XORG_PREFIX}/share/X11/app-defaults \ + ${CONFIGURE_OPTS} +make +make install +make install-ti +ldconfig + +exit $? diff --git a/stage4/configure-xorg b/stage4/configure-xorg index 2ed5f33..73a8799 100755 --- a/stage4/configure-xorg +++ b/stage4/configure-xorg @@ -8,6 +8,12 @@ source ../sysinfos source ../functions source ../packages-list + +exit 0 + + + + # Many package are still trying to find X in /usr/X11R6. # Until then, you can create a symbolic link to satisfy the /usr/X11R6 # requirement so that you won't be inconvenienced with a package build @@ -17,15 +23,14 @@ source ../packages-list # Packages in Xorg store their configuration files in $XORG_PREFIX/lib/X11 # by default. This is strictly against FHS guidelines. Correct the # installation /etc/X11 and create symlinks in the original location: -mkdir -p /etc/X11 +mkdir -v -p /etc/X11 for file in ${XORG_PREFIX}/{lib/X11/xinit,share/X11/{app-defaults,twm}}; do mv -v $file /etc/X11/ 2> /dev/null - ln -v -s /etc/X11/$(basename $file) $file + ln -svfT /etc/X11/$(basename $file) $file done -exit 1 diff --git a/stage4/packages-update b/stage4/packages-update index 6067149..42f42c2 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -68,4 +68,7 @@ fpkg ${HAL_INFO} http://hal.freedesktop.org/releases fpkg ${XORG_SERVER} ${XORG_URL}/xserver +ARCH_EXT=tgz fpkg ${XTERM} ftp://invisible-island.net/xterm +unset ARCH_EXT + exit $? diff --git a/stage3/resources/ColorGNU.xpm b/stage4/resources/ColorGNU.xpm similarity index 100% rename from stage3/resources/ColorGNU.xpm rename to stage4/resources/ColorGNU.xpm diff --git a/stage4/resources/emacs/buffer-cycle.el b/stage4/resources/emacs/buffer-cycle.el new file mode 100644 index 0000000..4add15f --- /dev/null +++ b/stage4/resources/emacs/buffer-cycle.el @@ -0,0 +1,28 @@ +;; buffer-cycle.el +(defun filter (pred lst) + (delq nil + (mapcar (lambda (x) + (and (funcall pred x) x)) lst))) + +(defun filter-regexp (pattern lst) + (filter (lambda (str) + (string-match pattern str)) lst)) + +(defun cycle-buffer (&optional n) + (let ((buffers (filter (lambda (buffer) + (not (string-match "\*" (buffer-name buffer)))) + (buffer-list (selected-frame))))) + (switch-to-buffer + (if (< n 0) + (nth (+ (length buffers) n) + buffers) + (bury-buffer) + (nth n buffers))))) + +(defun cycle-buffer-next () + (interactive) + (cycle-buffer -1)) + +(defun cycle-buffer-prev () + (interactive) + (cycle-buffer 1)) diff --git a/stage3/resources/emacsrc b/stage4/resources/emacsrc similarity index 100% rename from stage3/resources/emacsrc rename to stage4/resources/emacsrc diff --git a/stage4/stage4-install b/stage4/stage4-install index 3443df7..73e3ad2 100755 --- a/stage4/stage4-install +++ b/stage4/stage4-install @@ -109,8 +109,9 @@ install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=${XORG_PREFIX}/lib/X1 rscr once "Configuring X.org" configure-xorg -exit 1 +ipkg_cust ${XTERM} cis-xterm ${XORG_CONFIG} +exit 1 #source /etc/profile -- 2.20.1