From patchwork Thu Jul 28 20:03:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Fields X-Patchwork-Id: 1017632 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6SK3JGM008277 for ; Thu, 28 Jul 2011 20:03:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755639Ab1G1UDS (ORCPT ); Thu, 28 Jul 2011 16:03:18 -0400 Received: from fieldses.org ([174.143.236.118]:59043 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755579Ab1G1UDR (ORCPT ); Thu, 28 Jul 2011 16:03:17 -0400 Received: from bfields by fieldses.org with local (Exim 4.72) (envelope-from ) id 1QmWnb-0005HO-Q2; Thu, 28 Jul 2011 16:03:15 -0400 From: "J. Bruce Fields" To: Fred Isaman Cc: linux-nfs@vger.kernel.org, Mi Jinlong , "J. Bruce Fields" Subject: [PATCH 5/6] Merge top-level READMEs Date: Thu, 28 Jul 2011 16:03:03 -0400 Message-Id: <1311883384-20260-6-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1311883384-20260-1-git-send-email-bfields@redhat.com> References: <1311883384-20260-1-git-send-email-bfields@redhat.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 28 Jul 2011 20:03:20 +0000 (UTC) Signed-off-by: J. Bruce Fields --- README | 17 +++++++++++++---- README-4.1 | 8 -------- 2 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 README-4.1 diff --git a/README b/README index 4fc8ad3..e756871 100644 --- a/README +++ b/README @@ -1,4 +1,13 @@ -The 4.0 and 4.1 git trees have been merged, preparing for merging of -the actual code bases. As a first step, the original 4.0 code was -just moved down into the nfs4.0 directory. If yuo want to ignore the -4.1 work, just cd down to nfs4.0 and work from there as before. +This tree includes support for both 4.0 and 4.1 pynfs testing. It is +the merge of what were originally two independent projects--initially +the 4.0 pynfs code was all moved into the nfs4.0 directory, but as time +passes we expect to merge the two code bases. + +You can prepare both for use with a single + ./setup.py build_ext --inplace +which will create auto-generated files and compile any shared libraries +in place. + +For more details about 4.0 and 4.1 testing, see nfs4.0/README and +nfs4.1/README, respectively. For information about automatic code +generation from an XDR file, see xdr/README. diff --git a/README-4.1 b/README-4.1 deleted file mode 100644 index fcfe9d9..0000000 --- a/README-4.1 +++ /dev/null @@ -1,8 +0,0 @@ -For nfs4 testing, see the nfs4/README. -For automatic code generation frmo an XDR file, see xdr/README. - -First, if you need gss (kerberos), cd to the gssapi directoy -and run "python setup.py build_ext --inplace" - -To use, you will first need to run "python setup.py build" to generate -python files from xdr.