Merge upstream version 11

NEWS

@@ -1,5 +1,8 @@
 -*- change-log -*-
-
+2006-09-21 "Adam J. Richter" <adam@yggdrasil.com>
+	add install target for makefile
+	vblade-11
+	
 2005-12-06 Ed L. Cashin <ecashin@coraid.com>
 	fix u64 configuration on FreeBSD
 	release vblade-10

README

@@ -1,17 +1,12 @@
-This is a beta release of vblade, the virtual EtherDrive (R) blade.
-The vblade is a program that makes a seekable file available over an
-ethernet local area network (LAN) via the ATA over Ethernet (AoE)
-protocol.
+The vblade is the virtual EtherDrive (R) blade, a program that makes a
+seekable file available over an ethernet local area network (LAN) via
+the ATA over Ethernet (AoE) protocol.
 
 The seekable file is typically a block device like /dev/md0 but even
 regular files will work.  When vblade exports the block storage over
 AoE it becomes a storage target.  Another host on the same LAN can
 access the storage if it has a compatible aoe kernel driver.
 
-The Linux aoe driver for the 2.6 kernel is compatible if you use
-aoe-2.6-7 or newer.  You can use older aoe drivers but you will only
-be able to see one vblade per MAC address.
-
 The following command should build the vblade program on a Linux-based
 system:
 
@@ -79,3 +74,17 @@ another host on the LAN.
   hooray
 
 Remember: be as careful with these devices as you would with /dev/hda!
+
+AoE Initiator Compatibility
+---------------------------
+
+  The Linux aoe driver for the 2.6 kernel is compatible if you use
+  aoe-2.6-7 or newer.  You can use older aoe drivers but you will only
+  be able to see one vblade per MAC address.
+
+Kvblade
+-------
+
+  While vblade runs as a userland process (like "ls" or "vi"), there
+  is another program that runs inside the kernel.  It is called
+  kvblade.  It is alpha software.

dat.h

@@ -6,7 +6,7 @@
  */
 
 enum {
-	VBLADE_VERSION		= 10,
+	VBLADE_VERSION		= 11,
 
 	// Firmware version
 	FWV			= 0x4000 + VBLADE_VERSION,

makefile

@@ -3,6 +3,11 @@
 # see README for others
 PLATFORM=linux
 
+prefix = /usr
+sbindir = ${prefix}/sbin
+sharedir = ${prefix}/share
+mandir = ${sharedir}/man
+
 O=aoe.o ${PLATFORM}.o ata.o
 CFLAGS += -Wall -g -O2
 CC = gcc
@@ -28,3 +33,8 @@ config.h : config/config.h.in makefile
 
 clean :
 	rm -f $O vblade
+
+install : vblade vbladed
+	install vblade ${sbindir}/
+	install vbladed ${sbindir}/
+	install vblade.8 ${mandir}/man8/