filesystem: updated to 3.4

diff --git a/filesystem/.footprint b/filesystem/.footprint
index e336860ece7c95272e06fca6127291f93ed2bef2..dd55c856fad1dfd5c944c50dbcdd263195069aee 100644 (file)
--- a/filesystem/.footprint
+++ b/filesystem/.footprint
@@ -18,6 +18,8 @@ lrwxrwxrwx    root/root       etc/mtab -> /proc/self/mounts
 drwxr-xr-x     root/root       home/
 drwxr-xr-x     root/root       lib/
 drwxr-xr-x     root/root       lib/modules/
 drwxr-xr-x     root/root       home/
 drwxr-xr-x     root/root       lib/
 drwxr-xr-x     root/root       lib/modules/

+drwxr-xr-x     root/root       lib32/
+lrwxrwxrwx     root/root       lib64 -> lib

 drwxr-xr-x     root/root       mnt/
 drwxr-xr-x     root/root       opt/
 drwxr-xr-x     root/root       opt/bin/
 drwxr-xr-x     root/root       mnt/
 drwxr-xr-x     root/root       opt/
 drwxr-xr-x     root/root       opt/bin/


@@ -33,6 +35,8 @@ drwxr-xr-x    root/root       usr/bin/
 -rwxr-xr-x     root/root       usr/bin/crux
 drwxr-xr-x     root/root       usr/include/
 drwxr-xr-x     root/root       usr/lib/
 -rwxr-xr-x     root/root       usr/bin/crux
 drwxr-xr-x     root/root       usr/include/
 drwxr-xr-x     root/root       usr/lib/

+drwxr-xr-x     root/root       usr/lib32/
+lrwxrwxrwx     root/root       usr/lib64 -> lib

 drwxr-xr-x     root/root       usr/sbin/
 drwxr-xr-x     root/root       usr/share/
 drwxr-xr-x     root/root       usr/share/man/
 drwxr-xr-x     root/root       usr/sbin/
 drwxr-xr-x     root/root       usr/share/
 drwxr-xr-x     root/root       usr/share/man/

diff --git a/filesystem/.md5sum b/filesystem/.md5sum
index f6b16d13780c10c7d52216bb5bc85e5f947c54af..602dc1ce9dda17575a954f997c6365fb5d1a7c65 100644 (file)
--- a/filesystem/.md5sum
+++ b/filesystem/.md5sum
@@ -1,4 +1,4 @@
-2838175205219d8d3609aad83e83f3a6  fstab
+b7466fc1abdd9cbf44fe22a19d40def1  fstab

 7e668cdf21a22956f1bb8ef119c0da07  group
 ca2a8cf1bf672f64af8807259b9abf63  issue
 346ede8d637940e2898cd29c56a37d30  mime.types
 7e668cdf21a22956f1bb8ef119c0da07  group
 ca2a8cf1bf672f64af8807259b9abf63  issue
 346ede8d637940e2898cd29c56a37d30  mime.types

diff --git a/filesystem/Pkgfile b/filesystem/Pkgfile
index ceb51c0ab688ce79c9394b00ef0bde5f47b91437..e1b6c1b775c80413f799025ee3786a3263fd88f8 100644 (file)
--- a/filesystem/Pkgfile
+++ b/filesystem/Pkgfile
@@ -3,75 +3,77 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=filesystem
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=filesystem

-version=3.3
-release=1
+version=3.4
+release=2

 source=(issue motd shells group passwd shadow securetty fstab mime.types)
 
 build() {
 source=(issue motd shells group passwd shadow securetty fstab mime.types)
 
 build() {

-  # Directory structure
-  install -d $PKG/bin
-  install -d $PKG/sbin
-  install -d $PKG/boot
-  install -d $PKG/dev
-  install -d $PKG/dev/{pts,shm}
-  install -d $PKG/proc
-  install -d $PKG/sys
-  install -d $PKG/etc
-  install -d $PKG/mnt
-  install -d $PKG/run
-  install -d $PKG/lib
-  install -d $PKG/lib/modules
-  install -d $PKG/opt
-  install -d $PKG/opt/bin
-  install -d $PKG/opt/sbin
-  install -d $PKG/usr
-  install -d $PKG/usr/{bin,include,lib,sbin,share,src}
-  install -d -p $PKG/usr/share/man/man{1,2,3,4,5,6,7,8}
-  ln -s ../var $PKG/usr/var
-  install -d $PKG/var
-  install -d $PKG/var/cache
-  install -d $PKG/var/lib
-  install -d $PKG/var/lib/pkg
-  install -d $PKG/var/log
-  install -d $PKG/var/log/old
-  install -d $PKG/var/run
-  touch $PKG/var/run/utmp
-  install -d $PKG/var/spool
-  install -d $PKG/var/ftp
-  install -d $PKG/var/www
-  install -d $PKG/var/empty
-  ln -s spool/mail $PKG/var/mail
-  install -d $PKG/home
+    # Directory structure
+    install -d $PKG/bin
+    install -d $PKG/sbin
+    install -d $PKG/boot
+    install -d $PKG/dev
+    install -d $PKG/dev/{pts,shm}
+    install -d $PKG/proc
+    install -d $PKG/sys
+    install -d $PKG/etc
+    install -d $PKG/mnt
+    install -d $PKG/run
+    install -d $PKG/lib{,32}
+    ln -s lib $PKG/lib64
+    install -d $PKG/lib/modules
+    install -d $PKG/opt
+    install -d $PKG/opt/bin
+    install -d $PKG/opt/sbin
+    install -d $PKG/usr
+    install -d $PKG/usr/{bin,include,lib{,32},sbin,share,src}
+    ln -s lib $PKG/usr/lib64
+    install -d -p $PKG/usr/share/man/man{1,2,3,4,5,6,7,8}
+    ln -s ../var $PKG/usr/var
+    install -d $PKG/var
+    install -d $PKG/var/cache
+    install -d $PKG/var/lib
+    install -d $PKG/var/lib/pkg
+    install -d $PKG/var/log
+    install -d $PKG/var/log/old
+    install -d $PKG/var/run
+    touch $PKG/var/run/utmp
+    install -d $PKG/var/spool
+    install -d $PKG/var/ftp
+    install -d $PKG/var/www
+    install -d $PKG/var/empty
+    ln -s spool/mail $PKG/var/mail
+    install -d $PKG/home

 
 

-  install -d -m 1777 $PKG/tmp
-  install -d -m 0750 $PKG/root
-  install -d -m 1777 $PKG/var/lock
-  install -d -m 1777 $PKG/var/spool/mail
-  install -d -m 1777 $PKG/var/tmp
+    install -d -m 1777 $PKG/tmp
+    install -d -m 0750 $PKG/root
+    install -d -m 1777 $PKG/var/lock
+    install -d -m 1777 $PKG/var/spool/mail
+    install -d -m 1777 $PKG/var/tmp

 
 

-  # /dev
-  mknod $PKG/dev/console c 5 1
-  chmod 0600 $PKG/dev/console
+    # /dev
+    mknod $PKG/dev/console c 5 1
+    chmod 0600 $PKG/dev/console

 
 

-  # /etc
-  install -m 0644 issue $PKG/etc
-  install -m 0644 motd $PKG/etc
-  install -m 0644 shells $PKG/etc
-  install -m 0644 group $PKG/etc
-  install -m 0644 passwd $PKG/etc
-  install -m 0640 shadow $PKG/etc
-  install -m 0644 securetty $PKG/etc
-  install -m 0644 fstab $PKG/etc
-  install -m 0644 mime.types $PKG/etc
-  ln -s /proc/self/mounts $PKG/etc/mtab
+    # /etc
+    install -m 0644 issue $PKG/etc
+    install -m 0644 motd $PKG/etc
+    install -m 0644 shells $PKG/etc
+    install -m 0644 group $PKG/etc
+    install -m 0644 passwd $PKG/etc
+    install -m 0640 shadow $PKG/etc
+    install -m 0644 securetty $PKG/etc
+    install -m 0644 fstab $PKG/etc
+    install -m 0644 mime.types $PKG/etc
+    ln -s /proc/self/mounts $PKG/etc/mtab

 
 

-  # /usr/bin/crux
-  cat > $PKG/usr/bin/crux << EOF
+    # /usr/bin/crux
+cat > $PKG/usr/bin/crux << EOF

 #!/bin/sh
 
 #!/bin/sh
 

-echo "CRUX-ARM version $version"
+echo "CRUX version $version"

 
 # End of file
 EOF
 
 # End of file
 EOF

-  chmod 755 $PKG/usr/bin/crux
+    chmod 755 $PKG/usr/bin/crux

 }
 }

diff --git a/filesystem/fstab b/filesystem/fstab
index da3c9ddc3d0fca91dbd112d473f403d1370ef895..33bc1238736a9dfbf0f57152a2e4fafafbdacd07 100644 (file)
--- a/filesystem/fstab
+++ b/filesystem/fstab
@@ -13,9 +13,11 @@
 #/dev/cdrom            /cdrom    iso9660   ro,user,noauto,unhide            0      0
 #/dev/dvd              /dvd      udf       ro,user,noauto,unhide            0      0
 #/dev/floppy/0         /floppy   vfat      user,noauto,unhide               0      0
 #/dev/cdrom            /cdrom    iso9660   ro,user,noauto,unhide            0      0
 #/dev/dvd              /dvd      udf       ro,user,noauto,unhide            0      0
 #/dev/floppy/0         /floppy   vfat      user,noauto,unhide               0      0

-devpts                 /dev/pts  devpts    noexec,nosuid,gid=tty,mode=0620  0      0

 #tmp                   /tmp      tmpfs     defaults                         0      0
 #tmp                   /tmp      tmpfs     defaults                         0      0

-#shm                   /dev/shm  tmpfs     defaults                         0      0

 #usb                   /proc/bus/usb usbfs defaults                         0      0
 
 #usb                   /proc/bus/usb usbfs defaults                         0      0
 

+# the following entries are required for proper system operation
+devpts                 /dev/pts  devpts    noexec,nosuid,gid=tty,mode=0620  0      0
+shm                    /dev/shm  tmpfs     defaults                         0      0
+

 # End of file
 # End of file