uname: make uname -r and -v both print out full version info.

the world seems to expect this, and do this.

diff --git a/commands/packman/packman.sh b/commands/packman/packman.sh
index fe4d4eafd2c5a2bae5178da3f6ef5cf5c3568f57..8500deb189914868ae88d7d712e6335cfcd87f0c 100644 (file)
--- a/commands/packman/packman.sh
+++ b/commands/packman/packman.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-TAG=`uname -p`-`uname -r`.`uname -v`
-PACKDIR=`uname -p`/`uname -r`.`uname -v`
+TAG=`uname -p`-`uname -r`
+PACKDIR=`uname -p`/`uname -r`
 RC=/usr/etc/rc.package
 CDDIR=PACKAGES
 CDMP=/mnt

diff --git a/commands/uname/uname.c b/commands/uname/uname.c
index 24b37bab26bdab1ca5b11fd93cb3fe9117ce9516..5aa136b73d08f324fe14157a2329422298aa292d 100644 (file)
--- a/commands/uname/uname.c
+++ b/commands/uname/uname.c
@@ -23,7 +23,6 @@
 #define SYSNAME  ((unsigned) 0x01)
 #define NODENAME ((unsigned) 0x02)
 #define RELEASE  ((unsigned) 0x04)
-#define VERSION  ((unsigned) 0x08)
 #define U_MACHINE  ((unsigned) 0x10)
 #define ARCH     ((unsigned) 0x20)
 
@@ -79,7 +78,7 @@ char **argv;
                                case 'n': info |= NODENAME; break;
                                case 'r': info |= RELEASE;  break;
                                case 's': info |= SYSNAME;  break;
-                               case 'v': info |= VERSION;  break;
+                               case 'v': info |= RELEASE;  break;
                                case 'p': info |= ARCH;     break;
                                default: usage();
                        }
@@ -107,19 +106,16 @@ char **argv;
        if ((info & (SYSNAME|NODENAME)) != 0)
                print(STDOUT_FILENO, " ", (char *) NULL);
        print(STDOUT_FILENO, un.release, (char *) NULL);
-  }
-  if ((info & VERSION) != 0) {
-       if ((info & (SYSNAME|NODENAME|RELEASE)) != 0)
-               print(STDOUT_FILENO, " ", (char *) NULL);
+       print(STDOUT_FILENO, ".", (char *) NULL);
        print(STDOUT_FILENO, un.version, (char *) NULL);
   }
   if ((info & U_MACHINE) != 0) {
-       if ((info & (SYSNAME|NODENAME|RELEASE|VERSION)) != 0)
+       if ((info & (SYSNAME|NODENAME|RELEASE)) != 0)
                print(STDOUT_FILENO, " ", (char *) NULL);
        print(STDOUT_FILENO, un.machine, (char *) NULL);
   }
   if ((info & ARCH) != 0) {
-       if ((info & (SYSNAME|NODENAME|RELEASE|VERSION|U_MACHINE)) != 0)
+       if ((info & (SYSNAME|NODENAME|RELEASE|U_MACHINE)) != 0)
                print(STDOUT_FILENO, " ", (char *) NULL);
        print(STDOUT_FILENO, un.arch, (char *) NULL);
   }

diff --git a/tools/mkboot b/tools/mkboot
index 1f46e6fb194fa9a9a55297037155f973bb1c958b..74b85a54db320e6624c3dda642a8117fe26fe715 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -58,7 +58,7 @@ hdboot)
                    "exec mv $rootdir/boot/image /M"
                install -d $rootdir/boot/image
                su root -c \
-                   "exec mv $rootdir/M $rootdir/boot/image/`uname -r`.`uname -v`"
+                   "exec mv $rootdir/M $rootdir/boot/image/`uname -r`
        fi
 
        sh tell_config OS_RELEASE . OS_VERSION >/tmp/mkb.$$

diff --git a/tools/release.sh b/tools/release.sh
index 39a7193b64e372b6f5a4103122eb5b6680db4213..ee1fe5f2ed09a489e2bca389eb5ee06e8ee1923f 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -224,7 +224,7 @@ if [ $PACKAGES -ne 0 ]
 then   mkdir -p $PACKAGEDIR || true
        mkdir -p $PACKAGESOURCEDIR || true
        rm -f $PACKAGEDIR/List
-       retrieve $PACKAGEDIR $PACKAGELIST packages/`uname -p`/`uname -r`.`uname -v`
+       retrieve $PACKAGEDIR $PACKAGELIST packages/`uname -p`/`uname -r`
        retrieve $PACKAGESOURCEDIR $PACKAGESOURCELIST software
 fi