Debian Bug report logs - #672611
base-installer: Wrong flavour selection: 686→686-pae picked up instead of 486 when no PAE is found

version graph

Package: base-installer; Maintainer for base-installer is Debian Install System Team <debian-boot@lists.debian.org>; Source for base-installer is src:base-installer.

Reported by: Cyril Brulebois <kibi@debian.org>

Date: Sat, 12 May 2012 12:36:10 UTC

Severity: important

Tags: d-i, patch

Found in version base-installer/1.123

Done: Miguel Figueiredo <elmig@debianpt.org>

Bug is archived. No further changes may be made.

Toggle useless messages

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to debian-bugs-dist@lists.debian.org, kibi@debian.org, Debian Install System Team <debian-boot@lists.debian.org>:
Bug#672611; Package base-installer. (Sat, 12 May 2012 12:36:13 GMT) Full text and rfc822 format available.

Acknowledgement sent to Cyril Brulebois <kibi@debian.org>:
New Bug report received and forwarded. Copy sent to kibi@debian.org, Debian Install System Team <debian-boot@lists.debian.org>. (Sat, 12 May 2012 12:36:14 GMT) Full text and rfc822 format available.

Message #5 received at submit@bugs.debian.org (full text, mbox):

From: Cyril Brulebois <kibi@debian.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: base-installer: Wrong flavour selection: 686→686-pae picked up instead of 486 when no PAE is found
Date: Sat, 12 May 2012 14:23:20 +0200
[Message part 1 (text/plain, inline)]
Package: base-installer
Version: 1.123
Severity: important
Tags: d-i

Hi,

trying a wheezy d-i alpha1 image (businesscard/i386) in virtualbox, it
failed to pik the right flavour, picking 686-pae (replacement for 686)
instead of 486. This fails because PAE isn't available.

I'm not sure yet whether it should be fixed before we release alpha1,
or if the fix can wait for alpha2. I'll add it to the errata sections
for now. Screenshots attached for reference from there.

Mraw,
KiBi.
[business-i386-kernel-1.png (image/png, attachment)]
[business-i386-kernel-2.png (image/png, attachment)]

Information forwarded to debian-bugs-dist@lists.debian.org, Debian Install System Team <debian-boot@lists.debian.org>:
Bug#672611; Package base-installer. (Sat, 12 May 2012 21:07:07 GMT) Full text and rfc822 format available.

Acknowledgement sent to Ben Hutchings <ben@decadent.org.uk>:
Extra info received and forwarded to list. Copy sent to Debian Install System Team <debian-boot@lists.debian.org>. (Sat, 12 May 2012 21:07:08 GMT) Full text and rfc822 format available.

Message #10 received at 672611@bugs.debian.org (full text, mbox):

From: Ben Hutchings <ben@decadent.org.uk>
To: 672611@bugs.debian.org
Subject: [PATCH] base-installer: Disable selection of '686' kernel flavour for i386
Date: Sat, 12 May 2012 22:02:03 +0100
[Message part 1 (text/plain, inline)]
In wheezy, linux-image-686 is now a transitional package depending on
linux-image-686-pae, and is uninstallable on systems without PAE.
We must not select it on systems without PAE.

This will prevent installing the squeeze 686 flavour from the wheezy
installer, but this shouldn't matter since either the 486 or
686-bigmem flavour is likely to be preferable.
---
 kernel/i386.sh                             |   68 ++++------------------------
 kernel/tests/i386/amd-k7-old.test          |    8 ++--
 kernel/tests/i386/cittagazze.test          |    8 ++--
 kernel/tests/i386/oqo1.test                |    9 ++--
 kernel/tests/i386/pentium-3.test           |   10 ++--
 kernel/tests/i386/pentium-4M-bigmem-2.test |    7 ++-
 kernel/tests/i386/pentium-4M-bigmem.test   |    8 ++--
 kernel/tests/i386/pentium-4M.test          |    8 ++--
 kernel/tests/i386/pentium-d-2p.test        |   10 ++--
 kernel/tests/i386/pentium.test             |    1 -
 kernel/tests/i386/via-c3-nehemiah.test     |   10 ++--
 kernel/tests/i386/via-c7-Esther.test       |   10 ++--
 kernel/tests/i386/via-c7-Samuel.test       |    1 -
 13 files changed, 45 insertions(+), 113 deletions(-)

diff --git a/kernel/i386.sh b/kernel/i386.sh
index b26a90a..2349210 100644
--- a/kernel/i386.sh
+++ b/kernel/i386.sh
@@ -15,63 +15,22 @@ arch_get_kernel_flavour () {
 		HAVE_PAE=n
 	fi
 
-	# Should we prefer a PAE/amd64 kernel - is there RAM above 4GB?
-	local WANT_PAE
-	if [ -z "$RAM_END" ]; then
-		local MAP MAP_END
-		RAM_END=0
-		for MAP in /sys/firmware/memmap/* ; do
-			if [ "$(cat $MAP/type)" = "System RAM" ]; then
-				MAP_END="$(cat $MAP/end)"
-				if [ $(($MAP_END > $RAM_END)) = 1 ]; then
-					RAM_END=$MAP_END
-				fi
-			fi
-		done
-	fi
-	if [ $(($RAM_END > 0x100000000)) = 1 ]; then
-		WANT_PAE=y
-	else
-		WANT_PAE=n
-	fi
-	# or is the installer running a PAE kernel?
-	case "$KERNEL_FLAVOUR" in
-	    686-bigmem* | 686-pae*)
-		WANT_PAE=y
-		;;
-	esac
-
-	case "$HAVE_LM$HAVE_PAE$WANT_PAE" in
-	    yyy)
-		echo 686-pae 686-bigmem amd64 686 486
-		return 0
-		;;
-	    yyn)
-		echo 686 686-pae 686-bigmem amd64 486
+	case "$HAVE_LM$HAVE_PAE" in
+	    yy)
+		echo 686-pae 686-bigmem amd64 486
 		return 0
 		;;
-	    yn?)
+	    yn)
 		warning "Processor with LM but no PAE???"
 		;;
-	    nyy)
-		echo 686-pae 686-bigmem 686 486
+	    ny)
+		echo 686-pae 686-bigmem 486
 		return 0
 		;;
-	    nyn)
-		echo 686 686-pae 686-bigmem 486
-		return 0
-		;;
-	    nn?)
-		# Need to check whether 686 is suitable
+	    nn)
+		echo 486
 		;;
 	esac
-
-	# Should we offer a 686 kernel?
-	if grep -q '^flags.*\bfpu\b.*\btsc\b.*\bcx8\b.*\bcmov\b' "$CPUINFO"; then
-		echo 686 486
-	else
-		echo 486
-	fi
 }
 
 arch_check_usable_kernel () {
@@ -80,15 +39,8 @@ arch_check_usable_kernel () {
 	set -- $2
 	while [ $# -ge 1 ]; do
 		case "$NAME" in
-		    *-"$1")
-			return 0;
-			;;
-		    *-"$1"-bigmem* | *-"$1"-pae*)
-			# Don't allow -bigmem or -pae suffix, as these
-			# require extra CPU features
-			;;
-		    *-"$1"-*)
-			# Do allow any other hyphenated suffix
+		    *-"$1" | *-"$1"-*)
+			# Allow any other hyphenated suffix
 			return 0
 			;;
 		esac
diff --git a/kernel/tests/i386/amd-k7-old.test b/kernel/tests/i386/amd-k7-old.test
index d072729..140167e 100644
--- a/kernel/tests/i386/amd-k7-old.test
+++ b/kernel/tests/i386/amd-k7-old.test
@@ -1,21 +1,19 @@
 cpuinfo amd-k7-old.cpuinfo
 majors 2.6
-flavour 686 686-pae 686-bigmem 486
+flavour 686-pae 686-bigmem 486
 kernel-2.6 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-486
 usable \
   linux-image-486 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-2.6.25-1-486 \
-  linux-image-2.6.25-1-686 \
   linux-image-2.6.38-1-686-pae \
   linux-image-2.6.25-1-686-bigmem
 unusable \
+  linux-image-686 \
   linux-image-amd64 \
+  linux-image-2.6.25-1-686 \
   linux-image-2.6.25-1-amd64
-env RAM_END 0x10000000
diff --git a/kernel/tests/i386/cittagazze.test b/kernel/tests/i386/cittagazze.test
index e9ad1ba..4b6fa62 100644
--- a/kernel/tests/i386/cittagazze.test
+++ b/kernel/tests/i386/cittagazze.test
@@ -1,22 +1,20 @@
 cpuinfo cittagazze.cpuinfo
 majors 2.6
-flavour 686 686-pae 686-bigmem 486
+flavour 686-pae 686-bigmem 486
 kernel-2.6 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-486
 usable \
   linux-image-486 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-2.6.25-1-486 \
-  linux-image-2.6.25-1-686 \
   linux-image-2.6.38-1-686-pae \
   linux-image-2.6.25-1-686-bigmem
 unusable \
+  linux-image-686 \
   linux-image-amd64 \
+  linux-image-2.6.25-1-686 \
   linux-image-2.6.25-1-amd64
 env KERNEL_FLAVOUR 486
-env RAM_END 0x10000000
diff --git a/kernel/tests/i386/oqo1.test b/kernel/tests/i386/oqo1.test
index a140a6a..71f5081 100644
--- a/kernel/tests/i386/oqo1.test
+++ b/kernel/tests/i386/oqo1.test
@@ -1,19 +1,18 @@
 cpuinfo oqo1.cpuinfo
 majors 2.6
-flavour 686 486
+flavour 486
 kernel-2.6 \
-  linux-image-686 \
   linux-image-486
 usable \
   linux-image-486 \
-  linux-image-2.6.18-1-486 \
-  linux-image-686 \
-  linux-image-2.6.18-1-686
+  linux-image-2.6.18-1-486
 unusable \
+  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-k7 \
   linux-image-amd64 \
+  linux-image-2.6.18-1-686 \
   linux-image-2.6.38-1-686-pae \
   linux-image-2.6.18-1-686-bigmem \
   linux-image-2.6.18-1-k7 \
diff --git a/kernel/tests/i386/pentium-3.test b/kernel/tests/i386/pentium-3.test
index 736b982..6c0b7c8 100644
--- a/kernel/tests/i386/pentium-3.test
+++ b/kernel/tests/i386/pentium-3.test
@@ -1,8 +1,7 @@
 cpuinfo pentium-3.cpuinfo
 majors 2.6
-flavour 686 686-pae 686-bigmem 486
+flavour 686-pae 686-bigmem 486
 kernel-2.6 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-486
@@ -10,15 +9,14 @@ usable \
   linux-image-486 \
   linux-image-686-pae \
   linux-image-686-bigmem \
-  linux-image-686 \
   linux-image-2.6.18-1-486 \
   linux-image-2.6.38-1-686-pae \
-  linux-image-2.6.18-1-686-bigmem \
-  linux-image-2.6.18-1-686
+  linux-image-2.6.18-1-686-bigmem
 unusable \
+  linux-image-686 \
   linux-image-k7 \
   linux-image-amd64 \
+  linux-image-2.6.18-1-686
   linux-image-2.6.18-1-k7 \
   linux-image-2.6.18-1-amd64
 env KERNEL_FLAVOUR 486
-env RAM_END 0x10000000
diff --git a/kernel/tests/i386/pentium-4M-bigmem-2.test b/kernel/tests/i386/pentium-4M-bigmem-2.test
index f2a19de..947efbc 100644
--- a/kernel/tests/i386/pentium-4M-bigmem-2.test
+++ b/kernel/tests/i386/pentium-4M-bigmem-2.test
@@ -1,24 +1,23 @@
 cpuinfo pentium-4M.cpuinfo
 machine i686
 majors 2.6
-flavour 686-pae 686-bigmem 686 486
+flavour 686-pae 686-bigmem 486
 kernel-2.6 \
   linux-image-686-pae \
   linux-image-686-bigmem \
-  linux-image-686 \
   linux-image-486
 usable \
   linux-image-486 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-2.6.18-1-486 \
-  linux-image-2.6.18-1-686 \
   linux-image-2.6.38-1-686-pae \
   linux-image-2.6.18-1-686-bigmem
 unusable \
+  linux-image-686 \
   linux-image-k7 \
   linux-image-amd64 \
+  linux-image-2.6.18-1-686 \
   linux-image-2.6.18-1-k7 \
   linux-image-2.6.18-1-amd64
 env KERNEL_FLAVOUR 486
diff --git a/kernel/tests/i386/pentium-4M-bigmem.test b/kernel/tests/i386/pentium-4M-bigmem.test
index f5df841..a3b05ce 100644
--- a/kernel/tests/i386/pentium-4M-bigmem.test
+++ b/kernel/tests/i386/pentium-4M-bigmem.test
@@ -1,25 +1,23 @@
 cpuinfo pentium-4M.cpuinfo
 machine i686
 majors 2.6
-flavour 686-pae 686-bigmem 686 486
+flavour 686-pae 686-bigmem 486
 kernel-2.6 \
   linux-image-686-pae \
   linux-image-686-bigmem \
-  linux-image-686 \
   linux-image-486
 usable \
   linux-image-486 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-2.6.18-1-486 \
-  linux-image-2.6.18-1-686 \
   linux-image-2.6.38-1-686-pae \
   linux-image-2.6.18-1-686-bigmem
 unusable \
+  linux-image-686 \
   linux-image-k7 \
   linux-image-amd64 \
+  linux-image-2.6.18-1-686 \
   linux-image-2.6.18-1-k7 \
   linux-image-2.6.18-1-amd64
 env KERNEL_FLAVOUR 686-pae
-env RAM_END 0x10000000
diff --git a/kernel/tests/i386/pentium-4M.test b/kernel/tests/i386/pentium-4M.test
index bba2ad7..850ecd4 100644
--- a/kernel/tests/i386/pentium-4M.test
+++ b/kernel/tests/i386/pentium-4M.test
@@ -1,25 +1,23 @@
 cpuinfo pentium-4M.cpuinfo
 machine i686
 majors 2.6
-flavour 686 686-pae 686-bigmem 486
+flavour 686-pae 686-bigmem 486
 kernel-2.6 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-486
 usable \
   linux-image-486 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-2.6.18-1-486 \
-  linux-image-2.6.18-1-686 \
   linux-image-2.6.38-1-686-pae \
   linux-image-2.6.18-1-686-bigmem
 unusable \
+  linux-image-686 \
   linux-image-k7 \
   linux-image-amd64 \
+  linux-image-2.6.18-1-686 \
   linux-image-2.6.18-1-k7 \
   linux-image-2.6.18-1-amd64
 env KERNEL_FLAVOUR 486
-env RAM_END 0x10000000
diff --git a/kernel/tests/i386/pentium-d-2p.test b/kernel/tests/i386/pentium-d-2p.test
index 544f744..2a9ea3f 100644
--- a/kernel/tests/i386/pentium-d-2p.test
+++ b/kernel/tests/i386/pentium-d-2p.test
@@ -1,8 +1,7 @@
 cpuinfo pentium-d-2p.cpuinfo
 majors 2.6
-flavour 686 686-pae 686-bigmem amd64 486
+flavour 686-pae 686-bigmem amd64 486
 kernel-2.6 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-amd64 \
@@ -12,14 +11,13 @@ usable \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-amd64 \
-  linux-image-686 \
   linux-image-2.6.18-1-486 \
   linux-image-2.6.38-1-686-pae \
   linux-image-2.6.18-1-686-bigmem \
-  linux-image-2.6.18-1-amd64 \
-  linux-image-2.6.18-1-686
+  linux-image-2.6.18-1-amd64
 unusable \
+  linux-image-686 \
   linux-image-k7 \
+  linux-image-2.6.18-1-686 \
   linux-image-2.6.18-1-k7
 env KERNEL_FLAVOUR 486
-env RAM_END 0x10000000
diff --git a/kernel/tests/i386/pentium.test b/kernel/tests/i386/pentium.test
index e0f9439..f72a79f 100644
--- a/kernel/tests/i386/pentium.test
+++ b/kernel/tests/i386/pentium.test
@@ -19,4 +19,3 @@ unusable \
   linux-image-2.6.18-1-k7 \
   linux-image-2.6.18-1-amd64
 env KERNEL_FLAVOUR 486
-env RAM_END 0x4000000
diff --git a/kernel/tests/i386/via-c3-nehemiah.test b/kernel/tests/i386/via-c3-nehemiah.test
index d0f4888..0066c85 100644
--- a/kernel/tests/i386/via-c3-nehemiah.test
+++ b/kernel/tests/i386/via-c3-nehemiah.test
@@ -1,22 +1,20 @@
 cpuinfo via-c3-nehemiah.cpuinfo
 majors 2.6
-flavour 686 486
+flavour 486
 kernel-2.6 \
-  linux-image-686 \
   linux-image-486
 usable \
   linux-image-486 \
-  linux-image-2.6.18-1-486 \
-  linux-image-686 \
-  linux-image-2.6.18-1-686
+  linux-image-2.6.18-1-486
 unusable \
+  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-k7 \
   linux-image-amd64 \
+  linux-image-2.6.18-1-686 \
   linux-image-2.6.38-1-686-pae \
   linux-image-2.6.18-1-686-bigmem \
   linux-image-2.6.18-1-k7 \
   linux-image-2.6.18-1-amd64
 env KERNEL_FLAVOUR 486
-env RAM_END 0x4000000
diff --git a/kernel/tests/i386/via-c7-Esther.test b/kernel/tests/i386/via-c7-Esther.test
index 605eed4..f9ad7ff 100644
--- a/kernel/tests/i386/via-c7-Esther.test
+++ b/kernel/tests/i386/via-c7-Esther.test
@@ -1,24 +1,22 @@
 cpuinfo via-c7-Esther.cpuinfo
 machine i686
 majors 2.6
-flavour 686 686-pae 686-bigmem 486
+flavour 686-pae 686-bigmem 486
 kernel-2.6 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-486
 usable \
   linux-image-486 \
   linux-image-2.6.18-1-486 \
-  linux-image-686 \
   linux-image-686-pae \
   linux-image-686-bigmem \
   linux-image-2.6.38-1-686-pae \
-  linux-image-2.6.18-1-686-bigmem \
-  linux-image-2.6.18-1-686
+  linux-image-2.6.18-1-686-bigmem
 unusable \
+  linux-image-686 \
   linux-image-k7 \
   linux-image-amd64 \
+  linux-image-2.6.18-1-686 \
   linux-image-2.6.18-1-k7 \
   linux-image-2.6.18-1-amd64
-env RAM_END 0x4000000
diff --git a/kernel/tests/i386/via-c7-Samuel.test b/kernel/tests/i386/via-c7-Samuel.test
index 09394f5..6d17a0d 100644
--- a/kernel/tests/i386/via-c7-Samuel.test
+++ b/kernel/tests/i386/via-c7-Samuel.test
@@ -19,4 +19,3 @@ unusable \
   linux-image-2.6.18-1-k7 \
   linux-image-18-1-amd64
 env KERNEL_FLAVOUR 486
-env RAM_END 0x4000000
-- 
1.7.10


[signature.asc (application/pgp-signature, inline)]

Added tag(s) patch. Request was from Ben Hutchings <ben@decadent.org.uk> to control@bugs.debian.org. (Sat, 12 May 2012 21:07:14 GMT) Full text and rfc822 format available.

Reply sent to Miguel Figueiredo <elmig@debianpt.org>:
You have taken responsibility. (Sun, 04 Nov 2012 18:15:09 GMT) Full text and rfc822 format available.

Notification sent to Cyril Brulebois <kibi@debian.org>:
Bug acknowledged by developer. (Sun, 04 Nov 2012 18:15:09 GMT) Full text and rfc822 format available.

Message #17 received at 672611-done@bugs.debian.org (full text, mbox):

From: Miguel Figueiredo <elmig@debianpt.org>
To: 672611-done@bugs.debian.org
Cc: 672611-submitter@bugs.debian.org
Subject: Closing, patch on #672611
Date: Sun, 04 Nov 2012 18:11:41 +0000
Closing as #672611 contains patch that was applied to base-installer 
1.124, thanks to Ben Hutchins.


-- 
Melhores cumprimentos/Best regards,

Miguel Figueiredo



Message sent on to Cyril Brulebois <kibi@debian.org>:
Bug#672611. (Sun, 04 Nov 2012 18:15:11 GMT) Full text and rfc822 format available.

Bug archived. Request was from Debbugs Internal Request <owner@bugs.debian.org> to internal_control@bugs.debian.org. (Mon, 03 Dec 2012 07:25:44 GMT) Full text and rfc822 format available.

Send a report that this bug log contains spam.


Debian bug tracking system administrator <owner@bugs.debian.org>. Last modified: Fri Apr 18 09:21:42 2014; Machine Name: beach.debian.org

Debian Bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.