From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C19EC4320A for ; Tue, 10 Aug 2021 17:58:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 72A9D60E52 for ; Tue, 10 Aug 2021 17:58:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236905AbhHJR6q (ORCPT ); Tue, 10 Aug 2021 13:58:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:55598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235287AbhHJR4l (ORCPT ); Tue, 10 Aug 2021 13:56:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1986861373; Tue, 10 Aug 2021 17:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617510; bh=LzN8h3QUBT0+yFbN/7lI2jC5K3HR9//KGqZ/8sk/A0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TFnf7yr4VEADKwmZzHHpGYL8oVgmzTvSWslqPjn239zS2gwI1M0+JRkoFEgJhXUb9 Hh8I+WGU850ZgB1t1/y8uS/yyvzHDlHHW5EzkTSHe/DD+9lTgLPL5IQwWpnj9xwWCi kReUu6F72VYMrEHhYLc/aGMsFq3WVIPBsK3jDOes= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John S Gruber , Masahiro Yamada , Sasha Levin Subject: [PATCH 5.13 063/175] kbuild: cancel sub_make_done for the install target to fix DKMS Date: Tue, 10 Aug 2021 19:29:31 +0200 Message-Id: <20210810173003.020042754@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada [ Upstream commit 14ccc638b02f9ec500c17d9e39efe979145a4b61 ] Since commit bcf637f54f6d ("kbuild: parse C= and M= before changing the working directory"), external module builds invoked by DKMS fail because M= option is not parsed. I wanted to add 'unset sub_make_done' in install.sh but similar scripts, arch/*/boot/install.sh, are duplicated, so I set sub_make_done empty in the top Makefile. Fixes: bcf637f54f6d ("kbuild: parse C= and M= before changing the working directory") Reported-by: John S Gruber Signed-off-by: Masahiro Yamada Tested-by: John S Gruber Signed-off-by: Sasha Levin --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 9d810e13a83f..218f44d7fc80 100644 --- a/Makefile +++ b/Makefile @@ -1366,6 +1366,15 @@ scripts_unifdef: scripts_basic $(Q)$(MAKE) $(build)=scripts scripts/unifdef # --------------------------------------------------------------------------- +# Install + +# Many distributions have the custom install script, /sbin/installkernel. +# If DKMS is installed, 'make install' will eventually recuses back +# to the this Makefile to build and install external modules. +# Cancel sub_make_done so that options such as M=, V=, etc. are parsed. + +install: sub_make_done := + # Kernel selftest PHONY += kselftest -- 2.30.2