Skip to content

Commit 0466dcb

Browse files
jjuhltorvalds
authored andcommitted
Update version number references in README
When 3.0 is released I believe the README should reflect the new numbering. Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 724d4c0 commit 0466dcb

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

README

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Linux kernel release 2.6.xx <http://kernel.org/>
1+
Linux kernel release 3.x <http://kernel.org/>
22

3-
These are the release notes for Linux version 2.6. Read them carefully,
3+
These are the release notes for Linux version 3. Read them carefully,
44
as they tell you what this is all about, explain how to install the
55
kernel, and what to do if something goes wrong.
66

@@ -62,10 +62,10 @@ INSTALLING the kernel source:
6262
directory where you have permissions (eg. your home directory) and
6363
unpack it:
6464

65-
gzip -cd linux-2.6.XX.tar.gz | tar xvf -
65+
gzip -cd linux-3.X.tar.gz | tar xvf -
6666

6767
or
68-
bzip2 -dc linux-2.6.XX.tar.bz2 | tar xvf -
68+
bzip2 -dc linux-3.X.tar.bz2 | tar xvf -
6969

7070

7171
Replace "XX" with the version number of the latest kernel.
@@ -75,25 +75,25 @@ INSTALLING the kernel source:
7575
files. They should match the library, and not get messed up by
7676
whatever the kernel-du-jour happens to be.
7777

78-
- You can also upgrade between 2.6.xx releases by patching. Patches are
78+
- You can also upgrade between 3.x releases by patching. Patches are
7979
distributed in the traditional gzip and the newer bzip2 format. To
8080
install by patching, get all the newer patch files, enter the
81-
top level directory of the kernel source (linux-2.6.xx) and execute:
81+
top level directory of the kernel source (linux-3.x) and execute:
8282

83-
gzip -cd ../patch-2.6.xx.gz | patch -p1
83+
gzip -cd ../patch-3.x.gz | patch -p1
8484

8585
or
86-
bzip2 -dc ../patch-2.6.xx.bz2 | patch -p1
86+
bzip2 -dc ../patch-3.x.bz2 | patch -p1
8787

8888
(repeat xx for all versions bigger than the version of your current
8989
source tree, _in_order_) and you should be ok. You may want to remove
9090
the backup files (xxx~ or xxx.orig), and make sure that there are no
9191
failed patches (xxx# or xxx.rej). If there are, either you or me has
9292
made a mistake.
9393

94-
Unlike patches for the 2.6.x kernels, patches for the 2.6.x.y kernels
94+
Unlike patches for the 3.x kernels, patches for the 3.x.y kernels
9595
(also known as the -stable kernels) are not incremental but instead apply
96-
directly to the base 2.6.x kernel. Please read
96+
directly to the base 3.x kernel. Please read
9797
Documentation/applying-patches.txt for more information.
9898

9999
Alternatively, the script patch-kernel can be used to automate this
@@ -107,14 +107,14 @@ INSTALLING the kernel source:
107107
an alternative directory can be specified as the second argument.
108108

109109
- If you are upgrading between releases using the stable series patches
110-
(for example, patch-2.6.xx.y), note that these "dot-releases" are
111-
not incremental and must be applied to the 2.6.xx base tree. For
112-
example, if your base kernel is 2.6.12 and you want to apply the
113-
2.6.12.3 patch, you do not and indeed must not first apply the
114-
2.6.12.1 and 2.6.12.2 patches. Similarly, if you are running kernel
115-
version 2.6.12.2 and want to jump to 2.6.12.3, you must first
116-
reverse the 2.6.12.2 patch (that is, patch -R) _before_ applying
117-
the 2.6.12.3 patch.
110+
(for example, patch-3.x.y), note that these "dot-releases" are
111+
not incremental and must be applied to the 3.x base tree. For
112+
example, if your base kernel is 3.0 and you want to apply the
113+
3.0.3 patch, you do not and indeed must not first apply the
114+
3.0.1 and 3.0.2 patches. Similarly, if you are running kernel
115+
version 3.0.2 and want to jump to 3.0.3, you must first
116+
reverse the 3.0.2 patch (that is, patch -R) _before_ applying
117+
the 3.0.3 patch.
118118
You can read more on this in Documentation/applying-patches.txt
119119

120120
- Make sure you have no stale .o files and dependencies lying around:
@@ -126,7 +126,7 @@ INSTALLING the kernel source:
126126

127127
SOFTWARE REQUIREMENTS
128128

129-
Compiling and running the 2.6.xx kernels requires up-to-date
129+
Compiling and running the 3.x kernels requires up-to-date
130130
versions of various software packages. Consult
131131
Documentation/Changes for the minimum version numbers required
132132
and how to get updates for these packages. Beware that using
@@ -142,11 +142,11 @@ BUILD directory for the kernel:
142142
Using the option "make O=output/dir" allow you to specify an alternate
143143
place for the output files (including .config).
144144
Example:
145-
kernel source code: /usr/src/linux-2.6.N
145+
kernel source code: /usr/src/linux-3.N
146146
build directory: /home/name/build/kernel
147147

148148
To configure and build the kernel use:
149-
cd /usr/src/linux-2.6.N
149+
cd /usr/src/linux-3.N
150150
make O=/home/name/build/kernel menuconfig
151151
make O=/home/name/build/kernel
152152
sudo make O=/home/name/build/kernel modules_install install

0 commit comments

Comments
 (0)