aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README6
-rwxr-xr-xbin/g2
-rwxr-xr-xdist/debian/mkrep3
-rw-r--r--include/libc.h1
-rw-r--r--install.txt85
-rw-r--r--ndb/local1
-rw-r--r--src/cmd/venti/srv/bloom.c2
-rw-r--r--src/cmd/venti/srv/part.c2
8 files changed, 96 insertions, 6 deletions
diff --git a/README b/README
index 1316a402..8cec190c 100644
--- a/README
+++ b/README
@@ -3,8 +3,10 @@ This is a port of many Plan 9 libraries and programs to Unix.
* Installation
To install, run ./INSTALL. It builds mk and then uses mk to
-run the rest of the installation. For more details, see install(1),
-at http://swtch.com/plan9port/man/man1/install.html.
+run the rest of the installation.
+
+For more details, see install(1), at install.txt in this directory
+and at http://swtch.com/plan9port/man/man1/install.html.
* Documentation
diff --git a/bin/g b/bin/g
index 07d4ec36..11801320 100755
--- a/bin/g
+++ b/bin/g
@@ -30,7 +30,7 @@ case $# in
;;
1)
pattern="$1"
- files=`/bin/ls *.[bcChlmy] *.cc *.lx *.cgi *.pl *.py *.tex *.ms *.java *.xy 2>/dev/null |
+ files=`/bin/ls *.[bcChlmy] *.cc *.cs *.lx *.cgi *.pl *.py *.tex *.ms *.java *.xy 2>/dev/null |
9 grep -v '\.tab?\.[ch]$'`
;;
*)
diff --git a/dist/debian/mkrep b/dist/debian/mkrep
index 95a0e455..17ca1ee7 100755
--- a/dist/debian/mkrep
+++ b/dist/debian/mkrep
@@ -4,10 +4,13 @@ cd /scratch/rsc/plan9
cvs up -dAP
cd dist; ./mkfilelist >filelist
cp filelist /usr/local/plan9/dist
+cd /usr/local/plan9/dist/debian
rm -rf dists pool
mkdir -p dists pool
./mkpkg all
+mkdir other
+cp other/*.deb pool
d=dists/testing/main/binary-i386
mkdir -p $d
apt-ftparchive packages pool |tee $d/Packages |gzip >$d/Packages.gz
diff --git a/include/libc.h b/include/libc.h
index 93fa1d05..8b0c43c0 100644
--- a/include/libc.h
+++ b/include/libc.h
@@ -833,7 +833,6 @@ extern int post9pservice(int, char*);
#define main p9main
#endif
-/* compiler checking on plan 9, in rscc */
#ifdef VARARGCK
#pragma varargck type "lld" vlong
#pragma varargck type "llx" vlong
diff --git a/install.txt b/install.txt
new file mode 100644
index 00000000..9646ce42
--- /dev/null
+++ b/install.txt
@@ -0,0 +1,85 @@
+
+ INSTALL(1) INSTALL(1)
+
+ NAME
+ install - notes about Plan 9 from User Space installation
+
+ SYNOPSIS
+ cd /usr/local/plan9; ./INSTALL
+
+ DESCRIPTION
+ To obtain the Plan 9 tree, use CVS (see cvs(1)) or download
+ a tar file from http://swtch.com/plan9port.
+
+ In the root of the tree, run ./INSTALL. This script first
+ uses make(1) to build the Plan 9 build program mk(1) if nec-
+ essary. It cleans all previously built object files and
+ libraries out of the tree, rebuilds and installs everything,
+ and then cleans up.
+
+ There are a few files in tree which have the root hard-coded
+ in them. After the build, INSTALL edits these files to
+ replace the string /usr/local/plan9 with the name of the
+ root of the current tree.
+
+ Finally, INSTALL builds an HTML version of the manual and
+ installs it in /usr/local/plan9/man.
+
+ INSTALL can safely be repeated to rebuild the system from
+ scratch.
+
+ At the end of the build, INSTALL prints suggested settings
+ for the environment variables $PLAN9 and $PATH. After set-
+ ting those, the script $PLAN9/dist/isum will print a short
+ summary of the installation output, omitting the usual com-
+ mand chatter but preserving compiler warnings and errors.
+
+ Plan 9 from User Space uses different threading implementa-
+ tions on Linux 2.6 and later kernels than on 2.4 and ear-
+ lier; and on FreeBSD 5 and later kernels than on FreeBSD 4
+ and earlier. Running binaries from one class on another
+ will not work.
+
+ Some Linux 2.6 systems (e.g., Gentoo) do not use the new
+ NPTL pthread library even though the kernel supports them.
+ On these systems, plan9port must fall back on the threading
+ code intended for Linux 2.4. To accomplish this, INSTALL
+ checks whether the running system uses NPTL and sets
+ SYSVERSION in /usr/local/plan9/config accordingly. The file
+ /usr/local/plan9/LOCAL.config is appended to config after
+ this auto-detection and can be used to override the choices.
+ If LOCAL.config contains a line WSYSTYPE=nowsys then the
+ system is built without using X11.
+
+ Page 1 Plan 9 (printed 11/28/05)
+
+ INSTALL(1) INSTALL(1)
+
+ Once the system is built for the first time, it can be main-
+ tained and rebuilt using mk(1).
+
+ FILES
+ /usr/local/plan9/lib/moveplan9.files
+ the list of files that need to have /usr/local/plan9
+ edited out of them
+
+ /usr/local/plan9/lib/moveplan9.sh
+ the script that edits the files
+
+ /usr/local/plan9/src/mkmk.sh
+ the shell script used to build mk(1)
+
+ /usr/local/plan9/dist/manweb
+ the shell script that builds the HTML manual
+
+ /usr/local/plan9/man/index.html
+ the top-level page in the HTML version of the manual
+
+ /usr/local/plan9/install.log
+ logged output from the last run of INSTALL
+
+ SEE ALSO
+ intro(1), cvs(1)
+
+ Page 2 Plan 9 (printed 11/28/05)
+
diff --git a/ndb/local b/ndb/local
index 00083687..df83d34a 100644
--- a/ndb/local
+++ b/ndb/local
@@ -16,3 +16,4 @@ authdom=cs.bell-labs.com
authdom=tip9ug.jp
auth=mordor.tip9ug.jp
+authdom=pdos.csail.mit.edu auth=glenda.csail.mit.edu
diff --git a/src/cmd/venti/srv/bloom.c b/src/cmd/venti/srv/bloom.c
index 5c50a0df..d0a5c9d9 100644
--- a/src/cmd/venti/srv/bloom.c
+++ b/src/cmd/venti/srv/bloom.c
@@ -24,7 +24,6 @@ bloominit(Bloom *b, vlong vsize, u8int *data)
if(unpackbloomhead(b, data) < 0)
return -1;
-fprint(2, "bloom size %lud nhash %d\n", b->size, b->nhash);
b->mask = b->size-1;
b->data = data;
return 0;
@@ -49,7 +48,6 @@ readbloom(Part *p)
b = vtmallocz(sizeof *b);
if(readpart(p, 0, buf, sizeof buf) < 0)
return nil;
-fprint(2, "header %.16H\n", buf);
if(bloominit(b, 0, buf) < 0){
vtfree(b);
return nil;
diff --git a/src/cmd/venti/srv/part.c b/src/cmd/venti/srv/part.c
index df79341d..f804af88 100644
--- a/src/cmd/venti/srv/part.c
+++ b/src/cmd/venti/srv/part.c
@@ -145,6 +145,8 @@ initpart(char *name, int mode)
if(hi == 0)
hi = dir->length;
part->size = hi - part->offset;
+fprint(2, "part %s: file %s offset %,lld size %,lld\n",
+ name, file, part->offset, part->size);
#ifdef CANBLOCKSIZE
{
struct statfs sfs;