summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-04-24 01:22:28 +0200
committertnut <thierryn1 at hispeed dot ch>2010-04-24 01:22:28 +0200
commit47d4b3795005f68b26986d32a95aeb03b91fcea6 (patch)
treec0ec37345904c0aa617ff8be98ce8a60f6152cf9 /base
parent2715c2a6bc56824266a2c7aaf4c45cb7cf9dc24e (diff)
downloadnutyx-pakxe-47d4b3795005f68b26986d32a95aeb03b91fcea6.tar.gz
nutyx-pakxe-47d4b3795005f68b26986d32a95aeb03b91fcea6.tar.bz2
nutyx-pakxe-47d4b3795005f68b26986d32a95aeb03b91fcea6.tar.xz
nutyx-pakxe-47d4b3795005f68b26986d32a95aeb03b91fcea6.zip
maj aaabasicfs#2010-1
Diffstat (limited to 'base')
-rw-r--r--base/aaabasicfs/.footprint1
-rw-r--r--base/aaabasicfs/.md5sum1
-rw-r--r--base/aaabasicfs/Pkgfile5
-rw-r--r--base/aaabasicfs/xorg.conf52
4 files changed, 2 insertions, 57 deletions
diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint
index 4d8ece69d..f7d8946c5 100644
--- a/base/aaabasicfs/.footprint
+++ b/base/aaabasicfs/.footprint
@@ -7,7 +7,6 @@ crw------- root/root dev/console (5, 1)
crw-rw-rw- root/root dev/null (1, 3)
drwxr-xr-x root/root etc/
drwxr-xr-x root/root etc/X11/
--rw-r--r-- root/root etc/X11/xorg.conf
-rw-r--r-- root/root etc/bashrc
-rw-r--r-- root/root etc/blfs-bootscripts
drwxr-xr-x root/root etc/default/
diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index 3878c7078..5b549de79 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -21,4 +21,3 @@ c90e6466720260c377c89f5aa0c47eca network
210fdabd07248f79617508807715167b profile
fa6ce99e0329c7854e0a83d022da6fe3 readline.sh
87a81331c2241707ab494584eb49a80b unmask.sh
-505e833e0b10f807658b3153f67aa655 xorg.conf
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 00384a548..ba327288d 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -5,11 +5,11 @@
# Depends on:
name=aaabasicfs
-version=2009.3
+version=2010
release=1
scriptsversion=lfs-bootscripts-20100124
source=( http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
- hosts clock console fstab inittab message inputrc network xorg.conf \
+ hosts clock console fstab inittab message inputrc network \
profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \
blfs-bootscripts nu readline.sh unmask.sh X.sh i18n.sh bashrc )
@@ -171,7 +171,6 @@ EOF
Session=
EOF
mkdir -v $PKG/etc/X11
- cp -v xorg.conf $PKG/etc/X11/
cd $PKG/root/
ln -s ../etc/fstab
ln -s ../etc/hosts
diff --git a/base/aaabasicfs/xorg.conf b/base/aaabasicfs/xorg.conf
deleted file mode 100644
index 464ca2cc0..000000000
--- a/base/aaabasicfs/xorg.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-Section "ServerFlags"
- Option "AllowEmptyInput" "off"
-EndSection
-Section "Files"
-EndSection
-
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "kbd"
- Option "CoreKeyboard"
- Option "XkbRules" "xorg"
- Option "XkbModel" "pc105"
- Option "XkbLayout" "fr"
- Option "XkbOptions" "grp:alt_shift_toggle"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "mouse"
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-# La section ci-dessous defini le pilote d'affichage par defaut
-# Si vous le souhaitez, compilez le pilote de votre carte graphique:
-# Par exemple pour le pilote ati
-# prt-get install xorg-xf86-video-ati
-# si tout se passe bien, vous pouvez commenter la section ci-dessous
-Section "Device"
- Identifier "VESA"
- Driver "vesa"
-EndSection
-Section "Monitor"
- Identifier "Default Monitor"
-# Veuillez ajuster les paramètres ci-dessous si necessaire
-# HorizSync 30-81
-# VertRefresh 56-76
-EndSection
-Section "Screen"
- Identifier "Default Screen"
- Device "Normal Screen"
- Monitor "Default Monitor"
- DefaultDepth 16
-# La sous-section ci-dessous défini la résolution graphique
-# A ajuster en fontion de l'écran utilisé
- SubSection "Display"
- Depth 16
- Modes "1024x768"
- EndSubSection
-EndSection