From patchwork Thu Dec 19 18:32:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 182155 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp851365iln; Thu, 19 Dec 2019 10:36:53 -0800 (PST) X-Google-Smtp-Source: APXvYqwuEP7MXequ4i9SfZ5rGVhPNAickH1mraRtpvespdm15o3YdziVJUS+Oc5Fo94/Cb5utTb6 X-Received: by 2002:a9d:7586:: with SMTP id s6mr10107703otk.342.1576780613819; Thu, 19 Dec 2019 10:36:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576780613; cv=none; d=google.com; s=arc-20160816; b=OcxMjm2i0Ba99+/ArdEPxB+gA68EqeznklusPWlFHMLwc57wniBTuK8BuikdO9H6nM YryXte/gv2JRJnsaKMIcqf5Xf7F0F3HBmqnUUSZviv//nRJmAxegxF0cJpdLrpnrZIE8 c74qr46aQEFw/2r9qVtNlyZTq2Mnu0I6JpAHRpiq9oOoYUISsMsAXekq2IMpqgDIsz8c CNdCOF8dnNjpCE/2Zp3IvOFcNZyEi7tyBA/RpSUMJAewMMkOpVfHXHyNk4xKVKtMVRsy sm6rSOqMWisAmxysIvXVsrpuzqPOmjTVOzbjkbbyo4XmSRpJCmCxG7lGywHoJUBDuqIy Y5vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cWzW9yRIZfF7HSE7jm5yPHlVGQgPt+TUWJFNAfwkYZ0=; b=G3S4nImBEoM59B5EaSBn60DFmcmILmtaIYTtI7qVUKJN39KZfAmuJGnGME/ewd+HFN BGt3mL86BwsVJU4M3oyWslWPFySWyiy8Dw4DqHc1TdWXotDkVvf+zrrshMzAuhHLtzT+ dL84r9sI7W4elsIBL8xJzQPpeNI9ETcqWrzUjuuGZJwc7UJ5F7VLVdKKEYmXK5pyr7j0 XS4X6FMTfOhauONeXCKjEKhiMNVz02adWnEm9PZe2zjLk1+DyCrVJyPfrV1tOT+i6G05 OuRWZO1vfHzTPR1FWh38D8bz/5HX53PNl2B0Akby8VBnvIVZsp94sqXHHkZM8kgNhrZ7 pPjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=z6b0IQ89; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m23si3411609oic.43.2019.12.19.10.36.53; Thu, 19 Dec 2019 10:36:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=z6b0IQ89; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727705AbfLSSgw (ORCPT + 14 others); Thu, 19 Dec 2019 13:36:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:54058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727688AbfLSSgv (ORCPT ); Thu, 19 Dec 2019 13:36:51 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 459CD24679; Thu, 19 Dec 2019 18:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780610; bh=Ry25ZJNwSjwRt9dR556q7Qn9xzg36UfXvQGRWDhy/jM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z6b0IQ89qfoNWKmnxl4QVaLdV+A3euAPJmbweoIwSWGseI78IBTvDJGeh8AFHOi/V PJWs69MIv4xDE6Zs3B6zfgHCZ/qcgS6Jw7M/j5jdy62AVZhM5y+wL57fOQv+TBQjQQ GTGH8ZyBFUHDEykhxJvQlywdKB/4/6+7zZVz2BgY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Sasha Levin Subject: [PATCH 4.4 045/162] kbuild: fix single target build for external module Date: Thu, 19 Dec 2019 19:32:33 +0100 Message-Id: <20191219183210.650928864@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada [ Upstream commit e07db28eea38ed4e332b3a89f3995c86b713cb5b ] Building a single target in an external module fails due to missing .tmp_versions directory. For example, $ make -C /lib/modules/$(uname -r)/build M=$PWD foo.o will fail in the following way: CC [M] /home/masahiro/foo/foo.o /bin/sh: 1: cannot create /home/masahiro/foo/.tmp_versions/foo.mod: Directory nonexistent This is because $(cmd_crmodverdir) is executed only before building /, %/, %.ko single targets of external modules. Create .tmp_versions in the 'prepare' target. Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/Makefile b/Makefile index eb4f5b889a1cc..42102ffb9eff8 100644 --- a/Makefile +++ b/Makefile @@ -1424,9 +1424,6 @@ else # KBUILD_EXTMOD # We are always building modules KBUILD_MODULES := 1 -PHONY += crmodverdir -crmodverdir: - $(cmd_crmodverdir) PHONY += $(objtree)/Module.symvers $(objtree)/Module.symvers: @@ -1438,7 +1435,7 @@ $(objtree)/Module.symvers: module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD)) PHONY += $(module-dirs) modules -$(module-dirs): crmodverdir $(objtree)/Module.symvers +$(module-dirs): prepare $(objtree)/Module.symvers $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) modules: $(module-dirs) @@ -1478,7 +1475,8 @@ help: # Dummies... PHONY += prepare scripts -prepare: ; +prepare: + $(cmd_crmodverdir) scripts: ; endif # KBUILD_EXTMOD @@ -1602,17 +1600,14 @@ endif # Modules /: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) # Make sure the latest headers are built for Documentation Documentation/: headers_install %/: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) %.ko: prepare scripts FORCE - $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) $(@:.ko=.o) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost