The '686-bigmem' flavour will be renamed to '686-pae'; support both names.
The '686' flavour will be removed, but we can still offer it if available.
---
debian/changelog | 3 +++
kernel/i386.sh | 16 ++++++++--------
kernel/tests/i386/amd-k7-old.test | 5 ++++-
kernel/tests/i386/cittagazze.test | 5 ++++-
kernel/tests/i386/oqo1.test | 2 ++
kernel/tests/i386/pentium-3.test | 5 ++++-
kernel/tests/i386/pentium-4M-bigmem-2.test | 5 ++++-
kernel/tests/i386/pentium-4M-bigmem.test | 7 +++++--
kernel/tests/i386/pentium-4M.test | 5 ++++-
kernel/tests/i386/pentium-d-2p.test | 5 ++++-
kernel/tests/i386/pentium.test | 2 ++
kernel/tests/i386/via-c7-Esther.test | 5 ++++-
kernel/tests/i386/via-c7-Samuel.test | 2 ++
13 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0d8a258..9472007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ base-installer (1.117) UNRELEASED; urgency=low
changed to validating the keyring when present by default.
* Needs debootstrap 1.0.30
+ [ Ben Hutchings ]
+ * Update i386 kernel selection for new flavours in wheezy.
+
-- Samuel Thibault <sthibault@debian.org> Sat, 26 Feb 2011 22:17:36 +0100
base-installer (1.116) unstable; urgency=low
diff --git a/kernel/i386.sh b/kernel/i386.sh
index 453b435..9e4d217 100644
--- a/kernel/i386.sh
+++ b/kernel/i386.sh
@@ -7,7 +7,7 @@ arch_get_kernel_flavour () {
HAVE_LM=n
fi
- # Should we offer a bigmem kernel?
+ # Should we offer a PAE kernel?
local HAVE_PAE
if grep -q '^flags.*\bpae\b' "$CPUINFO"; then
HAVE_PAE=y
@@ -15,7 +15,7 @@ arch_get_kernel_flavour () {
HAVE_PAE=n
fi
- # Should we prefer a bigmem/amd64 kernel - is there RAM above 4GB?
+ # Should we prefer a PAE/amd64 kernel - is there RAM above 4GB?
local WANT_PAE
if [ -z "$RAM_END" ]; then
local MAP MAP_END
@@ -34,31 +34,31 @@ arch_get_kernel_flavour () {
else
WANT_PAE=n
fi
- # or is the installer running a 686-bigmem kernel?
+ # or is the installer running a PAE kernel?
case "$KERNEL_FLAVOUR" in
- 686-bigmem*)
+ 686-bigmem* | 686-pae*)
WANT_PAE=y
;;
esac
case "$HAVE_LM$HAVE_PAE$WANT_PAE" in
yyy)
- echo 686-bigmem amd64 686 486
+ echo 686-pae 686-bigmem amd64 686 486
return 0
;;
yyn)
- echo 686 686-bigmem amd64 486
+ echo 686 686-pae 686-bigmem amd64 486
return 0
;;
yn?)
warning "Processor with LM but no PAE???"
;;
nyy)
- echo 686-bigmem 686 486
+ echo 686-pae 686-bigmem 686 486
return 0
;;
nyn)
- echo 686 686-bigmem 486
+ echo 686 686-pae 686-bigmem 486
return 0
;;
nn?)
diff --git a/kernel/tests/i386/amd-k7-old.test b/kernel/tests/i386/amd-k7-old.test
index 2502f99..958c2b4 100644
--- a/kernel/tests/i386/amd-k7-old.test
+++ b/kernel/tests/i386/amd-k7-old.test
@@ -1,16 +1,19 @@
cpuinfo amd-k7-old.cpuinfo
majors 2.6
-flavour 686 686-bigmem 486
+flavour 686 686-pae 686-bigmem 486
kernel-2.6 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-486
usable \
linux-image-2.6-486 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-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-2.6-amd64 \
diff --git a/kernel/tests/i386/cittagazze.test b/kernel/tests/i386/cittagazze.test
index ce5d280..6977470 100644
--- a/kernel/tests/i386/cittagazze.test
+++ b/kernel/tests/i386/cittagazze.test
@@ -1,16 +1,19 @@
cpuinfo cittagazze.cpuinfo
majors 2.6
-flavour 686 686-bigmem 486
+flavour 686 686-pae 686-bigmem 486
kernel-2.6 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-486
usable \
linux-image-2.6-486 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-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-2.6-amd64 \
diff --git a/kernel/tests/i386/oqo1.test b/kernel/tests/i386/oqo1.test
index 116fd9c..1847384 100644
--- a/kernel/tests/i386/oqo1.test
+++ b/kernel/tests/i386/oqo1.test
@@ -7,10 +7,12 @@ usable \
linux-image-2.6-486 \
linux-image-2.6.18-1-486
unusable \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-686 \
linux-image-2.6-k7 \
linux-image-2.6-amd64 \
+ 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-k7 \
diff --git a/kernel/tests/i386/pentium-3.test b/kernel/tests/i386/pentium-3.test
index 78087e6..8daa853 100644
--- a/kernel/tests/i386/pentium-3.test
+++ b/kernel/tests/i386/pentium-3.test
@@ -1,15 +1,18 @@
cpuinfo pentium-3.cpuinfo
majors 2.6
-flavour 686 686-bigmem 486
+flavour 686 686-pae 686-bigmem 486
kernel-2.6 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-486
usable \
linux-image-2.6-486 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-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
unusable \
diff --git a/kernel/tests/i386/pentium-4M-bigmem-2.test b/kernel/tests/i386/pentium-4M-bigmem-2.test
index 1df7213..9459fe4 100644
--- a/kernel/tests/i386/pentium-4M-bigmem-2.test
+++ b/kernel/tests/i386/pentium-4M-bigmem-2.test
@@ -1,17 +1,20 @@
cpuinfo pentium-4M.cpuinfo
machine i686
majors 2.6
-flavour 686-bigmem 686 486
+flavour 686-pae 686-bigmem 686 486
kernel-2.6 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-686 \
linux-image-2.6-486
usable \
linux-image-2.6-486 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-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-2.6-k7 \
diff --git a/kernel/tests/i386/pentium-4M-bigmem.test b/kernel/tests/i386/pentium-4M-bigmem.test
index b7b302d..5515cb7 100644
--- a/kernel/tests/i386/pentium-4M-bigmem.test
+++ b/kernel/tests/i386/pentium-4M-bigmem.test
@@ -1,22 +1,25 @@
cpuinfo pentium-4M.cpuinfo
machine i686
majors 2.6
-flavour 686-bigmem 686 486
+flavour 686-pae 686-bigmem 686 486
kernel-2.6 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-686 \
linux-image-2.6-486
usable \
linux-image-2.6-486 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-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-2.6-k7 \
linux-image-2.6-amd64 \
linux-image-2.6.18-1-k7 \
linux-image-2.6.18-1-amd64
-env KERNEL_FLAVOUR 686-bigmem
+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 34a9d0a..3c0d41e 100644
--- a/kernel/tests/i386/pentium-4M.test
+++ b/kernel/tests/i386/pentium-4M.test
@@ -1,17 +1,20 @@
cpuinfo pentium-4M.cpuinfo
machine i686
majors 2.6
-flavour 686 686-bigmem 486
+flavour 686 686-pae 686-bigmem 486
kernel-2.6 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-486
usable \
linux-image-2.6-486 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-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-2.6-k7 \
diff --git a/kernel/tests/i386/pentium-d-2p.test b/kernel/tests/i386/pentium-d-2p.test
index 795530d..bb2a8eb 100644
--- a/kernel/tests/i386/pentium-d-2p.test
+++ b/kernel/tests/i386/pentium-d-2p.test
@@ -1,17 +1,20 @@
cpuinfo pentium-d-2p.cpuinfo
majors 2.6
-flavour 686 686-bigmem amd64 486
+flavour 686 686-pae 686-bigmem amd64 486
kernel-2.6 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-amd64 \
linux-image-2.6-486
usable \
linux-image-2.6-486 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-amd64 \
linux-image-2.6-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
diff --git a/kernel/tests/i386/pentium.test b/kernel/tests/i386/pentium.test
index 78d4f65..dbf3018 100644
--- a/kernel/tests/i386/pentium.test
+++ b/kernel/tests/i386/pentium.test
@@ -8,10 +8,12 @@ usable \
linux-image-2.6-486 \
linux-image-2.6.18-1-486
unusable \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-686 \
linux-image-2.6-k7 \
linux-image-2.6-amd64 \
+ 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-k7 \
diff --git a/kernel/tests/i386/via-c7-Esther.test b/kernel/tests/i386/via-c7-Esther.test
index c830a5b..4db64b3 100644
--- a/kernel/tests/i386/via-c7-Esther.test
+++ b/kernel/tests/i386/via-c7-Esther.test
@@ -1,16 +1,19 @@
cpuinfo via-c7-Esther.cpuinfo
machine i686
majors 2.6
-flavour 686 686-bigmem 486
+flavour 686 686-pae 686-bigmem 486
kernel-2.6 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-486
usable \
linux-image-2.6-486 \
linux-image-2.6.18-1-486 \
linux-image-2.6-686 \
+ linux-image-2.6-686-pae \
linux-image-2.6-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
unusable \
diff --git a/kernel/tests/i386/via-c7-Samuel.test b/kernel/tests/i386/via-c7-Samuel.test
index 153eaf5..42bd340 100644
--- a/kernel/tests/i386/via-c7-Samuel.test
+++ b/kernel/tests/i386/via-c7-Samuel.test
@@ -8,10 +8,12 @@ usable \
linux-image-2.6-486 \
linux-image-2.6.18-1-486
unusable \
+ linux-image-2.6-686-pae \
linux-image-2.6-686-bigmem \
linux-image-2.6-686 \
linux-image-2.6-k7 \
linux-image-2.6-686-amd64 \
+ 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-k7 \
--
1.7.4.4
Attachment:
signature.asc
Description: This is a digitally signed message part