Commit 0fca3824 authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Switching to default to linux-image-586 on i386.

parent ac77c553
......@@ -589,7 +589,15 @@ Set_defaults ()
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}"
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-586}"
;;
esac
;;
esac
;;
......
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
......
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
......
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
......
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage
......
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlb clean\fR \- Clean build directory
......
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlb config\fR \- Create config directory
......@@ -348,7 +348,7 @@ sets the keyring package or additional keyring packages. By default this is set
.IP "\-k|\fB\-\-linux\-flavours\fR \fIFLAVOUR\fR|""\fIFLAVOURS\fR""" 4
sets the kernel flavours to be installed. Note that in case you specify more than that the first will be configured the default kernel that gets booted.
.IP "\fB\-\-linux\-packages\fR ""\fIPACKAGES\fR""" 4
sets the internal name of the kernel packages naming scheme. If you use debian kernel packages, you will not have to adjust it. If you decide to use custom kernel packages that do not follow the debian naming scheme, remember to set this option to the stub of the packages only (for debian this is linux\-image\-2.6), so that \fISTUB\fR-\fIFLAVOUR\fR results in a valid package name (for debian e.g. linux\-image\-2.6\-486). Preferably you use the meta package name, if any, for the stub, so that your configuration is ABI independent. Also don't forget that you have to include stubs of the binary modules packages for unionfs or aufs, and squashfs if you built them out-of-tree.
sets the internal name of the kernel packages naming scheme. If you use debian kernel packages, you will not have to adjust it. If you decide to use custom kernel packages that do not follow the debian naming scheme, remember to set this option to the stub of the packages only (for debian this is linux\-image\-2.6), so that \fISTUB\fR-\fIFLAVOUR\fR results in a valid package name (for debian e.g. linux\-image\-586). Preferably you use the meta package name, if any, for the stub, so that your configuration is ABI independent. Also don't forget that you have to include stubs of the binary modules packages for unionfs or aufs, and squashfs if you built them out-of-tree.
.IP "\fB\-\-losetup\fR losetup|losetup.orig" 4
sets the filename of the losetup binary from the host system that should be used. This is autodetected and does generally not need any customization.
.IP "\fB\-\-memtest\fR memtest86+|memtest86|none" 4
......
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlb source\fR \- Complete the source stage
......
.TH LIVE\-BUILD 7 2014\-12\-10 4.0.4-1 "Live Systems Project"
.TH LIVE\-BUILD 7 2015\-01\-26 4.0.4-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- the live systems tool suite
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlb\fP \- live\-build プログラムのラッパー
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlb binary\fP \- バイナリ段階を完了させます
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlb bootstrap\fP \- パッケージ収集段階を完了させます
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlb build\fP \- パッケージ収集、chroot、バイナリ、ソース段階を完了させます
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlb chroot\fP \- chroot 段階を完了させます
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlb clean\fP \- 設定ディレクトリを掃除します
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlb config\fP \- 設定ディレクトリを作成します
......@@ -430,13 +430,15 @@ JFFS2 (Second Journaling Flash File System) ファイルシステムの eraseblo
インストールするカーネルの種類 (フレーバー)
を指定します。複数指定した場合は最初に指定したものがデフォルトでブートされるカーネルとして設定されることに注意してください。
.IP "\fB\-\-linux\-packages\fP \(dq\fIパッケージ\fP\(dq" 4
カーネルのパッケージ命名規則に従った内部名をセットします。Debian のカーネルパッケージを利用している場合は調整する必要はありません。Debian
の命名規則に従わない独自のカーネルパッケージを利用する場合にはこのオプションでパッケージの前半部 (Debian の場合は
linux\-image\-2.6) だけを忘れずに指定し、\fI前半部\fP\-\fIフレーバー\fP (Debian の場合は例えば
linux\-image\-2.6\-486)
が有効なパッケージ名になるようにしてください。好ましいのは、メタパッケージがある場合にはその名前を前半部に使うことで、そうすると設定とABIが独立します。また、unionfs
や aufs、squashfs
のバイナリモジュールパッケージについても、ツリー外でビルドした場合にはその前半部を含める必要があることを忘れないようにしてください。
sets the internal name of the kernel packages naming scheme. If you use
debian kernel packages, you will not have to adjust it. If you decide to use
custom kernel packages that do not follow the debian naming scheme, remember
to set this option to the stub of the packages only (for debian this is
linux\-image\-2.6), so that \fISTUB\fP\-\fIFLAVOUR\fP results in a valid package name
(for debian e.g. linux\-image\-586). Preferably you use the meta package name,
if any, for the stub, so that your configuration is ABI independent. Also
don't forget that you have to include stubs of the binary modules packages
for unionfs or aufs, and squashfs if you built them out\-of\-tree.
.IP "\fB\-\-losetup\fP losetup|losetup.orig" 4
利用するホストシステムの losetup バイナリのファイル名を指定します。これは自動的に検出されるため通常は独自に指定する必要はありません。
.IP "\fB\-\-memtest\fP memtest86+|memtest86|none" 4
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 1 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlb source\fP \- ソース段階を完了させます
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 7 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト"
.TH LIVE\-BUILD 7 2015\-01\-26 4.0.4\-1 "Live システムプロジェクト"
.SH 名前
\fBlive\-build\fP \- Live システムツール集
......
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build\n"
"POT-Creation-Date: 2014-12-10 08:24+0100\n"
"POT-Creation-Date: 2015-01-26 06:30+0100\n"
"PO-Revision-Date: 2014-08-28 02:52+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
......@@ -27,7 +27,7 @@ msgstr "LIVE-BUILD"
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/live-build.7:1
#, no-wrap
msgid "2014-12-10"
msgid "2015-01-26"
msgstr ""
#. type: TH
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment