From patchwork Wed May 16 21:21:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC] Upgrade path for Precise i386 non-pae generic flavor Date: Wed, 16 May 2012 11:21:56 -0000 From: Leann Ogasawara X-Patchwork-Id: 159761 Message-Id: <4FB41A74.5000500@canonical.com> To: kernel-team Hi All, I'd like to discuss and get feedback regarding the best solution for smoothly upgrading PAE capable systems currently running a non-pae kernel and then collapsing the generic-pae flavor back to a generic flavor. I've broken this down into 2 phases, which I'll describe below. Phase 1 is smoothly upgrading PAE capable systems running the Precise i386 non-pae generic kernel to the Quantal i386 generic-pae kernel. I've attached a patch which I believe will do the job, but would like some review and feedback. I would add that I have tested this patch on an i386 PAE capable system which was running the Precise i386 non-pae generic kernel. It properly allowed updating to the Quantal generic-pae kernel. I also ran a quick test on an amd64 system to check I hadn't regressed anything in terms of updating. The only test I'm missing is for the scenario of a non-pae system attempting to update. The expectation is that the update would abort. I unfortunately don't have access to this type of system. I would like to get confirmation for this scenario before proceeding. Phase 2 is transitioning the current generic-pae flavor in Quantal to become a generic flavor. I unfortunately don't believe it's possible to do both phase 1 and 2 in the same development cycle as we could find ourselves in a scenario of having recursive install dependencies. In order to do both, I believe it will have to span two development cycles. I'm happy to be wrong here if someone can point it out to me. My current proposal is we do phase 1 in 12.10 (ie Quantal) and phase 2 in 13.04 (ie R). Comments appreciated. Thanks, Leann >From 6a5193c57f7c4596fdfd84537a4f13e56b3a0903 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Wed, 16 May 2012 11:59:10 -0700 Subject: [PATCH] UBUNTU: Re-instate i386 generic meta package to facilitate transition to generic-pae Now that we have install checks in place to handle aborting the install for non pae capable hw, re-instate the i386 generic meta package to facilitate the upgrade/update path to generic-pae by default for systems capable of running the pae kernel. Signed-off-by: Leann Ogasawara --- meta-source/debian/control.d/generic | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic index d4a7fa4..e6cc0cf 100644 --- a/meta-source/debian/control.d/generic +++ b/meta-source/debian/control.d/generic @@ -1,26 +1,26 @@ Package: linux-headers-generic -Architecture: amd64 +Architecture: i386 amd64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic +Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic [!i386], linux-headers-generic-pae (= ${binary:Version}) [i386] Description: Generic Linux kernel headers This package will always depend on the latest generic kernel headers available. Package: linux-image-generic -Architecture: amd64 +Architecture: i386 amd64 Section: metapackages Priority: optional -Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-firmware +Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic [!i386], linux-image-generic-pae (= ${binary:Version}) [i386], linux-firmware Description: Generic Linux kernel image This package will always depend on the latest generic kernel image available. Package: linux-generic -Architecture: amd64 +Architecture: i386 amd64 Section: metapackages Priority: optional -Depends: ${misc:Depends}, linux-image-generic (= ${binary:Version}) +Depends: ${misc:Depends}, linux-image-generic (= ${binary:Version}) [!i386], linux-image-generic-pae (= ${binary:Version}) [i386] Description: Complete Generic Linux kernel This package will always depend on the latest complete generic Linux kernel available. -- 1.7.9.5