Attachment 310910 Details for Bug 434804 – 0001-Use-kmod-plugin-from-yum-utils-remove-it-from-anaco.patch

[patch] 0001-Use-kmod-plugin-from-yum-utils-remove-it-from-anaco.patch

0001-Use-kmod-plugin-from-yum-utils-remove-it-from-anaco.patch (text/plain), 12.71 KB, created by Radek Vykydal on 2008-07-03 11:07:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Vykydal

Created: 2008-07-03 11:07:41 UTC

Size: 12.71 KB

patch

obsolete

>From 52769a07007b355bc318b5393835ef44451b3fe4 Mon Sep 17 00:00:00 2001
>From: Radek Vykydal <rvykydal@redhat.com>
>Date: Thu, 3 Jul 2008 12:57:57 +0200
>Subject: [PATCH] Use kmod plugin from yum-utils, remove it from anaconda (#434804)
>
>---
> fedorakmod.py        |  286 --------------------------------------------------
> scripts/upd-instroot |   20 +---
> 2 files changed, 5 insertions(+), 301 deletions(-)
> delete mode 100644 fedorakmod.py
>
>diff --git a/fedorakmod.py b/fedorakmod.py
>deleted file mode 100644
>index 71e56e2..0000000
>--- a/fedorakmod.py
>+++ /dev/null
>@@ -1,286 +0,0 @@
>-#!/usr/bin/python
>-
>-# fedorakmod.py - Fedora Extras Yum Kernel Module Support
>-# Copyright 2006 - 2007 NC State University
>-# Written by Jack Neely <jjneely@ncsu.edu>
>-#
>-# SDG
>-#
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2 of the License, or
>-# (at your option) any later version.
>-#
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>-
>-import os
>-import rpmUtils
>-from sets import Set, ImmutableSet
>-from yum import packages
>-from yum.constants import TS_INSTALL
>-from yum.plugins import TYPE_CORE, PluginYumExit
>-
>-requires_api_version = '2.4'
>-plugin_type = (TYPE_CORE,)
>-
>-kernelProvides = Set([ "kernel-%s" % a for a in rpmUtils.arch.arches.keys() ])
>-
>-# We shouldn't need this if we didn't have to fake stuff so much
>-kernelVariants = ["bigmem", "enterprise", "smp", "hugemem", "PAE",
>-                  "guest", "hypervisor", "xen0", "xenU", "xen"]
>-
>-def getRunningKernel():
>-    # Taken from the installonlyn.py plugin writen by Jeremy Katz
>-    # Copyright 2005  Red Hat, Inc. 
>-    # Modified by Jack Neely to return a kernel provides tuple
>-    """This takes the output of uname and figures out the (version, release)
>-    tuple for the running kernel."""
>-    ver = os.uname()[2]
>-    for s in kernelVariants:
>-        if ver.endswith(s):
>-            ver = ver.replace(s, "")
>-    if ver.find("-") != -1:
>-        (v, r) = ver.split("-", 1)
>-        # XXX: Gah, this assumes epoch
>-        return ('kernel-%s' % os.uname()[4], 'EQ', ('0', v, r))
>-    return None
>-
>-def _whatProvides(c, list):
>-    """Return a list of POs of installed kernels."""
>-
>-    bag = []
>-    
>-    rpmdb = c.getRpmDB()
>-    for i in list:
>-        tuples = rpmdb.whatProvides(i, None, None)
>-        for pkgtuple in tuples:
>-            # XXX: what do we do for duplicate packages?
>-            #po = rpmdb.packagesByTuple(pkgtuple)[0]
>-            po = rpmdb.searchPkgTuple(pkgtuple)[0]
>-            bag.append(po)
>-
>-    return bag
>-
>-def _getKernelDeps(po, match):
>-      
>-    reqs = po.returnPrco(match)
>-    return [ r for r in reqs if r[0] in kernelProvides or r[0].startswith("kernel(") ]
>-
>-def getInstalledKernels(c):
>-    return _whatProvides(c, kernelProvides)
>-
>-def getInstalledModules(c):
>-    return _whatProvides(c, ["kernel-modules"])
>-
>-def getKernelProvides(po):
>-    """Pass in a package header.  This function will return a list of
>-       tuples (name, flags, ver) representing any kernel provides.
>-       Assumed that the PO is a kernel package."""
>-     
>-    return _getKernelDeps(po, "provides")
>-
>-def getKernelReqs(po):
>-    """Pass in a package header.  This function will return a list of
>-       tuples (name, flags, ver) representing any kernel requires."""
>-      
>-    return _getKernelDeps(po, "requires")
>-
>-def fakeName(po):
>-    """When Yum wont give us full PRCO information we yell
>-          "Say my name, bitch!"
>-       and fake it hard."""
>-
>-    # Normally, I should be able to pull the <name>-kmod provide
>-
>-    fields = po.name.split('-')
>-    if fields[0] == "kmod":
>-        del fields[0]
>-    if fields[-1] in kernelVariants:
>-        del fields[-1]
>-
>-    return ('-'.join(fields + ['kmod']), 'EQ', 
>-            (po.epoch, po.version, po.release))
>-
>-def resolveVersions(packageList):
>-    """The packageDict is a dict of pkgtuple -> PO
>-       We return a dict of kernel version -> list of kmod POs
>-          where the list contains only one PO for each kmod name"""
>-
>-    dict = {}
>-    for po in packageList:
>-        kernel = ImmutableSet(getKernelReqs(po))
>-        kernelReqs = kernel.intersection(kernelProvides)
>-        if len(kernel) == 0:
>-            print "Bad kmod package '%s' does not require a kernel" % po
>-            continue
>-        elif len(kernelReqs) > 1:
>-            print "Bad kmod package: Must require only one kernel"
>-            continue
>-
>-        # Figure out the real name of this kmod
>-        name = []
>-        for r in po.prco["provides"]:
>-            if r[0].endswith('-kmod'):
>-                name.append(r[0])
>-        if len(name) == 0:
>-            # Yum bug
>-            name = fakeName(po)
>-        elif len(name) != 1:
>-            print "Non compliant kmod package: %s" % po
>-            continue
>-        po.kmodName = name[0]
>-
>-        if not dict.has_key(kernel):
>-            dict[kernel] = [po]
>-        else:
>-            sameName = None
>-            for tempPo in dict[kernel]:
>-                if po.name == tempPo.name:
>-                    sameName = tempPo
>-                    break
>-            if sameName and packages.comparePoEVR(sameName, po) < 0:
>-                dict[kernel].remove(sameName)
>-                dict[kernel].append(po)
>-            elif sameName == None:
>-                dict[kernel].append(po)
>-
>-    return dict
>-
>-def installKernelModules(c, newModules, installedModules):
>-    """Figure out what special magic needs to be done to install/upgrade
>-       this kernel module.  This doesn't actually initiate an install
>-       as the module is already in the package sack to be applied."""
>-
>-    tsInfo = c.getTsInfo()
>-
>-    for modpo in newModules:
>-        c.info(4, "Installing kernel module: %s" % modpo.name)
>-        # Should only ever be 1 element to this list
>-        te = tsInfo.getMembers(modpo.pkgtup)[0] 
>-        tsCheck(te)
>-
>-        kernelReqs = getKernelReqs(modpo)
>-        instPkgs = filter(lambda p: p.name == modpo.name, installedModules)
>-        for po in instPkgs:
>-            instKernelReqs = getKernelReqs(po)
>-
>-            for r in kernelReqs:
>-                if r in instKernelReqs:
>-                    # we know that an incoming kernel module requires the
>-                    # same kernel as an already installed moulde of the
>-                    # same name.  "Upgrade" this module instead of install.
>-                    tsInfo.addErase(po)
>-                    c.info(2, 'Removing kernel module %s upgraded to %s' %
>-                           (po, modpo))
>-                    break
>-
>-def pinKernels(c, newKernels, modules):
>-    """If we are using kernel modules, do not upgrade/install a new 
>-       kernel until matching modules are available."""
>-    
>-    runningKernel = getRunningKernel()
>-    if runningKernel == None:
>-        c.error(2, "Could not parsing running kernel version.")
>-        return
>-
>-    table = resolveVersions(modules)
>-    if not table.has_key(runningKernel):
>-        # The current kernel has no modules installed
>-        # FIXME: this won't work with kABI deps
>-        return
>-        
>-    names = [ p.kmodName for p in table[runningKernel] ]
>-    for kpo in newKernels:
>-        prov = getKernelProvides(kpo)[0]
>-        if table.has_key(prov):
>-            kmods = [ po.kmodName for po in table[prov] ]
>-        else:
>-            kmods = []
>-        if Set(kmods) != Set(names):
>-            c.info(2, "Removing kernel %s from install set" % str(prov))
>-            # XXX: This wants a pkgtuple which will probably change RSN
>-            c.getTsInfo().remove(kpo.pkgtup)
>-
>-def installAllKmods(c, avaModules, modules, kernels):
>-    list = []
>-    names = []
>-    interesting = []
>-
>-    rModules = resolveVersions(modules)
>-    for group in rModules.values():
>-        for po in group:
>-            if po.kmodName not in names:
>-                names.append(po.kmodName)
>-
>-    rAvaModules = resolveVersions(avaModules)
>-    for group in rAvaModules.values():
>-        for po in group:
>-            if po.kmodName in names:
>-                interesting.append(po)
>-
>-    table = resolveVersions(interesting + modules)
>-    
>-    for kernel in [ ImmutableSet(getKernelProvides(k)) for k in kernels ]:
>-        for kreq in table.keys():
>-            if not kreq.issubset(kernel):
>-                continue
>-
>-            for po in table[kreq]:
>-                if po not in modules:
>-                    c.getTsInfo().addTrueInstall(po)
>-                    list.append(po)
>-
>-    return list
>-
>-def tsCheck(te):
>-    "Make sure this transaction element is sane."
>-
>-    if te.ts_state == 'u':
>-        te.ts_state = 'i'
>-        te.output_state = TS_INSTALL
>-
>-def init_hook(c):
>-    c.info(3, "Loading Fedora Extras kernel module support.")
>-
>-def postresolve_hook(c):
>-
>-    avaModules = c.getRepos().getPackageSack().searchProvides("kernel-modules")
>-    newModules = []
>-    newKernels = []
>-
>-    installedKernels = getInstalledKernels(c)
>-    installedModules = getInstalledModules(c)
>-
>-    for te in c.getTsInfo().getMembers():
>-        if te.ts_state not in ('i', 'u'):
>-            continue
>-        if "kernel-modules" in te.po.provides_names:
>-            newModules.append(te.po)
>-            for po in avaModules:
>-                if te.po.pkgtup == po.pkgtup:
>-                    avaModules.remove(po)
>-        if kernelProvides.intersection(te.po.provides_names) != Set([]):
>-            newKernels.append(te.po)
>-
>-    # Install modules for all kernels
>-    if c.confInt('main', 'installforallkernels', default=1) != 0:
>-        moreModules = installAllKmods(c, avaModules, 
>-                                      newModules + installedModules,
>-                                      newKernels + installedKernels)
>-        newModules = newModules + moreModules
>-
>-    # Pin kernels
>-    if c.confInt('main', 'pinkernels', default=0) != 0:
>-        pinKernels(c, newKernels, newModules + installedModules)
>-
>-    # Upgrade/Install kernel modules
>-    installKernelModules(c, newModules, installedModules)
>-           
>-# vim:ts=4:expandtab 
>diff --git a/scripts/upd-instroot b/scripts/upd-instroot
>index b85a435..4e8d75b 100755
>--- a/scripts/upd-instroot
>+++ b/scripts/upd-instroot
>@@ -121,7 +121,7 @@ PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
> 	 libstdc++ expat libgcc readline ncurses yum python-sqlite
> 	 python-elementtree pykickstart e2fsprogs-libs iscsi-initiator-utils
> 	 db4 rhpxl xorg-x11-server-Xorg libuser system-config-date
>-         yum-metadata-parser gfs2-utils libvolume_id rhel-instnum
>+         yum-metadata-parser gfs2-utils libvolume_id rhel-instnum yum-kmod
> 	 libdhcp libnl libdhcp6client libdhcp4client device-mapper-multipath
> 	 kpartx dmraid python-pyblock mkinitrd libbdevid libbdevid-python
> 	 libselinux-python nss udev keyutils-libs nspr python-iniparse"
>@@ -284,7 +284,7 @@ etc/selinux/targeted/*
> usr/share/selinux/targeted/*
> etc/security/selinux/policy.*
> etc/security/selinux/file_contexts
>-etc/yum/pluginconf.d
>+etc/yum/pluginconf.d/kmod.conf
> $LIBDIR/bdevid/*
> $LIBDIR/libaudit*.so*
> $LIBDIR/libc[-.]*
>@@ -468,7 +468,7 @@ usr/lib/rpm/rpmrc
> usr/lib/yaboot/addnote
> usr/lib/yaboot/ofboot
> usr/lib/yaboot/yaboot
>-usr/lib/yum-plugins
>+usr/lib/yum-plugins/kmod.py*
> usr/libexec/convertdb1
> usr/share/locale/*/LC_MESSAGES/anaconda.mo
> usr/share/locale/locale.alias
>@@ -1101,14 +1101,6 @@ directory = /mnt/sysimage/etc
> directory = /mnt/sysimage/etc
> EOF
> 
>-echo "Creating fedorakmod.conf"
>-cat > $DEST/etc/yum/pluginconf.d/fedorakmod.conf <<EOF
>-[main]
>-enabled = 1
>-pinkernels = 0
>-installforallkernels = 1
>-EOF
>-
> echo "Creating multipath.conf"
> cat > $DEST/etc/multipath.conf <<EOF
> defaults {
>@@ -1119,12 +1111,10 @@ EOF
> cp $DEST/etc/shells $DESTGR/etc/shells
> cp $DEST/etc/nsswitch.conf $DESTGR/etc/nsswitch.conf
> cp $DEST/etc/libuser.conf $DESTGR/etc/libuser.conf
>-cp $DEST/etc/yum/pluginconf.d/fedorakmod.conf $DESTGR/etc/yum/pluginconf.d/fedorakmod.conf
> cp $DEST/etc/multipath.conf $DESTGR/etc/multipath.conf
> 
>-# set up symlinks so the fedorakmod plugin gets used
>-ln -s ../anaconda/fedorakmod.py $DESTGR/usr/lib/yum-plugins/fedorakmod.py
>-ln -s ../anaconda/fedorakmod.py $DEST/usr/lib/yum-plugins/fedorakmod.py
>+sed -i 's|$installforallkernels$ = 0|\1 = 1|' $DEST/etc/yum/pluginconf.d/kmod.conf
>+cp $DEST/etc/yum/pluginconf.d/kmod.conf $DESTGR/etc/yum/pluginconf.d/
> 
> # fixup man.config to point into /mnt/sysimage for rescue
> if [ -n "$NEEDGR" ]; then
>-- 
>1.5.4.1
>

Actions: View | Diff

Attachments on bug 434804: 310910