lkml.org 
[lkml]   [2018]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 10/15] kbuild: verify that $DEPMOD is installed
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Randy Dunlap <rdunlap@infradead.org>

    commit 934193a654c1f4d0643ddbf4b2529b508cae926e upstream.

    Verify that 'depmod' ($DEPMOD) is installed.
    This is a partial revert of commit 620c231c7a7f
    ("kbuild: do not check for ancient modutils tools").

    Also update Documentation/process/changes.rst to refer to
    kmod instead of module-init-tools.

    Fixes kernel bugzilla #198965:
    https://bugzilla.kernel.org/show_bug.cgi?id=198965

    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
    Cc: Lucas De Marchi <lucas.de.marchi@gmail.com>
    Cc: Michal Marek <michal.lkml@markovi.net>
    Cc: Jessica Yu <jeyu@kernel.org>
    Cc: Chih-Wei Huang <cwhuang@linux.org.tw>
    Cc: stable@vger.kernel.org # any kernel since 2012
    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    Documentation/Changes | 17 ++++++-----------
    scripts/depmod.sh | 8 +++++++-
    2 files changed, 13 insertions(+), 12 deletions(-)

    --- a/Documentation/Changes
    +++ b/Documentation/Changes
    @@ -25,7 +25,7 @@ o Gnu C 3.2
    o Gnu make 3.80 # make --version
    o binutils 2.12 # ld -v
    o util-linux 2.10o # fdformat --version
    -o module-init-tools 0.9.10 # depmod -V
    +o kmod 13 # depmod -V
    o e2fsprogs 1.41.4 # e2fsck -V
    o jfsutils 1.1.3 # fsck.jfs -V
    o reiserfsprogs 3.6.3 # reiserfsck -V
    @@ -119,12 +119,6 @@ is not build with CONFIG_KALLSYMS and yo
    reproduce the Oops with that option, then you can still decode that Oops
    with ksymoops.

    -Module-Init-Tools
    ------------------
    -
    -A new module loader is now in the kernel that requires module-init-tools
    -to use. It is backward compatible with the 2.4.x series kernels.
    -
    Mkinitrd
    --------

    @@ -302,14 +296,15 @@ Util-linux
    ----------
    o <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>

    +Kmod
    +----
    +o <https://www.kernel.org/pub/linux/utils/kernel/kmod/>
    +o <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>
    +
    Ksymoops
    --------
    o <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>

    -Module-Init-Tools
    ------------------
    -o <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>
    -
    Mkinitrd
    --------
    o <https://code.launchpad.net/initrd-tools/main>
    --- a/scripts/depmod.sh
    +++ b/scripts/depmod.sh
    @@ -10,10 +10,16 @@ DEPMOD=$1
    KERNELRELEASE=$2
    SYMBOL_PREFIX=$3

    -if ! test -r System.map -a -x "$DEPMOD"; then
    +if ! test -r System.map ; then
    exit 0
    fi

    +if [ -z $(command -v $DEPMOD) ]; then
    + echo "'make modules_install' requires $DEPMOD. Please install it." >&2
    + echo "This is probably in the kmod package." >&2
    + exit 1
    +fi
    +
    # older versions of depmod don't support -P <symbol-prefix>
    # support was added in module-init-tools 3.13
    if test -n "$SYMBOL_PREFIX"; then

    \
     
     \ /
      Last update: 2018-08-16 20:58    [W:3.396 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site