[Kernel-handbook-general] [PATCH 05/15] Change examples to use xz compressed files with recent versions

Ben Hutchings ben at decadent.org.uk
Sat Nov 14 02:54:58 UTC 2015


Neither kernel.org nor Debian official packages use bzip2 any more.
---
 chapter-common-tasks.dbk   | 26 +++++++++---------
 chapter-packaging.dbk      |  6 ++--
 debian/changelog           |  2 ++
 po4a/kernel-handbook.ja.po | 68 +++++++++++++++++++++++-----------------------
 4 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/chapter-common-tasks.dbk b/chapter-common-tasks.dbk
index 0e65d02..3308747 100644
--- a/chapter-common-tasks.dbk
+++ b/chapter-common-tasks.dbk
@@ -11,12 +11,12 @@ sufficient to install the latest
 the source, for example:
 </para>
 <screen>
-# apt-get install linux-source-3.2
-$ tar jxf /usr/src/linux-source-3.2.tar.bz2
+# apt-get install linux-source-4.3
+$ tar xaf /usr/src/linux-source-4.3.tar.xz
 </screen>
 <para>
 The unpacked source tree then will be available in
-<literal>linux-source-3.2</literal> directory.
+<literal>linux-source-4.3</literal> directory.
 </para>
 </section>
 
@@ -298,7 +298,7 @@ repository.  First ensure you have the necessary tools installed:
 Then if you have a tarball, run a command such as:
 </para>
 <screen>
-$ debian/bin/genorig.py ../linux-3.4.tar.bz2 ../patch-3.5-rc1.bz2
+$ debian/bin/genorig.py ../linux-4.3.tar.xz ../patch-4.4-rc1.xz
 </screen>
 <para>
 Or if you have a git repository, pass the name of its directory:
@@ -331,9 +331,9 @@ source is to use the <literal>linux-source</literal> package and the
 <literal>make deb-pkg</literal> target.  First, prepare the kernel tree:
 </para>
 <screen>
-# apt-get install linux-source-3.2
-$ tar xjf /usr/src/linux-source-3.2.tar.bz2
-$ cd linux-source-3.2
+# apt-get install linux-source-4.3
+$ tar xaf /usr/src/linux-source-4.3.tar.xz
+$ cd linux-source-4.3
 </screen>
 <para>
 The kernel now needs to be configured, that is you have to set the kernel
@@ -421,7 +421,7 @@ source is downloaded using your favourite browser or using wget, as follows:
 </para>
 <screen>
  
-$ wget http://kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.bz2
+$ wget http://kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.xz
 </screen>
 <para>
 The integrity of the downloaded archive may be verified by fetching the
@@ -429,13 +429,13 @@ corresponding cryptographic signature
 </para>
 <screen>
  
-$ wget http://kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.sign
+$ wget http://kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.sign
 </screen>
 <para>
 and running this command (<literal>gnupg</literal> package must be installed):
 </para>
 <screen>
-$ bunzip2 -c linux-3.4.tar.bz2 | gpg --verify linux-3.4.tar.sign -
+$ unxz -c linux-4.3.tar.xz | gpg --verify linux-4.3.tar.sign -
 </screen>
 <para>
 Successful verification results in output similar to the one below:
@@ -451,11 +451,11 @@ Primary key fingerprint: ABAF 11C6 5A29 70B1 30AB  E3C4 79BE 3E43 0041 1886
 After that the archive may be unpacked using
 </para>
 <screen>
-$ tar xjf linux-3.4.tar.bz2
-$ cd linux-3.4
+$ tar xaf linux-4.3.tar.xz
+$ cd linux-4.3
 </screen>
 <para>
-The unpacked kernel tree (in <literal>linux-3.4</literal> now has to be
+The unpacked kernel tree (in <literal>linux-4.3</literal> now has to be
 configured.  The existing configuration file may be used as a starting point
 </para>
 <screen>
diff --git a/chapter-packaging.dbk b/chapter-packaging.dbk
index 1a981bc..ef6905e 100644
--- a/chapter-packaging.dbk
+++ b/chapter-packaging.dbk
@@ -25,10 +25,10 @@ chapter document the naming and contents of the binary packages built from the
 <para>
 This package contains the Debian kernel source tarball.  The patchlevel of the
 source is determined by the Debian revision of the package, for example the
-version 3.2.19-1 of the package <literal>linux-source-3.2</literal> contains
-the version 3.2.19 of the Debian kernel source patched to patchlevel 1.  Once
+version 4.2.5-1 of the package <literal>linux-source-4.2</literal> contains
+the version 4.2.5 of the Debian kernel source patched to patchlevel 1.  Once
 the package is installed, the source tarball is available at
-<literal>/usr/src/linux-source-<replaceable>version</replaceable>.tar.bz2</literal>.
+<literal>/usr/src/linux-source-<replaceable>version</replaceable>.tar.xz</literal>.
 </para>
 </listitem>
 </varlistentry>
diff --git a/debian/changelog b/debian/changelog
index 43b5651..621f5cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ kernel-handbook (1.0.17) UNRELEASED; urgency=medium
   * Remove statement that the final '.0' will be removed from upstream versions
   * Update 'Linus version format' to begin with 4
   * Remove references to linux-2.6 source package
+  * Change examples to use xz compressed files with recent versions,
+    instead of older bzip2 compressed files
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 30 Aug 2015 13:21:25 +0100
 
diff --git a/po4a/kernel-handbook.ja.po b/po4a/kernel-handbook.ja.po
index ff7b691..7dc29d9 100644
--- a/po4a/kernel-handbook.ja.po
+++ b/po4a/kernel-handbook.ja.po
@@ -1675,19 +1675,19 @@ msgstr ""
 #: chapter-common-tasks.dbk:14
 #, no-wrap
 msgid ""
-"# apt-get install linux-source-3.2\n"
-"$ tar jxf /usr/src/linux-source-3.2.tar.bz2\n"
+"# apt-get install linux-source-4.3\n"
+"$ tar xaf /usr/src/linux-source-4.3.tar.xz\n"
 msgstr ""
-"# apt-get install linux-source-3.2\n"
-"$ tar jxf /usr/src/linux-source-3.2.tar.bz2\n"
+"# apt-get install linux-source-4.3\n"
+"$ tar xaf /usr/src/linux-source-4.3.tar.xz\n"
 
 #. type: Content of: <chapter><section><para>
 #: chapter-common-tasks.dbk:18
 msgid ""
 "The unpacked source tree then will be available in <literal>linux-"
-"source-3.2</literal> directory."
+"source-4.3</literal> directory."
 msgstr ""
-"ソースツリーが<literal>linux-source-3.2</literal>ディレクトリに展開されます。"
+"ソースツリーが<literal>linux-source-4.3</literal>ディレクトリに展開されます。"
 
 #. type: Content of: <chapter><section><title>
 #: chapter-common-tasks.dbk:23
@@ -2240,8 +2240,8 @@ msgstr ""
 #. type: Content of: <chapter><section><screen>
 #: chapter-common-tasks.dbk:301
 #, no-wrap
-msgid "$ debian/bin/genorig.py ../linux-3.4.tar.bz2 ../patch-3.5-rc1.bz2\n"
-msgstr "$ debian/bin/genorig.py ../linux-3.4.tar.bz2 ../patch-3.5-rc1.bz2\n"
+msgid "$ debian/bin/genorig.py ../linux-4.3.tar.xz ../patch-4.4-rc1.xz\n"
+msgstr "$ debian/bin/genorig.py ../linux-4.3.tar.xz ../patch-4.4-rc1.xz\n"
 
 #. type: Content of: <chapter><section><para>
 #: chapter-common-tasks.dbk:304
@@ -2309,13 +2309,13 @@ msgstr ""
 #: chapter-common-tasks.dbk:334
 #, no-wrap
 msgid ""
-"# apt-get install linux-source-3.2\n"
-"$ tar xjf /usr/src/linux-source-3.2.tar.bz2\n"
-"$ cd linux-source-3.2\n"
+"# apt-get install linux-source-4.3\n"
+"$ tar xaf /usr/src/linux-source-4.3.tar.xz\n"
+"$ cd linux-source-4.3\n"
 msgstr ""
-"# apt-get install linux-source-3.2\n"
-"$ tar xjf /usr/src/linux-source-3.2.tar.bz2\n"
-"$ cd linux-source-3.2\n"
+"# apt-get install linux-source-4.3\n"
+"$ tar xaf /usr/src/linux-source-4.3.tar.xz\n"
+"$ cd linux-source-4.3\n"
 
 #. type: Content of: <chapter><section><para>
 #: chapter-common-tasks.dbk:339
@@ -2489,8 +2489,8 @@ msgstr ""
 #. type: Content of: <chapter><section><screen>
 #: chapter-common-tasks.dbk:424
 #, no-wrap
-msgid "$ wget http://kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.bz2\n"
-msgstr "$ wget http://kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.bz2\n"
+msgid "$ wget http://kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.xz\n"
+msgstr "$ wget http://kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.xz\n"
 
 #. type: Content of: <chapter><section><para>
 #: chapter-common-tasks.dbk:427
@@ -2503,8 +2503,8 @@ msgstr ""
 #. type: Content of: <chapter><section><screen>
 #: chapter-common-tasks.dbk:432
 #, no-wrap
-msgid "$ wget http://kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.sign\n"
-msgstr "$ wget http://kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.sign\n"
+msgid "$ wget http://kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.sign\n"
+msgstr "$ wget http://kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.sign\n"
 
 #. type: Content of: <chapter><section><para>
 #: chapter-common-tasks.dbk:435
@@ -2518,8 +2518,8 @@ msgstr ""
 #. type: Content of: <chapter><section><screen>
 #: chapter-common-tasks.dbk:438
 #, no-wrap
-msgid "$ bunzip2 -c linux-3.4.tar.bz2 | gpg --verify linux-3.4.tar.sign -\n"
-msgstr "$ bunzip2 -c linux-3.4.tar.bz2 | gpg --verify linux-3.4.tar.sign -\n"
+msgid "$ unxz -c linux-4.3.tar.xz | gpg --verify linux-4.3.tar.sign -\n"
+msgstr "$ unxz -c linux-4.3.tar.xz | gpg --verify linux-4.3.tar.sign -\n"
 
 #. type: Content of: <chapter><section><para>
 #: chapter-common-tasks.dbk:441
@@ -2551,19 +2551,19 @@ msgstr "検証が済んだら、次のコマンドでアーカイブを展開し
 #: chapter-common-tasks.dbk:454
 #, no-wrap
 msgid ""
-"$ tar xjf linux-3.4.tar.bz2\n"
-"$ cd linux-3.4\n"
+"$ tar xaf linux-4.3.tar.xz\n"
+"$ cd linux-4.3\n"
 msgstr ""
-"$ tar xjf linux-3.4.tar.bz2\n"
-"$ cd linux-3.4\n"
+"$ tar xaf linux-4.3.tar.xz\n"
+"$ cd linux-4.3\n"
 
 #. type: Content of: <chapter><section><para>
 #: chapter-common-tasks.dbk:458
 msgid ""
-"The unpacked kernel tree (in <literal>linux-3.4</literal> now has to be "
+"The unpacked kernel tree (in <literal>linux-4.3</literal> now has to be "
 "configured.  The existing configuration file may be used as a starting point"
 msgstr ""
-"展開されたカーネルツリー (<literal>linux-3.4</literal> ディレクトリ) の設定を"
+"展開されたカーネルツリー (<literal>linux-4.3</literal> ディレクトリ) の設定を"
 "する準備ができました。手始めに、すでにある設定ファイルを使うと良いでしょう。"
 
 #. type: Content of: <chapter><section><screen>
@@ -2905,19 +2905,19 @@ msgstr "<literal>linux-source-<replaceable>version</replaceable></literal>"
 msgid ""
 "This package contains the Debian kernel source tarball.  The patchlevel of "
 "the source is determined by the Debian revision of the package, for example "
-"the version 3.2.19-1 of the package <literal>linux-source-3.2</literal> "
-"contains the version 3.2.19 of the Debian kernel source patched to "
-"patchlevel 1.  Once the package is installed, the source tarball is "
-"available at <literal>/usr/src/linux-source-<replaceable>version</"
-"replaceable>.tar.bz2</literal>."
+"the version 4.2.5-1 of the package <literal>linux-source-4.2</literal> "
+"contains the version 4.2.5 of the Debian kernel source patched to patchlevel "
+"1.  Once the package is installed, the source tarball is available at "
+"<literal>/usr/src/linux-source-<replaceable>version</replaceable>.tar.xz</"
+"literal>."
 msgstr ""
 "このパッケージには Debian カーネルソースの tarball が含まれています。ソースの"
 "パッチレベルはパッケージの Debian リビジョンによって決定されます。例えば、"
-"3.2.19-1 というバージョンの <literal>linux-source-3.2</literal> パッケージに"
-"は、パッチレベル 1 のパッチが適用されたバージョン 3.2.19 の Debian カーネル"
+"4.2.5-1 というバージョンの <literal>linux-source-4.2</literal> パッケージに"
+"は、パッチレベル 1 のパッチが適用されたバージョン 4.2.5 の Debian カーネル"
 "ソースが含まれています。パッケージがインストールされると、tarball 化された"
 "ソースが <literal>/usr/src/linux-source-<replaceable>version</replaceable>."
-"tar.bz2</literal> に配置され利用可能になります。"
+"tar.xz</literal> に配置され利用可能になります。"
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 #: chapter-packaging.dbk:36

-- 
Ben Hutchings
For every action, there is an equal and opposite criticism. - Harrison
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 811 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/kernel-handbook-general/attachments/20151114/f6576722/attachment.sig>


More information about the Kernel-handbook-general mailing list