Upgraded diskdev-cmds and shell-cmds, as they are somewhat fundamental.

git-svn-id: http://svn.telesphoreo.org/trunk@567 514c082c-b64e-11dc-b46d-3d985efe055d

6 files changed, 14 insertions, 9 deletions

diff --git a/data/diskdev-cmds/_metadata/libutil.dep b/data/diskdev-cmds/_metadata/libutil.dep
deleted file mode 120000
index 828c65dfc..000000000
--- a/data/diskdev-cmds/_metadata/libutil.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libutil
\ No newline at end of file
diff --git a/data/diskdev-cmds/_metadata/priority b/data/diskdev-cmds/_metadata/priority
index fad9e164a..d0b3ce728 100644
--- a/data/diskdev-cmds/_metadata/priority
+++ b/data/diskdev-cmds/_metadata/priority
@@ -1 +1 @@
-required
++required
diff --git a/data/diskdev-cmds/_metadata/version b/data/diskdev-cmds/_metadata/version
index 7b53aa000..2b70dea57 100644
--- a/data/diskdev-cmds/_metadata/version
+++ b/data/diskdev-cmds/_metadata/version
@@ -1 +1 @@
-419
+421.7
diff --git a/data/diskdev-cmds/diskdev_cmds-419.tar.gz b/data/diskdev-cmds/diskdev_cmds-419.tar.gz
deleted file mode 100644
index 0ad8555e9..000000000
--- a/data/diskdev-cmds/diskdev_cmds-419.tar.gz
+++ /dev/null
diff --git a/data/diskdev-cmds/diskdev_cmds-421.7.tar.gz b/data/diskdev-cmds/diskdev_cmds-421.7.tar.gz
new file mode 100644
index 000000000..4693e32ec
--- /dev/null
+++ b/data/diskdev-cmds/diskdev_cmds-421.7.tar.gz
diff --git a/data/diskdev-cmds/make.sh b/data/diskdev-cmds/make.sh
index 5c1c8d6c5..1b9b8cf73 100644
--- a/data/diskdev-cmds/make.sh
+++ b/data/diskdev-cmds/make.sh
@@ -3,20 +3,25 @@ pkg:setup
 
 cd disklib
 rm -f mntopts.h getmntopts.c
-${PKG_TARG}-gcc -c *.c
+${PKG_TARG}-gcc -fno-common -c *.c
 ${PKG_TARG}-ar -r libdisk.a *.o
 cd ..
 
-for tproj in !(fstyp|dev_mkdb|dump|fsck_hfs|fuser|mount_hfs|restore|quotacheck|ufs).tproj; do
+for tproj in !(fstyp|fsck_hfs|fuser|mount_portal|mount_swapfs|mount_umap).tproj; do
     tproj=$(basename "${tproj}" .tproj)
     echo ${tproj}
 
     extra=
-    if [[ ${tproj} = mount_cd9660 ]]; then
+
+    if [[ ${tproj} = restore ]]; then
+        extra="${extra} -DRRESTORE"
+    fi
+
+    if [[ ${tproj} = mount_cd9660 || ${tproj} = mount_hfs ]]; then
         extra="${extra} -framework IOKit"
     fi
 
-    if [[ ${tproj} = mount_cd9660 || ${tproj} = newfs_hfs ]]; then
+    if [[ ${tproj} = mount_cd9660 || ${tproj} = mount_hfs || ${tproj} = newfs_hfs ]]; then
         extra="${extra} -framework CoreFoundation"
     fi
 
@@ -34,7 +39,8 @@ chmod u+s umount quota
 
 pkg: mkdir -p /usr/bin /usr/libexec /usr/sbin /sbin
 
+# XXX: mt ufs
 pkg: cp -a quota /usr/bin
-pkg: cp -a vsdbutil repquota fdisk edquota quot quotaon /usr/sbin
+pkg: cp -a dev_mkdb edquota fdisk quot quotaon repquota vsdbutil /usr/sbin
 pkg: cp -a vndevice /usr/libexec
-pkg: cp -a clri dumpfs tunefs umount @(fsck|fstyp|mount|newfs)?(_*([a-z0-9])) /sbin
+pkg: cp -a clri dump dumpfs quotacheck restore tunefs umount @(fsck|fstyp|mount|newfs)?(_*([a-z0-9])) /sbin