Update i386 kernel selection for new flavours in wheezy
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
- # Should we offer a bigmem kernel?
+ # Should we offer a PAE kernel?
local HAVE_PAE
if grep -q '^flags.*pae' "$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
Update i386 kernel selection for new flavours in wheezy
Quoting Ben Hutchings (ben@decadent.org.uk):
> 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.
I uploaded b-i as part of a mass upload today, but will upload again
so that this important change is already supported in daily builds.
Thanks for your patch (which I applied blindly, I have to admit!).
04-28-2011, 07:38 AM
Ian Campbell
Update i386 kernel selection for new flavours in wheezy
On Sun, 2011-04-24 at 15:59 +0100, Ben Hutchings wrote:
> 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.
Do you also have patches for d-i's kernel-wedge and the main installer
build? Also debian-cd will need changes too. Since the latter two are
mainly due to Xen support I can take care of that if you like, although
I think it will depend on the kernel actually being uploaded since I
can't see an easy way to support both names in the main installer build.
Ian.
--
Ian Campbell
I am currently transitioning to a new OpenPGP key, please see:
http://www.hellion.org.uk/key-transition-2011-04-27-2F6BCD59-to-79074FA8.txt
The avoidance of taxes is the only intellectual pursuit that carries any
reward.
-- John Maynard Keynes
04-29-2011, 04:03 AM
Ben Hutchings
Update i386 kernel selection for new flavours in wheezy
On Thu, 2011-04-28 at 08:38 +0100, Ian Campbell wrote:
> On Sun, 2011-04-24 at 15:59 +0100, Ben Hutchings wrote:
> > 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.
>
> Do you also have patches for d-i's kernel-wedge and the main installer
> build?
No, I'm not familiar with those. I did the kernel installation
selection myself because I've worked on it before.
> Also debian-cd will need changes too. Since the latter two are
> mainly due to Xen support I can take care of that if you like, although
> I think it will depend on the kernel actually being uploaded since I
> can't see an easy way to support both names in the main installer build.
So it depends on when the d-i team decides to switch to 2.6.39 (or
later). But you can get your patches ready before then.
Ben.
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
04-29-2011, 08:53 AM
Ian Campbell
Update i386 kernel selection for new flavours in wheezy
On Fri, 2011-04-29 at 05:03 +0100, Ben Hutchings wrote:
> On Thu, 2011-04-28 at 08:38 +0100, Ian Campbell wrote:
> > On Sun, 2011-04-24 at 15:59 +0100, Ben Hutchings wrote:
> > > 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.
> >
> > Do you also have patches for d-i's kernel-wedge and the main installer
> > build?
>
> No, I'm not familiar with those. I did the kernel installation
> selection myself because I've worked on it before.
>
> > Also debian-cd will need changes too. Since the latter two are
> > mainly due to Xen support I can take care of that if you like, although
> > I think it will depend on the kernel actually being uploaded since I
> > can't see an easy way to support both names in the main installer build.
>
> So it depends on when the d-i team decides to switch to 2.6.39 (or
> later). But you can get your patches ready before then.
Correct. I'll look into it.
Ian.
--
Ian Campbell
I am currently transitioning to a new OpenPGP key, please see:
http://www.hellion.org.uk/key-transition-2011-04-27-2F6BCD59-to-79074FA8.txt
Update i386 kernel selection for new flavours in wheezy
