From patchwork Sat Nov 3 20:15:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 150093 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp882796ljp; Sat, 3 Nov 2018 13:15:28 -0700 (PDT) X-Google-Smtp-Source: AJdET5cQaK/x7emDOd2xXgD5DdLTmTF1hrXylnw60TOvUiiBuV0eVRn1qZlzbSnkvVdOAz4qS4BK X-Received: by 2002:a17:902:7045:: with SMTP id h5-v6mr16317939plt.211.1541276128280; Sat, 03 Nov 2018 13:15:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541276128; cv=none; d=google.com; s=arc-20160816; b=FuTFMjZJ1k2dU3DYecEJqroXcdZKj2E9PBQ4VB3WIW6b/pigmMmL+cRJJBok4eDFDV bj5i6yKLdnTEhTtdVB787OT0QKTfSrNzLxuefRkLRYtP4ngdVpDJVTqjykLQofHpyV3F 1uMTd7bBQ7tFAEPr9aRF0CfxGv1IaHkqJ3+vhBKdcicjb+BrO2vkTva2DBcVmEBZPuOb H/AeuF/z8Y1aglOkY2YVUCPAFdpgDXnLiSiT8smFI6N3vz5hTTgwDOmZ8ZiCGC40KagL DQ8xhiVSiIUKfBl80VLqs/Uk3TtZ3/WdYFLg3D4BETbHecVmnQiCS/cGz+RipqmEfqA2 K7Jg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=NREQVr5KgJehgLF/BScZ5U0wiAbtn6VndNn8zDfpXog=; b=Je9Ae6y3WUSIAOWKHFvhwc2H71fyOirO1JQouis6oz7eDrxQkQWK7aQXlA9yQ8DRqc ZjR+wvvCuoOpIvyIrtDIadm0+NqAnnUsaXmNfEAv8pg2nFap8mWQ01TFyNHtB5SXmjFN K9gdIknl6CO5JRZwZJkbmfxOm+l8AF5DLdEXvM2kMNs80AIdCYXX3Nb0EtHqfM8/owvF T1lMeWG9isQzas1K99YG7eOZCImAaS0hAKTir+X7L2vR2y5cSeL+QMD4II2qjJ6HV1QE mOm8TMcmVmHGWcMT8ztIw3JJz5fVHf54OIE7xQ5TIcYCKVlKT4sY002O1cub+nW+WALO lYCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EHNcsXva; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 12-v6si38071728pgq.337.2018.11.03.13.15.27; Sat, 03 Nov 2018 13:15:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@linaro.org header.s=google header.b=EHNcsXva; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727018AbeKDF1o (ORCPT + 32 others); Sun, 4 Nov 2018 01:27:44 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42521 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726697AbeKDF1n (ORCPT ); Sun, 4 Nov 2018 01:27:43 -0400 Received: by mail-wr1-f68.google.com with SMTP id y15-v6so5293210wru.9 for ; Sat, 03 Nov 2018 13:15:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NREQVr5KgJehgLF/BScZ5U0wiAbtn6VndNn8zDfpXog=; b=EHNcsXvarxApF/5r3qevYe7HGJY4ACyzxRuSuNtJwjBHJurrlm1V27gyM0alIB77IJ peZom8p9YE+w2n5A5duX6EQxSKkL/NBmA8Um4DcD3WNjLn8pN92qMRKJQdAIQsvgzyVa 1ektA5djHqChM9JXYDlggrriWJPvjVZ+W6/7Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NREQVr5KgJehgLF/BScZ5U0wiAbtn6VndNn8zDfpXog=; b=iiIt/JRt9bM25I4LPsHCswjcw/iyw/VN0Ti8OPzWDMDCgh5y//zvI9AL2q7CWNivkR 9KqFLY8tIJEFJRAksryTEwN0T/BjlHvX9rNQTH6hFAqGEcNMKvdDXFs2kS+GEGwYsZ7+ HSUeoI8ghuZId7RXIRT+dCA9K6T/VrVPaGEh8NAw6INSG2YucH1LcrwNlcjm6vJcjBPv LjiqWg0cRV4eXlYZu/HPzh2C8bLvn9XqiRw+npe4T0GaX3jciVNenXKDoYznhiwx8WSy zxFjYoyH7+zrvMGx8YRMBhi1xlvZEbYmzU0BVycOhp/nwqYmc9ark6CHwZuWdbXkswTq P7Vg== X-Gm-Message-State: AGRZ1gKeuekgWZeT4Cl3Xx0PRVCOxV8hTKd2XSq9wj/hAydkhS9s8fmD HbcqObIaN0CsWkjJ8ZJU5bNrAsl+nIU= X-Received: by 2002:adf:a386:: with SMTP id l6-v6mr13037936wrb.110.1541276122781; Sat, 03 Nov 2018 13:15:22 -0700 (PDT) Received: from harold.home ([2a01:cb1d:112:6f00:9584:c078:6527:8480]) by smtp.gmail.com with ESMTPSA id o126-v6sm24910616wmo.3.2018.11.03.13.15.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Nov 2018 13:15:21 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: michal.lkml@markovi.net, yamada.masahiro@socionext.com, riku.voipio@linaro.org, Ard Biesheuvel Subject: [PATCH] Revert "kbuild: add --include-dir flag only for out-of-tree build" Date: Sat, 3 Nov 2018 21:15:04 +0100 Message-Id: <20181103201504.29413-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 80463f1b7bf9f822fd3495139bcf3ef254fdca10, because it breaks the bindeb-pkg build target in the following way: ... LD [M] sound/soc/rockchip/snd-soc-rk3399-gru-sound.ko LD [M] sound/soc/rockchip/snd-soc-rockchip-pcm.ko LD [M] sound/soc/rockchip/snd-soc-rockchip-rt5645.ko LD [M] sound/soc/rockchip/snd-soc-rockchip-spdif.ko LD [M] sound/soc/sh/rcar/snd-soc-rcar.ko fakeroot -u debian/rules binary make KERNELRELEASE=4.19.0-12677-g19beffaf7a99-dirty ARCH=arm64 KBUILD_SRC= intdeb-pkg /bin/bash /home/ard/linux/scripts/package/builddeb Makefile:600: include/config/auto.conf: No such file or directory *** *** Configuration file ".config" not found! *** *** Please run some configurator (e.g. "make oldconfig" or *** "make menuconfig" or "make xconfig"). *** make[12]: *** [syncconfig] Error 1 make[11]: *** [syncconfig] Error 2 make[10]: *** [include/config/auto.conf] Error 2 make[9]: *** [__sub-make] Error 2 cp: cannot stat '/home/ard/linux/scripts/kconfig/Makefile:69: recipe for target '\''syncconfig'\'' failed'$'\n''/home/ard/linux/Makefile:544: recipe for target '\''syncconfig'\'' failed'$'\n''Makefile:640: recipe for target '\''include/config/auto.conf'\'' failed'$'\n''Makefile:15: recipe for target '\''__sub-make'\'' failed': No such file or directory /home/ard/linux/scripts/package/Makefile:83: recipe for target 'intdeb-pkg' failed make[8]: *** [intdeb-pkg] Error 1 /home/ard/linux/Makefile:1399: recipe for target 'intdeb-pkg' failed make[7]: *** [intdeb-pkg] Error 2 Makefile:152: recipe for target 'sub-make' failed make[6]: *** [sub-make] Error 2 Makefile:15: recipe for target '__sub-make' failed make[5]: *** [__sub-make] Error 2 debian/rules:7: recipe for target 'binary-arch' failed make[4]: *** [binary-arch] Error 2 dpkg-buildpackage: error: fakeroot -u debian/rules binary gave error exit status 2 /home/ard/linux/scripts/package/Makefile:79: recipe for target 'bindeb-pkg' failed make[3]: *** [bindeb-pkg] Error 2 /home/ard/linux/Makefile:1399: recipe for target 'bindeb-pkg' failed make[2]: *** [bindeb-pkg] Error 2 Makefile:152: recipe for target 'sub-make' failed make[1]: *** [sub-make] Error 2 Makefile:15: recipe for target '__sub-make' failed make: *** [__sub-make] Error 2 Signed-off-by: Ard Biesheuvel --- Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) -- 2.19.1 diff --git a/Makefile b/Makefile index 9aa352b38815..f9d7af9e5146 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,10 @@ NAME = "People's Front" PHONY := _all _all: -# Do not use make's built-in rules and variables -# (this increases performance and avoids hard-to-debug behaviour) -MAKEFLAGS += -rR +# o Do not use make's built-in rules and variables +# (this increases performance and avoids hard-to-debug behaviour); +# o Look for make include files relative to root of kernel src +MAKEFLAGS += -rR --include-dir=$(CURDIR) # Avoid funny character set dependencies unexport LC_ALL @@ -135,13 +136,6 @@ KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \ $(if $(KBUILD_OUTPUT),, \ $(error failed to create output directory "$(saved-output)")) -# Look for make include files relative to root of kernel src -# -# This does not become effective immediately because MAKEFLAGS is re-parsed -# once after the Makefile is read. It is OK since we are going to invoke -# 'sub-make' below. -MAKEFLAGS += --include-dir=$(CURDIR) - PHONY += $(MAKECMDGOALS) sub-make $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make