Commit 5b4285fbd4692928ed41992b9aba55c7d1efd723
Committed by
Jiri Kosina
1 parent
6b2aac42b2
Exists in
master
and in
20 other branches
README: Use `X' and `x' consistently
The text referred to `XX', when only a single `X' actually existed, so this commit changes it to just `X'; a similar change has been made for `xx'. Also, `N' was used when it would have been more consistent to use `X' again, so this commit replaces `N' with `X'. This commit also chooses to leave `X' as the placeholder for the current version of the source, and then makes `x' the placeholder for any version number; fortunately nothing really depends on this subtlety being understood. Because `x' is already being used when discussing version numbers, this commit changes such filename references as `xxx.rej' to `some-file-name.rej'. Signed-off-by: Michael Witten <mfwitten@gmail.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Showing 1 changed file with 9 additions and 9 deletions Side-by-side Diff
README
... | ... | @@ -68,7 +68,7 @@ |
68 | 68 | bzip2 -dc linux-3.X.tar.bz2 | tar xvf - |
69 | 69 | |
70 | 70 | |
71 | - Replace "XX" with the version number of the latest kernel. | |
71 | + Replace "X" with the version number of the latest kernel. | |
72 | 72 | |
73 | 73 | Do NOT use the /usr/src/linux area! This area has a (usually |
74 | 74 | incomplete) set of kernel headers that are used by the library header |
75 | 75 | |
... | ... | @@ -78,18 +78,18 @@ |
78 | 78 | - You can also upgrade between 3.x releases by patching. Patches are |
79 | 79 | distributed in the traditional gzip and the newer bzip2 format. To |
80 | 80 | install by patching, get all the newer patch files, enter the |
81 | - top level directory of the kernel source (linux-3.x) and execute: | |
81 | + top level directory of the kernel source (linux-3.X) and execute: | |
82 | 82 | |
83 | 83 | gzip -cd ../patch-3.x.gz | patch -p1 |
84 | 84 | |
85 | 85 | or |
86 | 86 | bzip2 -dc ../patch-3.x.bz2 | patch -p1 |
87 | 87 | |
88 | - (repeat xx for all versions bigger than the version of your current | |
89 | - source tree, _in_order_) and you should be ok. You may want to remove | |
90 | - the backup files (xxx~ or xxx.orig), and make sure that there are no | |
91 | - failed patches (xxx# or xxx.rej). If there are, either you or me has | |
92 | - made a mistake. | |
88 | + Replace "x" for all versions bigger than the version "X" of your current | |
89 | + source tree, _in_order_, and you should be ok. You may want to remove | |
90 | + the backup files (some-file-name~ or some-file-name.orig), and make sure | |
91 | + that there are no failed patches (some-file-name# or some-file-name.rej). | |
92 | + If there are, either you or me has made a mistake. | |
93 | 93 | |
94 | 94 | Unlike patches for the 3.x kernels, patches for the 3.x.y kernels |
95 | 95 | (also known as the -stable kernels) are not incremental but instead apply |
96 | 96 | |
... | ... | @@ -142,11 +142,11 @@ |
142 | 142 | Using the option "make O=output/dir" allow you to specify an alternate |
143 | 143 | place for the output files (including .config). |
144 | 144 | Example: |
145 | - kernel source code: /usr/src/linux-3.N | |
145 | + kernel source code: /usr/src/linux-3.X | |
146 | 146 | build directory: /home/name/build/kernel |
147 | 147 | |
148 | 148 | To configure and build the kernel use: |
149 | - cd /usr/src/linux-3.N | |
149 | + cd /usr/src/linux-3.X | |
150 | 150 | make O=/home/name/build/kernel menuconfig |
151 | 151 | make O=/home/name/build/kernel |
152 | 152 | sudo make O=/home/name/build/kernel modules_install install |