A suffix of '-pae' means the package is incompatible, just as '-bigmem' does
---
This was a regression in 1.118. It was not caught by the unit tests
because there were no test cases for 686-class without PAE!
Ben.
debian/changelog | 8 ++++++++
kernel/i386.sh | 5 +++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1379dc2..903389e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+base-installer (1.119) UNRELEASED; urgency=low
+
+ [ Ben Hutchings ]
+ * Fix i386 kernel package compatibility check: a suffix of '-pae' means
+ the package is incompatible, just as '-bigmem' does
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sun, 24 Apr 2011 22:21:08 +0100
+
base-installer (1.118) unstable; urgency=low
* Team upload
diff --git a/kernel/i386.sh b/kernel/i386.sh
index 2c79ca5..e4303c6 100644
--- a/kernel/i386.sh
+++ b/kernel/i386.sh
@@ -111,8 +111,9 @@ arch_check_usable_kernel () {
*-"$1")
return 0;
;;
- *-"$1"-bigmem*)
- # Don't allow -bigmem suffix
+ *-"$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.7.4.4
Attachment:
signature.asc
Description: This is a digitally signed message part