Remove 586 flavour for i386 architecture. (Closes: #807972)

8 files changed, 9 insertions, 17 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index a0cb96899..438043116 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -427,15 +427,7 @@ Set_defaults ()
 			;;
 
 		i386)
-			case "${LB_MODE}" in
-				progress-linux)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
-					;;
-
-				*)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-586}"
-					;;
-			esac
+                        LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
 			;;
 
 		ia64)
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 60e310f24..8e1f4f78a 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -344,7 +344,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\-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.
+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\-686\-pae). 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
diff --git a/manpages/fr/lb_config.fr.1 b/manpages/fr/lb_config.fr.1
index d8de05e66..b2a1a9eb5 100644
--- a/manpages/fr/lb_config.fr.1
+++ b/manpages/fr/lb_config.fr.1
@@ -536,7 +536,7 @@ 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,
+(for debian e.g. linux\-image\-686\-pae). 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.
diff --git a/manpages/ja/lb_config.ja.1 b/manpages/ja/lb_config.ja.1
index 5e63418f3..8c602aa79 100644
--- a/manpages/ja/lb_config.ja.1
+++ b/manpages/ja/lb_config.ja.1
@@ -428,7 +428,7 @@ 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\-586)
+linux\-image\-2.6) だけを忘れずに指定し、\fI前半部\fP\-\fIフレーバー\fP (Debian の場合は例えば linux\-image\-686\-pae)
 が有効なパッケージ名になるようにしてください。好ましいのは、メタパッケージがある場合にはその名前を前半部に使うことで、そうすると設定とABIが独立します。また、unionfs
 や aufs、squashfs
 のバイナリモジュールパッケージについても、ツリー外でビルドした場合にはその前半部を含める必要があることを忘れないようにしてください。
diff --git a/manpages/po/fr/lb_config.1.po b/manpages/po/fr/lb_config.1.po
index 57b412d9d..0a20625b1 100644
--- a/manpages/po/fr/lb_config.1.po
+++ b/manpages/po/fr/lb_config.1.po
@@ -1745,7 +1745,7 @@ msgid ""
 "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 I<STUB>-I<FLAVOUR> results in a valid package name "
-"(for debian e.g. linux-image-586). Preferably you use the meta package name, "
+"(for debian e.g. linux-image-686-pae). 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."
diff --git a/manpages/po/ja/lb_config.1.po b/manpages/po/ja/lb_config.1.po
index 0d8ce4ff7..ce3140720 100644
--- a/manpages/po/ja/lb_config.1.po
+++ b/manpages/po/ja/lb_config.1.po
@@ -1778,7 +1778,7 @@ msgid ""
 "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 I<STUB>-I<FLAVOUR> results in a valid package name "
-"(for debian e.g. linux-image-586). Preferably you use the meta package name, "
+"(for debian e.g. linux-image-686-pae). 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."
@@ -1787,7 +1787,7 @@ msgstr ""
 "パッケージを利用している場合は調整する必要はありません。Debian の命名規則に従"
 "わない独自のカーネルパッケージを利用する場合にはこのオプションでパッケージの"
 "前半部 (Debian の場合は linux-image-2.6) だけを忘れずに指定し、I<前半部>-I<フ"
-"レーバー> (Debian の場合は例えば linux-image-586) が有効なパッケージ名になる"
+"レーバー> (Debian の場合は例えば linux-image-686-pae) が有効なパッケージ名になる"
 "ようにしてください。好ましいのは、メタパッケージがある場合にはその名前を前半"
 "部に使うことで、そうすると設定とABIが独立します。また、unionfs や aufs、"
 "squashfs のバイナリモジュールパッケージについても、ツリー外でビルドした場合に"
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 5c94a4b3e..69bcce068 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -1561,7 +1561,7 @@ msgid ""
 "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 I<STUB>-I<FLAVOUR> results in a valid package name "
-"(for debian e.g. linux-image-586). Preferably you use the meta package name, "
+"(for debian e.g. linux-image-686-pae). 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."
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index b9f44b5d8..b4b2e7188 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -322,7 +322,7 @@ then
 
 		i386)
 			DI_REQ_PACKAGES="lilo grub-pc"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae"
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-686-pae"
 			;;
 
 		powerpc)