Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 642096 | Differences between
and this patch

Collapse All | Expand All

(-)genkernel-next-68-orig/gen_initramfs.sh (-10 / +12 lines)
Lines 781-797 Link Here
781
        rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
781
        rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
782
    fi
782
    fi
783
    mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/lib/modules/${KV}"
783
    mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/lib/modules/${KV}"
784
    for i in `gen_dep_list`
784
    for i in $(gen_dep_list)
785
    do
785
    do
786
        mymod=`find ./lib/modules/${KV} -name "${i}${MOD_EXT}" 2>/dev/null| head -n 1 `
786
        for KEXT in ${MOD_EXT_LIST}; do
787
        if [ -z "${mymod}" ]
787
            mymod=`find ./lib/modules/${KV} -name "${i}${KEXT}" 2>/dev/null| head -n 1`
788
        then
788
            if [ -z "${mymod}" ]
789
            print_warning 2 "Warning :: ${i}${MOD_EXT} not found; skipping..."
789
            then
790
            continue;
790
                print_warning 2 "Warning :: ${i}${KEXT} not found; skipping..."
791
        fi
791
                continue;
792
792
            fi
793
        print_info 2 "initramfs: >> Copying ${i}${MOD_EXT}..."
793
    
794
        cp -ax --parents "${mymod}" "${TEMP}/initramfs-modules-${KV}-temp"
794
            print_info 2 "initramfs: >> Copying ${i}${KEXT}..."
795
            cp -ax --parents "${mymod}" "${TEMP}/initramfs-modules-${KV}-temp"
796
        done
795
    done
797
    done
796
798
797
    cp -ax --parents ./lib/modules/${KV}/modules* ${TEMP}/initramfs-modules-${KV}-temp 2>/dev/null
799
    cp -ax --parents ./lib/modules/${KV}/modules* ${TEMP}/initramfs-modules-${KV}-temp 2>/dev/null
(-)genkernel-next-68-orig/gen_moddeps.sh (-9 / +6 lines)
Lines 1-18 Link Here
1
#!/bin/bash
1
#!/bin/bash
2
# $Id: 27dab4876ebd53c1b0b0612c35763fa91958a031 $
2
# $Id: 27dab4876ebd53c1b0b0612c35763fa91958a031 $
3
3
4
modules_kext()
5
{
6
    KEXT=".ko"
7
    echo ${KEXT}
8
}
9
10
modules_dep_list()
4
modules_dep_list()
11
{
5
{
12
    KEXT=$(modules_kext)
13
    if [ -f ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep ]
6
    if [ -f ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep ]
14
    then
7
    then
15
        cat ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep | grep ${1}${KEXT}\: | cut -d\:  -f2
8
        for KEXT in ${MOD_EXT_LIST}; do
9
            cat ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep | grep ${1}${KEXT}\: | cut -d\:  -f2
10
        done
16
    fi
11
    fi
17
}
12
}
18
13
Lines 57-63 Link Here
57
gen_dep_list()
52
gen_dep_list()
58
{
53
{
59
    if [ "${ALLRAMDISKMODULES}" = "1" ]; then
54
    if [ "${ALLRAMDISKMODULES}" = "1" ]; then
60
        strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}" -name "*$(modules_kext)") | sort
55
        for KEXT in ${MOD_EXT_LIST}; do
56
            strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}" -name "*${KEXT}") | sort
57
        done
61
    else
58
    else
62
        local group_modules
59
        local group_modules
63
        rm -f ${TEMP}/moddeps > /dev/null
60
        rm -f ${TEMP}/moddeps > /dev/null

Return to bug 642096