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
Attachment:
signature.asc
Description: This is a digitally signed message part