diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-05-05 19:15:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 19:36:42 -0400 |
commit | dfc1e148542f6f4951fd59e32c14a7368356db9d (patch) | |
tree | 781aba6044346d2ccc941e377641b15a448b4a1f | |
parent | d769a66970a947613f7c638c362f237583bd141b (diff) |
[PATCH] remove BK documentation
There's no longer a reason to document the obsolete BK usage.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | Documentation/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/BK-usage/00-INDEX | 51 | ||||
-rw-r--r-- | Documentation/BK-usage/bk-kernel-howto.txt | 283 | ||||
-rwxr-xr-x | Documentation/BK-usage/bk-make-sum | 34 | ||||
-rwxr-xr-x | Documentation/BK-usage/bksend | 36 | ||||
-rwxr-xr-x | Documentation/BK-usage/bz64wrap | 41 | ||||
-rwxr-xr-x | Documentation/BK-usage/cpcset | 36 | ||||
-rwxr-xr-x | Documentation/BK-usage/cset-to-linus | 49 | ||||
-rwxr-xr-x | Documentation/BK-usage/csets-to-patches | 44 | ||||
-rwxr-xr-x | Documentation/BK-usage/gcapatch | 8 | ||||
-rwxr-xr-x | Documentation/BK-usage/unbz64wrap | 25 | ||||
-rw-r--r-- | fs/cifs/README | 6 |
12 files changed, 3 insertions, 612 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 72dc90f8f4a7..8de8a01a2474 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
@@ -12,8 +12,6 @@ Following translations are available on the WWW: | |||
12 | 12 | ||
13 | 00-INDEX | 13 | 00-INDEX |
14 | - this file. | 14 | - this file. |
15 | BK-usage/ | ||
16 | - directory with info on BitKeeper. | ||
17 | BUG-HUNTING | 15 | BUG-HUNTING |
18 | - brute force method of doing binary search of patches to find bug. | 16 | - brute force method of doing binary search of patches to find bug. |
19 | Changes | 17 | Changes |
diff --git a/Documentation/BK-usage/00-INDEX b/Documentation/BK-usage/00-INDEX deleted file mode 100644 index 82768784ea52..000000000000 --- a/Documentation/BK-usage/00-INDEX +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | bk-kernel-howto.txt: Description of kernel workflow under BitKeeper | ||
2 | |||
3 | bk-make-sum: Create summary of changesets in one repository and not | ||
4 | another, typically in preparation to be sent to an upstream maintainer. | ||
5 | Typical usage: | ||
6 | cd my-updated-repo | ||
7 | bk-make-sum ~/repo/original-repo | ||
8 | mv /tmp/linus.txt ../original-repo.txt | ||
9 | |||
10 | bksend: Create readable text output containing summary of changes, GNU | ||
11 | patch of the changes, and BK metadata of changes (as needed for proper | ||
12 | importing into BitKeeper by an upstream maintainer). This output is | ||
13 | suitable for emailing BitKeeper changes. The recipient of this output | ||
14 | may pipe it directly to 'bk receive'. | ||
15 | |||
16 | bz64wrap: helper script. Uncompressed input is piped to this script, | ||
17 | which compresses its input, and then outputs the uu-/base64-encoded | ||
18 | version of the compressed input. | ||
19 | |||
20 | cpcset: Copy changeset between unrelated repositories. | ||
21 | Attempts to preserve changeset user, user address, description, in | ||
22 | addition to the changeset (the patch) itself. | ||
23 | Typical usage: | ||
24 | cd my-updated-repo | ||
25 | bk changes # looking for a changeset... | ||
26 | cpcset 1.1511 . ../another-repo | ||
27 | |||
28 | csets-to-patches: Produces a delta of two BK repositories, in the form | ||
29 | of individual files, each containing a single cset as a GNU patch. | ||
30 | Output is several files, each with the filename "/tmp/rev-$REV.patch" | ||
31 | Typical usage: | ||
32 | cd my-updated-repo | ||
33 | bk changes -L ~/repo/original-repo 2>&1 | \ | ||
34 | perl csets-to-patches | ||
35 | |||
36 | cset-to-linus: Produces a delta of two BK repositories, in the form of | ||
37 | changeset descriptions, with 'diffstat' output created for each | ||
38 | individual changset. | ||
39 | Typical usage: | ||
40 | cd my-updated-repo | ||
41 | bk changes -L ~/repo/original-repo 2>&1 | \ | ||
42 | perl cset-to-linus > summary.txt | ||
43 | |||
44 | gcapatch: Generates patch containing changes in local repository. | ||
45 | Typical usage: | ||
46 | cd my-updated-repo | ||
47 | gcapatch > foo.patch | ||
48 | |||
49 | unbz64wrap: Reverse an encoded, compressed data stream created by | ||
50 | bz64wrap into an uncompressed, typically text/plain output. | ||
51 | |||
diff --git a/Documentation/BK-usage/bk-kernel-howto.txt b/Documentation/BK-usage/bk-kernel-howto.txt deleted file mode 100644 index b7b9075d2910..000000000000 --- a/Documentation/BK-usage/bk-kernel-howto.txt +++ /dev/null | |||
@@ -1,283 +0,0 @@ | |||
1 | |||
2 | Doing the BK Thing, Penguin-Style | ||
3 | |||
4 | |||
5 | |||
6 | |||
7 | This set of notes is intended mainly for kernel developers, occasional | ||
8 | or full-time, but sysadmins and power users may find parts of it useful | ||
9 | as well. It assumes at least a basic familiarity with CVS, both at a | ||
10 | user level (use on the cmd line) and at a higher level (client-server model). | ||
11 | Due to the author's background, an operation may be described in terms | ||
12 | of CVS, or in terms of how that operation differs from CVS. | ||
13 | |||
14 | This is -not- intended to be BitKeeper documentation. Always run | ||
15 | "bk help <command>" or in X "bk helptool <command>" for reference | ||
16 | documentation. | ||
17 | |||
18 | |||
19 | BitKeeper Concepts | ||
20 | ------------------ | ||
21 | |||
22 | In the true nature of the Internet itself, BitKeeper is a distributed | ||
23 | system. When applied to revision control, this means doing away with | ||
24 | client-server, and changing to a parent-child model... essentially | ||
25 | peer-to-peer. On the developer's end, this also represents a | ||
26 | fundamental disruption in the standard workflow of changes, commits, | ||
27 | and merges. You will need to take a few minutes to think about | ||
28 | how to best work under BitKeeper, and re-optimize things a bit. | ||
29 | In some sense it is a bit radical, because it might described as | ||
30 | tossing changes out into a maelstrom and having them magically | ||
31 | land at the right destination... but I'm getting ahead of myself. | ||
32 | |||
33 | Let's start with this progression: | ||
34 | Each BitKeeper source tree on disk is a repository unto itself. | ||
35 | Each repository has a parent (except the root/original, of course). | ||
36 | Each repository contains a set of a changesets ("csets"). | ||
37 | Each cset is one or more changed files, bundled together. | ||
38 | |||
39 | Each tree is a repository, so all changes are checked into the local | ||
40 | tree. When a change is checked in, all modified files are grouped | ||
41 | into a logical unit, the changeset. Internally, BK links these | ||
42 | changesets in a tree, representing various converging and diverging | ||
43 | lines of development. These changesets are the bread and butter of | ||
44 | the BK system. | ||
45 | |||
46 | After the concept of changesets, the next thing you need to get used | ||
47 | to is having multiple copies of source trees lying around. This -really- | ||
48 | takes some getting used to, for some people. Separate source trees | ||
49 | are the means in BitKeeper by which you delineate parallel lines | ||
50 | of development, both minor and major. What would be branches in | ||
51 | CVS become separate source trees, or "clones" in BitKeeper [heh, | ||
52 | or Star Wars] terminology. | ||
53 | |||
54 | Clones and changesets are the tools from which most of the power of | ||
55 | BitKeeper is derived. As mentioned earlier, each clone has a parent, | ||
56 | the tree used as the source when the new clone was created. In a | ||
57 | CVS-like setup, the parent would be a remote server on the Internet, | ||
58 | and the child is your local clone of that tree. | ||
59 | |||
60 | Once you have established a common baseline between two source trees -- | ||
61 | a common parent -- then you can merge changesets between those two | ||
62 | trees with ease. Merging changes into a tree is called a "pull", and | ||
63 | is analagous to 'cvs update'. A pull downloads all the changesets in | ||
64 | the remote tree you do not have, and merges them. Sending changes in | ||
65 | one tree to another tree is called a "push". Push sends all changes | ||
66 | in the local tree the remote does not yet have, and merges them. | ||
67 | |||
68 | From these concepts come some initial command examples: | ||
69 | |||
70 | 1) bk clone -q http://linux.bkbits.net/linux-2.5 linus-2.5 | ||
71 | Download a 2.5 stock kernel tree, naming it "linus-2.5" in the local dir. | ||
72 | The "-q" disables listing every single file as it is downloaded. | ||
73 | |||
74 | 2) bk clone -ql linus-2.5 alpha-2.5 | ||
75 | Create a separate source tree for the Alpha AXP architecture. | ||
76 | The "-l" uses hard links instead of copying data, since both trees are | ||
77 | on the local disk. You can also replace the above with "bk lclone -q ..." | ||
78 | |||
79 | You only clone a tree -once-. After cloning the tree lives a long time | ||
80 | on disk, being updating by pushes and pulls. | ||
81 | |||
82 | 3) cd alpha-2.5 ; bk pull http://gkernel.bkbits.net/alpha-2.5 | ||
83 | Download changes in "alpha-2.5" repository which are not present | ||
84 | in the local repository, and merge them into the source tree. | ||
85 | |||
86 | 4) bk -r co -q | ||
87 | Because every tree is a repository, files must be checked out before | ||
88 | they will be in their standard places in the source tree. | ||
89 | |||
90 | 5) bk vi fs/inode.c # example change... | ||
91 | bk citool # checkin, using X tool | ||
92 | bk push bk://gkernel@bkbits.net/alpha-2.5 # upload change | ||
93 | Typical example of a BK sequence that would replace the analagous CVS | ||
94 | situation, | ||
95 | vi fs/inode.c | ||
96 | cvs commit | ||
97 | |||
98 | As this is just supposed to be a quick BK intro, for more in-depth | ||
99 | tutorials, live working demos, and docs, see http://www.bitkeeper.com/ | ||
100 | |||
101 | |||
102 | |||
103 | BK and Kernel Development Workflow | ||
104 | ---------------------------------- | ||
105 | Currently the latest 2.5 tree is available via "bk clone $URL" | ||
106 | and "bk pull $URL" at http://linux.bkbits.net/linux-2.5 | ||
107 | This should change in a few weeks to a kernel.org URL. | ||
108 | |||
109 | |||
110 | A big part of using BitKeeper is organizing the various trees you have | ||
111 | on your local disk, and organizing the flow of changes among those | ||
112 | trees, and remote trees. If one were to graph the relationships between | ||
113 | a desired BK setup, you are likely to see a few-many-few graph, like | ||
114 | this: | ||
115 | |||
116 | linux-2.5 | ||
117 | | | ||
118 | merge-to-linus-2.5 | ||
119 | / | | | ||
120 | / | | | ||
121 | vm-hacks bugfixes filesys personal-hacks | ||
122 | \ | | / | ||
123 | \ | | / | ||
124 | \ | | / | ||
125 | testing-and-validation | ||
126 | |||
127 | Since a "bk push" sends all changes not in the target tree, and | ||
128 | since a "bk pull" receives all changes not in the source tree, you want | ||
129 | to make sure you are only pushing specific changes to the desired tree, | ||
130 | not all changes from "peer parent" trees. For example, pushing a change | ||
131 | from the testing-and-validation tree would probably be a bad idea, | ||
132 | because it will push all changes from vm-hacks, bugfixes, filesys, and | ||
133 | personal-hacks trees into the target tree. | ||
134 | |||
135 | One would typically work on only one "theme" at a time, either | ||
136 | vm-hacks or bugfixes or filesys, keeping those changes isolated in | ||
137 | their own tree during development, and only merge the isolated with | ||
138 | other changes when going upstream (to Linus or other maintainers) or | ||
139 | downstream (to your "union" trees, like testing-and-validation above). | ||
140 | |||
141 | It should be noted that some of this separation is not just recommended | ||
142 | practice, it's actually [for now] -enforced- by BitKeeper. BitKeeper | ||
143 | requires that changesets maintain a certain order, which is the reason | ||
144 | that "bk push" sends all local changesets the remote doesn't have. This | ||
145 | separation may look like a lot of wasted disk space at first, but it | ||
146 | helps when two unrelated changes may "pollute" the same area of code, or | ||
147 | don't follow the same pace of development, or any other of the standard | ||
148 | reasons why one creates a development branch. | ||
149 | |||
150 | Small development branches (clones) will appear and disappear: | ||
151 | |||
152 | -------- A --------- B --------- C --------- D ------- | ||
153 | \ / | ||
154 | -----short-term devel branch----- | ||
155 | |||
156 | While long-term branches will parallel a tree (or trees), with period | ||
157 | merge points. In this first example, we pull from a tree (pulls, | ||
158 | "\") periodically, such as what occurs when tracking changes in a | ||
159 | vendor tree, never pushing changes back up the line: | ||
160 | |||
161 | -------- A --------- B --------- C --------- D ------- | ||
162 | \ \ \ | ||
163 | ----long-term devel branch----------------- | ||
164 | |||
165 | And then a more common case in Linux kernel development, a long term | ||
166 | branch with periodic merges back into the tree (pushes, "/"): | ||
167 | |||
168 | -------- A --------- B --------- C --------- D ------- | ||
169 | \ \ / \ | ||
170 | ----long-term devel branch----------------- | ||
171 | |||
172 | |||
173 | |||
174 | |||
175 | |||
176 | Submitting Changes to Linus | ||
177 | --------------------------- | ||
178 | There's a bit of an art, or style, of submitting changes to Linus. | ||
179 | Since Linus's tree is now (you might say) fully integrated into the | ||
180 | distributed BitKeeper system, there are several prerequisites to | ||
181 | properly submitting a BitKeeper change. All these prereq's are just | ||
182 | general cleanliness of BK usage, so as people become experts at BK, feel | ||
183 | free to optimize this process further (assuming Linus agrees, of | ||
184 | course). | ||
185 | |||
186 | |||
187 | |||
188 | 0) Make sure your tree was originally cloned from the linux-2.5 tree | ||
189 | created by Linus. If your tree does not have this as its ancestor, it | ||
190 | is impossible to reliably exchange changesets. | ||
191 | |||
192 | |||
193 | |||
194 | 1) Pay attention to your commit text. The commit message that | ||
195 | accompanies each changeset you submit will live on forever in history, | ||
196 | and is used by Linus to accurately summarize the changes in each | ||
197 | pre-patch. Remember that there is no context, so | ||
198 | "fix for new scheduler changes" | ||
199 | would be too vague, but | ||
200 | "fix mips64 arch for new scheduler switch_to(), TIF_xxx semantics" | ||
201 | would be much better. | ||
202 | |||
203 | You can and should use the command "bk comment -C<rev>" to update the | ||
204 | commit text, and improve it after the fact. This is very useful for | ||
205 | development: poor, quick descriptions during development, which get | ||
206 | cleaned up using "bk comment" before issuing the "bk push" to submit the | ||
207 | changes. | ||
208 | |||
209 | |||
210 | |||
211 | 2) Include an Internet-available URL for Linus to pull from, such as | ||
212 | |||
213 | Pull from: http://gkernel.bkbits.net/net-drivers-2.5 | ||
214 | |||
215 | |||
216 | |||
217 | 3) Include a summary and "diffstat -p1" of each changeset that will be | ||
218 | downloaded, when Linus issues a "bk pull". The author auto-generates | ||
219 | these summaries using "bk changes -L <parent>", to obtain a listing | ||
220 | of all the pending-to-send changesets, and their commit messages. | ||
221 | |||
222 | It is important to show Linus what he will be downloading when he issues | ||
223 | a "bk pull", to reduce the time required to sift the changes once they | ||
224 | are downloaded to Linus's local machine. | ||
225 | |||
226 | IMPORTANT NOTE: One of the features of BK is that your repository does | ||
227 | not have to be up to date, in order for Linus to receive your changes. | ||
228 | It is considered a courtesy to keep your repository fairly recent, to | ||
229 | lessen any potential merge work Linus may need to do. | ||
230 | |||
231 | |||
232 | 4) Split up your changes. Each maintainer<->Linus situation is likely | ||
233 | to be slightly different here, so take this just as general advice. The | ||
234 | author splits up changes according to "themes" when merging with Linus. | ||
235 | Simultaneous pushes from local development go to special trees which | ||
236 | exist solely to house changes "queued" for Linus. Example of the trees: | ||
237 | |||
238 | net-drivers-2.5 -- on-going net driver maintenance | ||
239 | vm-2.5 -- VM-related changes | ||
240 | fs-2.5 -- filesystem-related changes | ||
241 | |||
242 | Linus then has much more freedom for pulling changes. He could (for | ||
243 | example) issue a "bk pull" on vm-2.5 and fs-2.5 trees, to merge their | ||
244 | changes, but hold off net-drivers-2.5 because of a change that needs | ||
245 | more discussion. | ||
246 | |||
247 | Other maintainers may find that a single linus-pull-from tree is | ||
248 | adequate for passing BK changesets to him. | ||
249 | |||
250 | |||
251 | |||
252 | Frequently Answered Questions | ||
253 | ----------------------------- | ||
254 | 1) How do I change the e-mail address shown in the changelog? | ||
255 | A. When you run "bk citool" or "bk commit", set environment | ||
256 | variables BK_USER and BK_HOST to the desired username | ||
257 | and host/domain name. | ||
258 | |||
259 | |||
260 | 2) How do I use tags / get a diff between two kernel versions? | ||
261 | A. Pass the tags Linus uses to 'bk export'. | ||
262 | |||
263 | ChangeSets are in a forward-progressing order, so it's pretty easy | ||
264 | to get a snapshot starting and ending at any two points in time. | ||
265 | Linus puts tags on each release and pre-release, so you could use | ||
266 | these two examples: | ||
267 | |||
268 | bk export -tpatch -hdu -rv2.5.4,v2.5.5 | less | ||
269 | # creates patch-2.5.5 essentially | ||
270 | bk export -tpatch -du -rv2.5.5-pre1,v2.5.5 | less | ||
271 | # changes from pre1 to final | ||
272 | |||
273 | A tag is just an alias for a specific changeset... and since changesets | ||
274 | are ordered, a tag is thus a marker for a specific point in time (or | ||
275 | specific state of the tree). | ||
276 | |||
277 | |||
278 | 3) Is there an easy way to generate One Big Patch versus mainline, | ||
279 | for my long-lived kernel branch? | ||
280 | A. Yes. This requires BK 3.x, though. | ||
281 | |||
282 | bk export -tpatch -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ | ||
283 | |||
diff --git a/Documentation/BK-usage/bk-make-sum b/Documentation/BK-usage/bk-make-sum deleted file mode 100755 index 58ca46a0fcc6..000000000000 --- a/Documentation/BK-usage/bk-make-sum +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | #!/bin/sh -e | ||
2 | # DIR=$HOME/BK/axp-2.5 | ||
3 | # cd $DIR | ||
4 | |||
5 | LINUS_REPO=$1 | ||
6 | DIRBASE=`basename $PWD` | ||
7 | |||
8 | { | ||
9 | cat <<EOT | ||
10 | Please do a | ||
11 | |||
12 | bk pull bk://gkernel.bkbits.net/$DIRBASE | ||
13 | |||
14 | This will update the following files: | ||
15 | |||
16 | EOT | ||
17 | |||
18 | bk export -tpatch -hdu -r`bk repogca $LINUS_REPO`,+ | diffstat -p1 2>/dev/null | ||
19 | |||
20 | cat <<EOT | ||
21 | |||
22 | through these ChangeSets: | ||
23 | |||
24 | EOT | ||
25 | |||
26 | bk changes -L -d'$unless(:MERGE:){ChangeSet|:CSETREV:\n}' $LINUS_REPO | | ||
27 | bk -R prs -h -d'$unless(:MERGE:){<:P:@:HOST:> (:D: :I:)\n$each(:C:){ (:C:)\n}\n}' - | ||
28 | |||
29 | } > /tmp/linus.txt | ||
30 | |||
31 | cat <<EOT | ||
32 | Mail text in /tmp/linus.txt; please check and send using your favourite | ||
33 | mailer. | ||
34 | EOT | ||
diff --git a/Documentation/BK-usage/bksend b/Documentation/BK-usage/bksend deleted file mode 100755 index 836ca943694f..000000000000 --- a/Documentation/BK-usage/bksend +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # A script to format BK changeset output in a manner that is easy to read. | ||
3 | # Andreas Dilger <adilger@turbolabs.com> 13/02/2002 | ||
4 | # | ||
5 | # Add diffstat output after Changelog <adilger@turbolabs.com> 21/02/2002 | ||
6 | |||
7 | PROG=bksend | ||
8 | |||
9 | usage() { | ||
10 | echo "usage: $PROG -r<rev>" | ||
11 | echo -e "\twhere <rev> is of the form '1.23', '1.23..', '1.23..1.27'," | ||
12 | echo -e "\tor '+' to indicate the most recent revision" | ||
13 | |||
14 | exit 1 | ||
15 | } | ||
16 | |||
17 | case $1 in | ||
18 | -r) REV=$2; shift ;; | ||
19 | -r*) REV=`echo $1 | sed 's/^-r//'` ;; | ||
20 | *) echo "$PROG: no revision given, you probably don't want that";; | ||
21 | esac | ||
22 | |||
23 | [ -z "$REV" ] && usage | ||
24 | |||
25 | echo "You can import this changeset into BK by piping this whole message to:" | ||
26 | echo "'| bk receive [path to repository]' or apply the patch as usual." | ||
27 | |||
28 | SEP="\n===================================================================\n\n" | ||
29 | echo -e $SEP | ||
30 | env PAGER=/bin/cat bk changes -r$REV | ||
31 | echo | ||
32 | bk export -tpatch -du -h -r$REV | diffstat | ||
33 | echo; echo | ||
34 | bk export -tpatch -du -h -r$REV | ||
35 | echo -e $SEP | ||
36 | bk send -wgzip_uu -r$REV - | ||
diff --git a/Documentation/BK-usage/bz64wrap b/Documentation/BK-usage/bz64wrap deleted file mode 100755 index be780876849f..000000000000 --- a/Documentation/BK-usage/bz64wrap +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # bz64wrap - the sending side of a bzip2 | base64 stream | ||
4 | # Andreas Dilger <adilger@clusterfs.com> Jan 2002 | ||
5 | |||
6 | |||
7 | PATH=$PATH:/usr/bin:/usr/local/bin:/usr/freeware/bin | ||
8 | |||
9 | # A program to generate base64 encoding on stdout | ||
10 | BASE64_ENCODE="uuencode -m /dev/stdout" | ||
11 | BASE64_BEGIN= | ||
12 | BASE64_END= | ||
13 | |||
14 | BZIP=NO | ||
15 | BASE64=NO | ||
16 | |||
17 | # Test if we have the bzip program installed | ||
18 | bzip2 -c /dev/null > /dev/null 2>&1 && BZIP=YES | ||
19 | |||
20 | # Test if uuencode can handle the -m (MIME) encoding option | ||
21 | $BASE64_ENCODE < /dev/null > /dev/null 2>&1 && BASE64=YES | ||
22 | |||
23 | if [ $BASE64 = NO ]; then | ||
24 | BASE64_ENCODE=mimencode | ||
25 | BASE64_BEGIN="begin-base64 644 -" | ||
26 | BASE64_END="====" | ||
27 | |||
28 | $BASE64_ENCODE < /dev/null > /dev/null 2>&1 && BASE64=YES | ||
29 | fi | ||
30 | |||
31 | if [ $BZIP = NO -o $BASE64 = NO ]; then | ||
32 | echo "$0: can't use bz64 encoding: bzip2=$BZIP, $BASE64_ENCODE=$BASE64" | ||
33 | exit 1 | ||
34 | fi | ||
35 | |||
36 | # Sadly, mimencode does not appear to have good "begin" and "end" markers | ||
37 | # like uuencode does, and it is picky about getting the right start/end of | ||
38 | # the base64 stream, so we handle this internally. | ||
39 | echo "$BASE64_BEGIN" | ||
40 | bzip2 -9 | $BASE64_ENCODE | ||
41 | echo "$BASE64_END" | ||
diff --git a/Documentation/BK-usage/cpcset b/Documentation/BK-usage/cpcset deleted file mode 100755 index b8faca97dab9..000000000000 --- a/Documentation/BK-usage/cpcset +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Purpose: Copy changeset patch and description from one | ||
4 | # repository to another, unrelated one. | ||
5 | # | ||
6 | # usage: cpcset [revision] [from-repository] [to-repository] | ||
7 | # | ||
8 | |||
9 | REV=$1 | ||
10 | FROM=$2 | ||
11 | TO=$3 | ||
12 | TMPF=/tmp/cpcset.$$ | ||
13 | |||
14 | rm -f $TMPF* | ||
15 | |||
16 | CWD_SAVE=`pwd` | ||
17 | cd $FROM | ||
18 | bk changes -r$REV | \ | ||
19 | grep -v '^ChangeSet' | \ | ||
20 | sed -e 's/^ //g' > $TMPF.log | ||
21 | |||
22 | USERHOST=`bk changes -r$REV | grep '^ChangeSet' | awk '{print $4}'` | ||
23 | export BK_USER=`echo $USERHOST | awk '-F@' '{print $1}'` | ||
24 | export BK_HOST=`echo $USERHOST | awk '-F@' '{print $2}'` | ||
25 | |||
26 | bk export -tpatch -hdu -r$REV > $TMPF.patch && \ | ||
27 | cd $CWD_SAVE && \ | ||
28 | cd $TO && \ | ||
29 | bk import -tpatch -CFR -y"`cat $TMPF.log`" $TMPF.patch . && \ | ||
30 | bk commit -y"`cat $TMPF.log`" | ||
31 | |||
32 | rm -f $TMPF* | ||
33 | |||
34 | echo changeset $REV copied. | ||
35 | echo "" | ||
36 | |||
diff --git a/Documentation/BK-usage/cset-to-linus b/Documentation/BK-usage/cset-to-linus deleted file mode 100755 index d28a96f8c618..000000000000 --- a/Documentation/BK-usage/cset-to-linus +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | #!/usr/bin/perl -w | ||
2 | |||
3 | use strict; | ||
4 | |||
5 | my ($lhs, $rev, $tmp, $rhs, $s); | ||
6 | my @cset_text = (); | ||
7 | my @pipe_text = (); | ||
8 | my $have_cset = 0; | ||
9 | |||
10 | while (<>) { | ||
11 | next if /^---/; | ||
12 | |||
13 | if (($lhs, $tmp, $rhs) = (/^(ChangeSet\@)([^,]+)(, .*)$/)) { | ||
14 | &cset_rev if ($have_cset); | ||
15 | |||
16 | $rev = $tmp; | ||
17 | $have_cset = 1; | ||
18 | |||
19 | push(@cset_text, $_); | ||
20 | } | ||
21 | |||
22 | elsif ($have_cset) { | ||
23 | push(@cset_text, $_); | ||
24 | } | ||
25 | } | ||
26 | &cset_rev if ($have_cset); | ||
27 | exit(0); | ||
28 | |||
29 | |||
30 | sub cset_rev { | ||
31 | my $empty_cset = 0; | ||
32 | |||
33 | open PIPE, "bk export -tpatch -hdu -r $rev | diffstat -p1 2>/dev/null |" or die; | ||
34 | while ($s = <PIPE>) { | ||
35 | $empty_cset = 1 if ($s =~ /0 files changed/); | ||
36 | push(@pipe_text, $s); | ||
37 | } | ||
38 | close(PIPE); | ||
39 | |||
40 | if (! $empty_cset) { | ||
41 | print @cset_text; | ||
42 | print @pipe_text; | ||
43 | print "\n\n"; | ||
44 | } | ||
45 | |||
46 | @pipe_text = (); | ||
47 | @cset_text = (); | ||
48 | } | ||
49 | |||
diff --git a/Documentation/BK-usage/csets-to-patches b/Documentation/BK-usage/csets-to-patches deleted file mode 100755 index e2b81c35883f..000000000000 --- a/Documentation/BK-usage/csets-to-patches +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | #!/usr/bin/perl -w | ||
2 | |||
3 | use strict; | ||
4 | |||
5 | my ($lhs, $rev, $tmp, $rhs, $s); | ||
6 | my @cset_text = (); | ||
7 | my @pipe_text = (); | ||
8 | my $have_cset = 0; | ||
9 | |||
10 | while (<>) { | ||
11 | next if /^---/; | ||
12 | |||
13 | if (($lhs, $tmp, $rhs) = (/^(ChangeSet\@)([^,]+)(, .*)$/)) { | ||
14 | &cset_rev if ($have_cset); | ||
15 | |||
16 | $rev = $tmp; | ||
17 | $have_cset = 1; | ||
18 | |||
19 | push(@cset_text, $_); | ||
20 | } | ||
21 | |||
22 | elsif ($have_cset) { | ||
23 | push(@cset_text, $_); | ||
24 | } | ||
25 | } | ||
26 | &cset_rev if ($have_cset); | ||
27 | exit(0); | ||
28 | |||
29 | |||
30 | sub cset_rev { | ||
31 | my $empty_cset = 0; | ||
32 | |||
33 | system("bk export -tpatch -du -r $rev > /tmp/rev-$rev.patch"); | ||
34 | |||
35 | if (! $empty_cset) { | ||
36 | print @cset_text; | ||
37 | print @pipe_text; | ||
38 | print "\n\n"; | ||
39 | } | ||
40 | |||
41 | @pipe_text = (); | ||
42 | @cset_text = (); | ||
43 | } | ||
44 | |||
diff --git a/Documentation/BK-usage/gcapatch b/Documentation/BK-usage/gcapatch deleted file mode 100755 index aaeb17dc7c7f..000000000000 --- a/Documentation/BK-usage/gcapatch +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Purpose: Generate GNU diff of local changes versus canonical top-of-tree | ||
4 | # | ||
5 | # Usage: gcapatch > foo.patch | ||
6 | # | ||
7 | |||
8 | bk export -tpatch -hdu -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ | ||
diff --git a/Documentation/BK-usage/unbz64wrap b/Documentation/BK-usage/unbz64wrap deleted file mode 100755 index 4fc3e73e9a81..000000000000 --- a/Documentation/BK-usage/unbz64wrap +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # unbz64wrap - the receiving side of a bzip2 | base64 stream | ||
4 | # Andreas Dilger <adilger@clusterfs.com> Jan 2002 | ||
5 | |||
6 | # Sadly, mimencode does not appear to have good "begin" and "end" markers | ||
7 | # like uuencode does, and it is picky about getting the right start/end of | ||
8 | # the base64 stream, so we handle this explicitly here. | ||
9 | |||
10 | PATH=$PATH:/usr/bin:/usr/local/bin:/usr/freeware/bin | ||
11 | |||
12 | if mimencode -u < /dev/null > /dev/null 2>&1 ; then | ||
13 | SHOW= | ||
14 | while read LINE; do | ||
15 | case $LINE in | ||
16 | begin-base64*) SHOW=YES ;; | ||
17 | ====) SHOW= ;; | ||
18 | *) [ "$SHOW" ] && echo "$LINE" ;; | ||
19 | esac | ||
20 | done | mimencode -u | bunzip2 | ||
21 | exit $? | ||
22 | else | ||
23 | cat - | uudecode -o /dev/stdout | bunzip2 | ||
24 | exit $? | ||
25 | fi | ||
diff --git a/fs/cifs/README b/fs/cifs/README index 7b4ac096cd11..e74df0c73256 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
@@ -32,9 +32,9 @@ the cifs download to your kernel build directory e.g. | |||
32 | 6) make modules (or "make" if CIFS VFS not to be built as a module) | 32 | 6) make modules (or "make" if CIFS VFS not to be built as a module) |
33 | 33 | ||
34 | For Linux 2.6: | 34 | For Linux 2.6: |
35 | 1) Download the kernel (e.g. from http://www.kernel.org or from bitkeeper | 35 | 1) Download the kernel (e.g. from http://www.kernel.org) |
36 | at bk://linux.bkbits.net/linux-2.5) and change directory into the top | 36 | and change directory into the top of the kernel directory tree |
37 | of the kernel directory tree (e.g. /usr/src/linux-2.5.73) | 37 | (e.g. /usr/src/linux-2.5.73) |
38 | 2) make menuconfig (or make xconfig) | 38 | 2) make menuconfig (or make xconfig) |
39 | 3) select cifs from within the network filesystem choices | 39 | 3) select cifs from within the network filesystem choices |
40 | 4) save and exit | 40 | 4) save and exit |