From 4467fabff8e0c9fb1c942eb2e5d399f1cae281bd Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 2 Dec 2015 15:14:14 +0000 Subject: [PATCH] filesystem: updated mandir and added new shell dash --- filesystem/.footprint | 19 +++---- filesystem/.md5sum | 4 +- filesystem/Pkgfile | 122 ++++++++++++++++++++---------------------- filesystem/fstab | 34 ++++++------ filesystem/shells | 1 + 5 files changed, 86 insertions(+), 94 deletions(-) diff --git a/filesystem/.footprint b/filesystem/.footprint index 1e3a264..86284b5 100644 --- a/filesystem/.footprint +++ b/filesystem/.footprint @@ -18,6 +18,7 @@ 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 lib32/ drwxr-xr-x root/root mnt/ drwxr-xr-x root/root opt/ drwxr-xr-x root/root opt/bin/ @@ -33,17 +34,17 @@ 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/ -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ -drwxr-xr-x root/root usr/man/man2/ -drwxr-xr-x root/root usr/man/man3/ -drwxr-xr-x root/root usr/man/man4/ -drwxr-xr-x root/root usr/man/man5/ -drwxr-xr-x root/root usr/man/man6/ -drwxr-xr-x root/root usr/man/man7/ -drwxr-xr-x root/root usr/man/man8/ 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/share/man/man1/ +drwxr-xr-x root/root usr/share/man/man2/ +drwxr-xr-x root/root usr/share/man/man3/ +drwxr-xr-x root/root usr/share/man/man4/ +drwxr-xr-x root/root usr/share/man/man5/ +drwxr-xr-x root/root usr/share/man/man6/ +drwxr-xr-x root/root usr/share/man/man7/ +drwxr-xr-x root/root usr/share/man/man8/ drwxr-xr-x root/root usr/src/ lrwxrwxrwx root/root usr/var -> ../var drwxr-xr-x root/root var/ diff --git a/filesystem/.md5sum b/filesystem/.md5sum index ce14ef1..0874bb6 100644 --- a/filesystem/.md5sum +++ b/filesystem/.md5sum @@ -1,4 +1,4 @@ -1ea1c43f6dceaf64d1a8d96fda1d4c2b fstab +e9399bfd7a5e1ea4cfbe7871e282a0fc fstab 7e668cdf21a22956f1bb8ef119c0da07 group ca2a8cf1bf672f64af8807259b9abf63 issue 346ede8d637940e2898cd29c56a37d30 mime.types @@ -6,4 +6,4 @@ d41d8cd98f00b204e9800998ecf8427e motd 5f548195598fc07c16cf826256d4a471 passwd 4faaa4e1ba24038f8638a0cae5046cfb securetty cf485c9730cb02e69176eb6aa6b75303 shadow -0267fc00722e42588ad7ab4fe35067b8 shells +dc4ff0c96d8dcd2141febc8b766e9a6b shells diff --git a/filesystem/Pkgfile b/filesystem/Pkgfile index 34759dd..0ec6a86 100644 --- a/filesystem/Pkgfile +++ b/filesystem/Pkgfile @@ -4,81 +4,75 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=filesystem -version=3.1 -release=2 +version=3.2 +release=4 source=(issue motd shells group passwd shadow securetty fstab mime.types) build() { - # Directory structure - mkdir $PKG/bin - mkdir $PKG/sbin - mkdir $PKG/boot - mkdir $PKG/dev - mkdir $PKG/dev/{pts,shm} - mkdir $PKG/proc - mkdir $PKG/sys - mkdir $PKG/etc - mkdir $PKG/tmp - mkdir $PKG/mnt - mkdir $PKG/root - mkdir $PKG/run - mkdir $PKG/lib - mkdir $PKG/lib/modules - mkdir $PKG/opt - mkdir $PKG/opt/bin - mkdir $PKG/opt/sbin - mkdir $PKG/usr - mkdir $PKG/usr/{bin,include,lib,sbin,share,src,man} - mkdir $PKG/usr/man/man{1,2,3,4,5,6,7,8} - ln -s ../var $PKG/usr/var - mkdir $PKG/var - mkdir $PKG/var/cache - mkdir $PKG/var/lib - mkdir $PKG/var/lib/pkg - mkdir $PKG/var/lock - mkdir $PKG/var/log - mkdir $PKG/var/log/old - mkdir $PKG/var/run - touch $PKG/var/run/utmp - mkdir $PKG/var/spool - mkdir $PKG/var/spool/mail - mkdir $PKG/var/tmp - mkdir $PKG/var/ftp - mkdir $PKG/var/www - mkdir $PKG/var/empty - ln -s spool/mail $PKG/var/mail - mkdir $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} + 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 - chmod 1777 $PKG/var/spool/mail - chmod 1777 $PKG/tmp - chmod 1777 $PKG/var/lock - chmod 1777 $PKG/var/tmp - chmod 0750 $PKG/root + 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 - cp issue $PKG/etc - cp motd $PKG/etc - cp shells $PKG/etc - cp group $PKG/etc - cp passwd $PKG/etc - cp shadow $PKG/etc - cp securetty $PKG/etc - cp fstab $PKG/etc - cp mime.types $PKG/etc - ln -s /proc/self/mounts $PKG/etc/mtab - chmod 640 $PKG/etc/shadow + # /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 echo "CRUX-ARM version $version" # 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 13a0139..1f70f5b 100644 --- a/filesystem/fstab +++ b/filesystem/fstab @@ -1,25 +1,21 @@ # # /etc/fstab: static file system information # -# +# -#/dev/#REISERFS_ROOT# / reiserfs defaults 0 0 -#/dev/#EXT3FS_ROOT# / ext3 defaults 0 1 -#/dev/#EXT4FS_ROOT# / ext4 defaults 0 1 -#/dev/#JFS_ROOT# / jfs defaults 1 1 -#/dev/#XFS_ROOT# / xfs defaults 0 0 -#/dev/#SWAP# swap swap defaults 0 0 -#/dev/#REISERFS_HOME# /home reiserfs defaults 0 0 -#/dev/#EXT3FS_HOME# /home ext3 defaults 0 2 -#/dev/#EXT4FS_HOME# /home ext4 defaults 0 2 -#/dev/#JFS_HOME# /home jfs defaults 1 2 -#/dev/#XFS_HOME# /home xfs defaults 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 defaults 0 0 -#tmp /tmp tmpfs defaults 0 0 -#shm /dev/shm tmpfs defaults 0 0 -#usb /proc/bus/usb usbfs defaults 0 0 +#/dev/#EXT4FS_ROOT# / ext4 defaults 0 0 +#/dev/#BTRFS_ROOT# / btrfs defaults 0 0 +#/dev/#XFS_ROOT# / xfs defaults 0 0 +#/dev/#SWAP# swap swap defaults 0 0 +#/dev/#EXT4FS_HOME# /home ext4 defaults 0 2 +#/dev/#BTRFS_HOME# /home btrfs defaults 0 0 +#/dev/#XFS_HOME# /home xfs defaults 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 +#shm /dev/shm tmpfs defaults 0 0 +#usb /proc/bus/usb usbfs defaults 0 0 # End of file diff --git a/filesystem/shells b/filesystem/shells index 46f459e..5ad41c0 100644 --- a/filesystem/shells +++ b/filesystem/shells @@ -4,5 +4,6 @@ /bin/sh /bin/bash +/bin/dash # End of file -- 2.26.2