From 41196bc84f5162dbf6a970ec8c2451aed59d6191 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Mon, 29 Jul 2013 23:12:12 -0400 Subject: [PATCH] Install xorg synaptics driver by default Also install mtdev, required by syndaemon. --- config/packages-list | 1 + stage4/hv-install-1 | 2 ++ stage4/packages-update | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/config/packages-list b/config/packages-list index 87e18a8..4e122d7 100644 --- a/config/packages-list +++ b/config/packages-list @@ -270,6 +270,7 @@ MMM_MODE="mmm-mode-purcell-2012-09-21" MPC="mpc-1.0.1" MPFR="mpfr-3.1.2" MSMTP="msmtp-1.4.29" +MTDEV="mtdev-1.1.3" MUTT="mutt-1.5.21" MYSQL="mysql-5.5.28" diff --git a/stage4/hv-install-1 b/stage4/hv-install-1 index f7ecbaf..60b91d7 100755 --- a/stage4/hv-install-1 +++ b/stage4/hv-install-1 @@ -94,6 +94,8 @@ ipkg_xorg ${XORG_SERVER} "xserver" "\ --enable-install-setuid \ --disable-config-hal" +ipkg -m acnb ${MTDEV} "--disable-static" + install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=/usr/lib/X11/modules if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then diff --git a/stage4/packages-update b/stage4/packages-update index 9b6992d..8cc90ae 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -38,6 +38,11 @@ for module in ${XORG_MODULES_LIST}; do 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} + done fi if [ "${MOD_NAME}" = "app" ]; then # Remove unneeded apps @@ -97,6 +102,7 @@ if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then fi fpkg -m xorg -s xserver ${XORG_SERVER} fpkg -m xorg -s app ${XDM} +fpkg ${MTDEV} "http://bitmath.org/code/mtdev" fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm" fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics" -- 2.20.1