diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-04-27 02:13:10 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-04-27 02:13:10 +0000 |
| commit | b84e93eb79f9238e72bf004652c7e81b5b781fa3 (patch) | |
| tree | 3126b6d7e2ce9e11d6928850de0d28209e2311b6 | |
| parent | 0731adb872b55e960d55cbb0ed957cfda5a5f76a (diff) | |
| download | anaconda-b84e93eb79f9238e72bf004652c7e81b5b781fa3.tar.gz anaconda-b84e93eb79f9238e72bf004652c7e81b5b781fa3.tar.xz anaconda-b84e93eb79f9238e72bf004652c7e81b5b781fa3.zip | |
2005-04-26 Jeremy Katz <katzj@redhat.com>
* packages.py (handleMiscPackages): Only select a kernel-smp that
matches the arch of the primary kernel (#149618). Remove dead code.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | packages.py | 19 |
2 files changed, 12 insertions, 12 deletions
@@ -1,3 +1,8 @@ +2005-04-26 Jeremy Katz <katzj@redhat.com> + + * packages.py (handleMiscPackages): Only select a kernel-smp that + matches the arch of the primary kernel (#149618). Remove dead code. + 2005-04-26 Chris Lumens <clumens@redhat.com> * anaconda.spec: Bump version. diff --git a/packages.py b/packages.py index 9e745eaec..80e789298 100644 --- a/packages.py +++ b/packages.py @@ -652,18 +652,13 @@ def handleMiscPackages(intf, id, dir): if not upgrade: foundkernel = 0 if isys.smpAvailable() or isys.htavailable(): - if select(id.grpset.hdrlist, 'kernel-smp'): - foundkernel = 1 - if selected(id.grpset.hdrlist, "gcc"): - select(id.grpset.hdrlist, "kernel-smp-devel") - - if iutil.needsEnterpriseKernel(): - if select(id.grpset.hdrlist, "kernel-bigmem"): - foundkernel = 1 - - if isys.summitavailable(): - if select(id.grpset.hdrlist, "kernel-summit"): - foundkernel = 1 + if id.grpset.hdrlist.has_key("kernel-smp") and \ + id.grpset.hdrlist["kernel-smp"][rpm.RPMTAG_ARCH] == \ + id.grpset.hdrlist["kernel"][rpm.RPMTAG_ARCH]: + if select(id.grpset.hdrlist, 'kernel-smp'): + foundkernel = 1 + if selected(id.grpset.hdrlist, "gcc"): + select(id.grpset.hdrlist, "kernel-smp-devel") if foundkernel == 0: # we *always* need to have some sort of kernel installed |