Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

3 files changed, 11 insertions, 31 deletions

diff --git a/abs/core/filesystem/PKGBUILD b/abs/core/filesystem/PKGBUILD
index 0345d29..01b8a0d 100644
--- a/abs/core/filesystem/PKGBUILD
+++ b/abs/core/filesystem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90913 2010-09-18 23:00:51Z pierre $
+# $Id: PKGBUILD 96685 2010-10-24 09:56:25Z pierre $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=filesystem
-pkgver=2010.09
-pkgrel=2
+pkgver=2010.10
+pkgrel=1
 pkgdesc="Base filesystem"
 arch=('any')
 license=('GPL')
@@ -17,8 +17,8 @@ install=filesystem.install
 depends=('iana-etc')
 backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd
         etc/shadow etc/gshadow etc/resolv.conf etc/motd etc/nsswitch.conf
-        etc/shells etc/host.conf etc/securetty etc/profile etc/issue)
-source=(group issue nsswitch.conf securetty host.conf ld.so.conf
+        etc/shells etc/host.conf etc/securetty etc/profile )
+source=(group  nsswitch.conf securetty host.conf ld.so.conf
         passwd shadow fstab crypttab hosts motd resolv.conf shells
         gshadow profile modprobe.d.usb-load-ehci-first)
 md5sums=('75c7e1770305e1f3b75c52785c137611'
@@ -29,22 +29,21 @@ md5sums=('75c7e1770305e1f3b75c52785c137611'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
          '8a9042a2cedf6b6b47eb8973f14289cb'
          'b8355d9d2782f424f4cedcf682651be0'
-         '57c5cc9da249c3b06a70fd7efb8c34a5'
+         'ef40305da5803ca69d22e428ffc2ab9b'
          'e5d8323a4dbee7a6d0d2a19cbf4b819f'
          '81b3cb42a6ddabc2ed2310511ee9c859'
          'd41d8cd98f00b204e9800998ecf8427e'
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '40dac0de4c6b99c8ca97effbd7527c84'
          '5340b9287b71ffe9d4d99510bffe933f'
-         'f7ba22b78c5d2b53f86227aa2447e7ea'
+         'ccc4e6292ae594f16b44c66c7769765c'
          '8098ffd9fbf890468d3198277596b85a')
 
 build()
 {
   cd ${pkgdir}
-  mkdir -p bin boot dev etc home lib mnt proc root sbin tmp usr var opt srv sys
+  mkdir -p bin boot dev etc home lib media mnt proc root sbin tmp usr var opt srv sys
   chmod 555 proc
-  mkdir -p media/{fl,cd,dvd}
   mkdir -p usr/{bin,include,lib,sbin,share/misc,src}
 
   mkdir -p usr/share/man/man{1,2,3,4,5,6,7,8}
@@ -94,21 +93,19 @@ build()
   mkdir ${pkgdir}/var/empty
   touch ${pkgdir}/var/empty/.keep
 }
-
 md5sums=('75c7e1770305e1f3b75c52785c137611'
-         '1bdc5dba66947d74866a5df8ce9ef3b1'
          '13753e4e0964f3652b0cc60a28528bdf'
          'f97799ef3d8990f2eda9166122d8d5aa'
          'f28150d4c0b22a017be51b9f7f9977ed'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
          '8a9042a2cedf6b6b47eb8973f14289cb'
          'b8355d9d2782f424f4cedcf682651be0'
-         '57c5cc9da249c3b06a70fd7efb8c34a5'
+         'ef40305da5803ca69d22e428ffc2ab9b'
          'e5d8323a4dbee7a6d0d2a19cbf4b819f'
          '81b3cb42a6ddabc2ed2310511ee9c859'
          'd41d8cd98f00b204e9800998ecf8427e'
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '40dac0de4c6b99c8ca97effbd7527c84'
          '5340b9287b71ffe9d4d99510bffe933f'
-         'f7ba22b78c5d2b53f86227aa2447e7ea'
+         'ccc4e6292ae594f16b44c66c7769765c'
          '8098ffd9fbf890468d3198277596b85a')
diff --git a/abs/core/filesystem/fstab b/abs/core/filesystem/fstab
index ee16ccc..a23e795 100644
--- a/abs/core/filesystem/fstab
+++ b/abs/core/filesystem/fstab
@@ -4,8 +4,3 @@
 # <file system>        <dir>         <type>    <options>          <dump> <pass>
 devpts                 /dev/pts      devpts    defaults            0      0
 shm                    /dev/shm      tmpfs     nodev,nosuid        0      0
-
-/dev/cdrom             /media/cd   auto    ro,user,noauto,unhide   0      0
-/dev/dvd               /media/dvd  auto    ro,user,noauto,unhide   0      0
-/dev/fd0               /media/fl   auto    user,noauto             0      0
-
diff --git a/abs/core/filesystem/profile b/abs/core/filesystem/profile
index cf461f7..e7a958a 100644
--- a/abs/core/filesystem/profile
+++ b/abs/core/filesystem/profile
@@ -24,6 +24,7 @@ fi
 
 # Load shell specific profile settings
 test -f "/etc/profile.$shell" &&  . "/etc/profile.$shell"
+unset shell
 
 #Set our umask
 umask 022
@@ -32,19 +33,6 @@ umask 022
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 export PATH
 
-# Export default pkg-config path
-PKG_CONFIG_PATH="/usr/lib/pkgconfig"
-export PKG_CONFIG_PATH
-
-# Some readline stuff that is fairly common
-HISTSIZE=1000
-HISTCONTROL="erasedups"
-
-INPUTRC="/etc/inputrc"
-LESS="-R"
-
-export HISTSIZE HISTCONTROL INPUTRC LESS
-
 # Load profiles from /etc/profile.d
 if test -d /etc/profile.d/; then
     for profile in /etc/profile.d/*.sh; do