[kernel] r17466 - in dists/sid/linux-latest-2.6/debian: . po templates

[Ben Hutchings]

Author: benh
Date: Fri May 20 04:46:30 2011
New Revision: 17466

Log:
Add transitional dummy packages for i386/{686,686-bigmem} to i386/686-pae

For the 686 flavour, add a config script to check for non-PAE systems
and fail with a notice that the 486 flavour must be used.

Added:
   dists/sid/linux-latest-2.6/debian/linux-image-686.config
   dists/sid/linux-latest-2.6/debian/linux-image-686.templates
   dists/sid/linux-latest-2.6/debian/po/
   dists/sid/linux-latest-2.6/debian/po/POTFILES.in
Modified:
   dists/sid/linux-latest-2.6/debian/rules.real
   dists/sid/linux-latest-2.6/debian/templates/control.extra.in

Added: dists/sid/linux-latest-2.6/debian/linux-image-686.config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-latest-2.6/debian/linux-image-686.config	Fri May 20 04:46:30 2011	(r17466)
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if ! grep -q '^flags.*\bpae\b' /proc/cpuinfo; then
+    . /usr/share/debconf/confmodule
+    db_input critical linux-image-686/no-pae
+    db_go
+    exit 1
+fi
+
+#DEBHELPER#

Added: dists/sid/linux-latest-2.6/debian/linux-image-686.templates
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-latest-2.6/debian/linux-image-686.templates	Fri May 20 04:46:30 2011	(r17466)
@@ -0,0 +1,9 @@
+Template: linux-image-686/no-pae
+Type: error
+_Description: This system requires a different kernel configuration
+ Debian's '686' kernel configuration has been replaced by the '686-pae'
+ configuration, which uses PAE (Physical Address Extension).  However,
+ the CPU in this system does not support PAE.
+ .
+ You should install linux-image-486 and remove linux-image-686 and/or
+ linux-image-2.6-686 if they are currently installed.

Added: dists/sid/linux-latest-2.6/debian/po/POTFILES.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-latest-2.6/debian/po/POTFILES.in	Fri May 20 04:46:30 2011	(r17466)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] linux-image-686.templates

Modified: dists/sid/linux-latest-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.real	Fri May 20 04:43:20 2011	(r17465)
+++ dists/sid/linux-latest-2.6/debian/rules.real	Fri May 20 04:46:30 2011	(r17466)
@@ -14,6 +14,7 @@
 
 install-base:
 	dh_bugfiles
+	dh_installdebconf
 	dh_installchangelogs
 	dh_installdocs
 	dh_compress

Modified: dists/sid/linux-latest-2.6/debian/templates/control.extra.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.extra.in	Fri May 20 04:43:20 2011	(r17465)
+++ dists/sid/linux-latest-2.6/debian/templates/control.extra.in	Fri May 20 04:46:30 2011	(r17466)
@@ -0,0 +1,23 @@
+Package: linux-image-686
+Architecture: i386
+Depends: linux-image-686-pae, ${misc:Depends}
+Description: Linux for modern PCs (dummy package)
+ This is a dummy transitional package.  It can be safely removed.
+
+Package: linux-image-2.6-686
+Architecture: i386
+Depends: linux-image-686-pae, ${misc:Depends}
+Description: Linux 2.6 for modern PCs (dummy package)
+ This is a dummy transitional package.  It can be safely removed.
+
+Package: linux-image-686-bigmem
+Architecture: i386
+Depends: linux-image-686-pae, ${misc:Depends}
+Description: Linux for PCs with 4GB+ RAM (dummy package)
+ This is a dummy transitional package.  It can be safely removed.
+
+Package: linux-image-2.6-686-bigmem
+Architecture: i386
+Depends: linux-image-686-pae, ${misc:Depends}
+Description: Linux 2.6 for PCs with 4GB+ RAM (dummy package)
+ This is a dummy transitional package.  It can be safely removed.