From patchwork Mon Jul 2 02:46:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 10500361 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EDB87602D6 for ; Mon, 2 Jul 2018 02:46:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9101287E2 for ; Mon, 2 Jul 2018 02:46:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB7EE28801; Mon, 2 Jul 2018 02:46:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D6F5287E2 for ; Mon, 2 Jul 2018 02:46:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933120AbeGBCqV (ORCPT ); Sun, 1 Jul 2018 22:46:21 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:37342 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753092AbeGBCqN (ORCPT ); Sun, 1 Jul 2018 22:46:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:MIME-Version:Date:Message-ID:Subject:From:Cc:To:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xAWqTSOGybjnvQmO55Epnh/ke6CGEzz986bkXT/RCko=; b=UkDJ3o2lA9ArXLBLLnifA9ysr L/m2q4GGxnpFT5hB8iKQB4fQaSZBkz+UZdNdH933bpEnITCjxK4iDW2nzCYvgurFwgXTJaDlpUudo rmHaVxFYVD28vBwTN1DYeImcIuS7SXDHoMi51JznOIAMKX1p4PcMSZ3XAJfK14lErCpE/GHXi68ko 9OKa9kvvXNUWYbzzSV+Mu1aBmJerP6ZZof8vf5fK9CbsLeWs6AozyNlkbpMu8Hd0YSRNvYXsRs6X1 IkK1KI6/GKngUY9KMcchqEXImkj76ny8VGshgLFlc8aNw8cll4nifM38NKHRP6vJg27GIGhQ8nqiY 334B38SoQ==; Received: from static-50-53-52-16.bvtn.or.frontiernet.net ([50.53.52.16] helo=dragon.dunlab) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fZoqu-0000kc-3H; Mon, 02 Jul 2018 02:46:08 +0000 To: linux-kbuild , Masahiro Yamada Cc: LKML , Lucas De Marchi , Lucas De Marchi , Michal Marek , Jessica Yu , Chih-Wei Huang From: Randy Dunlap Subject: [PATCH v2] kbuild: verify that $DEPMOD is installed Message-ID: <53a0c9d4-cf1c-fbcf-3706-742f5ad41178@infradead.org> Date: Sun, 1 Jul 2018 19:46:06 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Randy Dunlap Verify that 'depmod' ($DEPMOD) is installed. This is a partial revert of 620c231c7a7f (from 2012): ("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 Cc: Lucas De Marchi Cc: Lucas De Marchi Cc: Michal Marek Cc: Jessica Yu Cc: Chih-Wei Huang Cc: stable@vger.kernel.org # any kernel since 2012 --- v2: - spell out that modules_install requires $DEPMOD - remove references to module-init-tools from Documentation/process/changes.rst and add kmod Documentation/process/changes.rst | 19 +++++++------------ scripts/depmod.sh | 8 +++++++- 2 files changed, 14 insertions(+), 13 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- lnx-418-rc3.orig/scripts/depmod.sh +++ lnx-418-rc3/scripts/depmod.sh @@ -10,10 +10,16 @@ fi DEPMOD=$1 KERNELRELEASE=$2 -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 require the version string to start with three # numbers, so we cheat with a symlink here depmod_hack_needed=true --- lnx-418-rc3.orig/Documentation/process/changes.rst +++ lnx-418-rc3/Documentation/process/changes.rst @@ -35,7 +35,7 @@ binutils 2.20 flex 2.5.35 flex --version bison 2.0 bison --version util-linux 2.10o fdformat --version -module-init-tools 0.9.10 depmod -V +kmod 13 depmod -V e2fsprogs 1.41.4 e2fsck -V jfsutils 1.1.3 fsck.jfs -V reiserfsprogs 3.6.3 reiserfsck -V @@ -156,12 +156,6 @@ is not build with ``CONFIG_KALLSYMS`` an 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 -------- @@ -371,16 +365,17 @@ Util-linux - +Kmod +---- + +- +- + Ksymoops -------- - -Module-Init-Tools ------------------ - -- - Mkinitrd --------