From nobody Fri Dec 19 17:00:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23A894A02; Sat, 27 Apr 2024 14:55:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714229711; cv=none; b=pEB/si4ZlrwYTqHxIKLRGqknYcSOpLRByu+hHXw9K5wq3aIquftESvsQFqF+WkDRkdyP6kHOs0fTvHztQyr9X/mhynPU87/b/ZkZDH+hnJmlXihfz7UVh0lSt4iGJKuXTcNN3NCBFVn9EkXTLuregAWaQ6W2Ksem3nU7PvoYmaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714229711; c=relaxed/simple; bh=wq89dRCvrNa0PsG19mCNdBlAe1+Vu/za2sDeBBPhDQw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ak56RXL6OfJ9oxQbsVYfEyry8OL/+S4VIM2Pd/avO2hMmg6643mUfxU6sDdmba3sQkXo3sp9bbZQfuEz2BsAUn37zSHri6/E8L3nyDX36oz/61GDGL8aZtvZgqIxxatJjvsrEBnErNu0zak0qMziZc283S3NgYg0oYKxQw6wzDU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T6F5Uhw+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="T6F5Uhw+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 743F7C2BD10; Sat, 27 Apr 2024 14:55:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714229709; bh=wq89dRCvrNa0PsG19mCNdBlAe1+Vu/za2sDeBBPhDQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T6F5Uhw+aDtrz8kYD8o/47R0a+0biQRqaOwnHrKPW/HLzSr9LECH73uuO1Nh/ozVF XIp8eD+9qXqKLLS570opS7PSZQU7ecEA7ROqFNr+4vbAis+4bcSyQGRoOh+UdPAd8t 2J6BVQfXU5WS/VUK2h0BLy2N2h+f2/U88uPm61jfXHxLuaHOAOveWZWrswDl9wHjLb 6k7I3IGIbQ7C01G4krSK7H8RkrrtEq6jVaVzeXjDE0Gm6AecPuoWdzSp9u37gAF0du +OgY2BBQgw++LF9xTM/GNrtxqIZ56PFE18h4BQEAWaOC5nsvaFYbSshdAdE60XvPYq LhTkzIRiDfffA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Helge Deller , Nicolas Schier Subject: [PATCH v2 1/4] arch: use $(obj)/ instead of $(src)/ for preprocessed linker scripts Date: Sat, 27 Apr 2024 23:54:59 +0900 Message-Id: <20240427145502.2804311-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240427145502.2804311-1-masahiroy@kernel.org> References: <20240427145502.2804311-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" These are generated files. Prefix them with $(obj)/ instead of $(src)/. Signed-off-by: Masahiro Yamada Acked-by: Helge Deller Reviewed-by: Nicolas Schier --- (no changes since v1) arch/arm64/kernel/vdso32/Makefile | 2 +- arch/csky/kernel/vdso/Makefile | 2 +- arch/parisc/kernel/vdso32/Makefile | 2 +- arch/parisc/kernel/vdso64/Makefile | 2 +- arch/powerpc/kernel/vdso/Makefile | 4 ++-- arch/s390/kernel/vdso32/Makefile | 2 +- arch/s390/kernel/vdso64/Makefile | 2 +- arch/sh/kernel/vsyscall/Makefile | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/M= akefile index f5f80fdce0fe..cc4508c604b2 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -136,7 +136,7 @@ $(obj)/vdso32.so.dbg: $(obj)/vdso.so.raw $(obj)/$(munge= ) FORCE $(call if_changed,vdsomunge) =20 # Link rule for the .so file, .lds has to be first -$(obj)/vdso.so.raw: $(src)/vdso.lds $(obj-vdso) FORCE +$(obj)/vdso.so.raw: $(obj)/vdso.lds $(obj-vdso) FORCE $(call if_changed,vdsold_and_vdso_check) =20 # Compilation rules for the vDSO sources diff --git a/arch/csky/kernel/vdso/Makefile b/arch/csky/kernel/vdso/Makefile index ddf784a62c11..24a01c22293e 100644 --- a/arch/csky/kernel/vdso/Makefile +++ b/arch/csky/kernel/vdso/Makefile @@ -31,7 +31,7 @@ KCOV_INSTRUMENT :=3D n $(obj)/vdso.o: $(obj)/vdso.so =20 SYSCFLAGS_vdso.so.dbg =3D $(c_flags) -$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE +$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE $(call if_changed,vdsold) SYSCFLAGS_vdso.so.dbg =3D -shared -s -Wl,-soname=3Dlinux-vdso.so.1 \ -Wl,--build-id=3Dsha1 -Wl,--hash-style=3Dboth diff --git a/arch/parisc/kernel/vdso32/Makefile b/arch/parisc/kernel/vdso32= /Makefile index e45d46bf46a2..60dc708a0f80 100644 --- a/arch/parisc/kernel/vdso32/Makefile +++ b/arch/parisc/kernel/vdso32/Makefile @@ -26,7 +26,7 @@ $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so FORCE =20 # Force dependency (incbin is bad) # link rule for the .so file, .lds has to be first -$(obj)/vdso32.so: $(src)/vdso32.lds $(obj-vdso32) $(VDSO_LIBGCC) FORCE +$(obj)/vdso32.so: $(obj)/vdso32.lds $(obj-vdso32) $(VDSO_LIBGCC) FORCE $(call if_changed,vdso32ld) =20 # assembly rules for the .S files diff --git a/arch/parisc/kernel/vdso64/Makefile b/arch/parisc/kernel/vdso64= /Makefile index f3d6045793f4..0982f3099ae2 100644 --- a/arch/parisc/kernel/vdso64/Makefile +++ b/arch/parisc/kernel/vdso64/Makefile @@ -26,7 +26,7 @@ $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so FORCE =20 # Force dependency (incbin is bad) # link rule for the .so file, .lds has to be first -$(obj)/vdso64.so: $(src)/vdso64.lds $(obj-vdso64) $(VDSO_LIBGCC) FORCE +$(obj)/vdso64.so: $(obj)/vdso64.lds $(obj-vdso64) $(VDSO_LIBGCC) FORCE $(call if_changed,vdso64ld) =20 # assembly rules for the .S files diff --git a/arch/powerpc/kernel/vdso/Makefile b/arch/powerpc/kernel/vdso/M= akefile index 1b93655c2857..a14eab366993 100644 --- a/arch/powerpc/kernel/vdso/Makefile +++ b/arch/powerpc/kernel/vdso/Makefile @@ -74,9 +74,9 @@ targets +=3D vdso64.lds CPPFLAGS_vdso64.lds +=3D -P -C =20 # link rule for the .so file, .lds has to be first -$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday= -32.o FORCE +$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday= -32.o FORCE $(call if_changed,vdso32ld_and_check) -$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday= -64.o FORCE +$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday= -64.o FORCE $(call if_changed,vdso64ld_and_check) =20 # assembly rules for the .S files diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Mak= efile index b12a274cbb47..70e9949c2612 100644 --- a/arch/s390/kernel/vdso32/Makefile +++ b/arch/s390/kernel/vdso32/Makefile @@ -44,7 +44,7 @@ $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so quiet_cmd_vdso_and_check =3D VDSO $@ cmd_vdso_and_check =3D $(cmd_ld); $(cmd_vdso_check) =20 -$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE +$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) FORCE $(call if_changed,vdso_and_check) =20 # strip rule for the .so file diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Mak= efile index ef9832726097..2b3617b6d162 100644 --- a/arch/s390/kernel/vdso64/Makefile +++ b/arch/s390/kernel/vdso64/Makefile @@ -50,7 +50,7 @@ quiet_cmd_vdso_and_check =3D VDSO $@ cmd_vdso_and_check =3D $(cmd_ld); $(cmd_vdso_check) =20 # link rule for the .so file, .lds has to be first -$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj-cvdso64) FORCE +$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj-cvdso64) FORCE $(call if_changed,vdso_and_check) =20 # strip rule for the .so file diff --git a/arch/sh/kernel/vsyscall/Makefile b/arch/sh/kernel/vsyscall/Mak= efile index 118744d349e2..cb4f0bb80c38 100644 --- a/arch/sh/kernel/vsyscall/Makefile +++ b/arch/sh/kernel/vsyscall/Makefile @@ -19,14 +19,14 @@ vsyscall-flags =3D -shared -s -Wl,-soname=3Dlinux-gate.= so.1 -Wl,--hash-style=3Dsysv SYSCFLAGS_vsyscall-trapa.so =3D $(vsyscall-flags) =20 $(obj)/vsyscall-trapa.so: \ -$(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE +$(obj)/vsyscall-%.so: $(obj)/vsyscall.lds $(obj)/vsyscall-%.o FORCE $(call if_changed,syscall) =20 # We also create a special relocatable object that should mirror the symbol # table and layout of the linked DSO. With ld -R we can then refer to # these symbols in the kernel code rather than hand-coded addresses. SYSCFLAGS_vsyscall-dummy.o =3D -r -$(obj)/vsyscall-dummy.o: $(src)/vsyscall.lds \ +$(obj)/vsyscall-dummy.o: $(obj)/vsyscall.lds \ $(obj)/vsyscall-trapa.o $(obj)/vsyscall-note.o FORCE $(call if_changed,syscall) =20 --=20 2.40.1 From nobody Fri Dec 19 17:00:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB07063B9; Sat, 27 Apr 2024 14:55:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714229711; cv=none; b=bOmW9Y4EQrW48sHvm/jqP76LeFh2/z2qpEwxPfnoUkEBGWY7NbcPFH0eUylWjCjSZBfZt26ARiOgIUtFoGbWSNEVCOZ48GSUQ75QtFCz4ue3DrTSsdRuwcS/5zvKiIhfWQ2c0oCxtwvuSbQhsNUDDET/0YmuozzHs6UbqoX4sG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714229711; c=relaxed/simple; bh=GY5y1LwEXug5OjsvS3sjYPBnC0ItFxQPdIM67CZ1NL0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kudqfa6m+yC5aG9VwpqYaSrKEgIKOUySzQTrwnrDFX+FOTXKqWFlE2pwVTGxXQTxRzw9oZEb9qCHK8BARlmKPu0mfquoHQ9G6xgZGHGLD2XsHoLPlJqUvsdoL8Frl+jqp2wm+2fs8LZTp1RtM9/8aVCQalD6Manu9XfP4O+PQgU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f3L+sKIf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="f3L+sKIf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 337AAC2BD11; Sat, 27 Apr 2024 14:55:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714229711; bh=GY5y1LwEXug5OjsvS3sjYPBnC0ItFxQPdIM67CZ1NL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f3L+sKIfX885hrWFH+zy+OLPdyhzTCXNMXZQa2HW2xKVhZhyAuODZaSKWEiM9hRe6 +6Se/U+Q3FiKIiIi41F9eAxan9HaPQXalbKCGG31hSDGeml8yEN6N9XfIFnEDgMuLi UWsj4XtCQcFPf1Vksu+/Vik2t/wHSoBgNV6Q+LY9MxvmIzG7mQIth3vrR/whjlcZcU lPy3vqmDkFW3xzL2M4Wfn3lrA7DmzgEUEuhBYXUuwYDwsz5qdaLeow3tnuaThi3SpL bM3ULpCNPV03vXiaF6So5f0oIeLbJZDlJqVnac82kahogh1Vhtv4kLg4YS8hLE2lZs yNFNZKzbxZqKg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , kernel test robot Subject: [PATCH v2 2/4] kbuild: do not add $(srctree) or $(objtree) to header search paths Date: Sat, 27 Apr 2024 23:55:00 +0900 Message-Id: <20240427145502.2804311-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240427145502.2804311-1-masahiroy@kernel.org> References: <20240427145502.2804311-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" scripts/Makefile.lib is included not only from scripts/Makefile.build but also from scripts/Makefile.{vmlinux,modfinal} for building generated C files. In scripts/Makefile.{vmlinux,modfinal}, $(obj) and $(src) are empty. Therefore, the header include paths: -I $(srctree)/$(src) -I $(objtree)/$(obj) ... become meaningless code: -I $(srctree)/ -I $(objtree)/ Add these paths only when 'obj' and 'src' are defined. Reported-by: kernel test robot Link: https://lore.kernel.org/oe-kbuild-all/202404170634.BlqTaYA0-lkp@intel= .com/ Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- Changes in v2: - New patch to address the build error reported by 0day bot scripts/Makefile.lib | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index d1d51e38b55d..e67f066c0cea 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -213,9 +213,9 @@ endif # $(objtree)/$(obj) for including generated headers from checkin source fi= les ifeq ($(KBUILD_EXTMOD),) ifdef building_out_of_srctree -_c_flags +=3D -I $(srctree)/$(src) -I $(objtree)/$(obj) -_a_flags +=3D -I $(srctree)/$(src) -I $(objtree)/$(obj) -_cpp_flags +=3D -I $(srctree)/$(src) -I $(objtree)/$(obj) +_c_flags +=3D $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtre= e)/,$(obj)) +_a_flags +=3D $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtre= e)/,$(obj)) +_cpp_flags +=3D $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtre= e)/,$(obj)) endif endif =20 --=20 2.40.1 From nobody Fri Dec 19 17:00:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2126611721; Sat, 27 Apr 2024 14:55:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714229713; cv=none; b=DV1O2iZgHm5FokZqiWhzFhsWJ4mItKT/Xg4wKqaM28DjmCevibD3E/gLspyChLBuiNABJ8KCrnmFS+c6eOR0eW4JXDWqoFzKGkiNo1U7Sn2Ya1RwyYv7sueN+7U31F3dgOhxc9u0+GvCdr4koPA/pYg/+fEuQ7PEaObpsehOyt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714229713; c=relaxed/simple; bh=sxkO/VNGuHCpY+xaA593lVgtx7OEmQ5zj1XiiuDfS9A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=O6e9+pfHz7dVkyVuR/FgihEZF24GCdna/UKsP6Vr89MWh1VKR3a0ryiSo3kvC342rNAc/82MyExx0Y6fyuyaracp95cSEQp6O/44ogNaQ5JsTSWbfnF+uGpxJLLy+WB3CZ9upm2S1kr/XhwayFXxiVcBwcm7fXdkK4qQPpb1f6s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FF0gp7fx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FF0gp7fx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A76CEC2BD10; Sat, 27 Apr 2024 14:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714229712; bh=sxkO/VNGuHCpY+xaA593lVgtx7OEmQ5zj1XiiuDfS9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FF0gp7fx6+7X5owHaXgnY2c+n0niE6MF2CwPjVBtN+2Ui676eB3E5o4265uR+MGtL GRA4sI7BEuRiUIM6bLTRGgqP8ldhtt2wTTcbBcO2T7teYMu+Qum/Zwa3hJVVDJKlUQ omj0hKaaiqwU/VqNXg5kO0OKKwfkGP+13E4vgWXgo6SLvdQp2G/lw25z3bwTMnzp6z V0OaiWRY85gORgGxP3qkn5qHpXH7yJslCYjkiTow7pCY3oscQQJTQZAMqwTLozXork j49sgdB7pA1vcxs6T+8EnevN9zbZL8wUkmN638AAJPZ/kxRmBVdXCUqrZ7Q+rZoMyW 7hisVHcklQwfg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Schier Subject: [PATCH v2 3/4] kbuild: use $(obj)/ instead of $(src)/ for common pattern rules Date: Sat, 27 Apr 2024 23:55:01 +0900 Message-Id: <20240427145502.2804311-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240427145502.2804311-1-masahiroy@kernel.org> References: <20240427145502.2804311-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Kbuild conventionally uses $(obj)/ for generated files, and $(src)/ for checked-in source files. It is merely a convention without any functional difference. In fact, $(obj) and $(src) are exactly the same, as defined in scripts/Makefile.build: src :=3D $(obj) Before changing the semantics of $(src) in the next commit, this commit replaces $(obj)/ with $(src)/ in pattern rules where the prerequisite might be a generated file. C, assembly, and Rust files are sometimes generated by tools, so they could be either generated files or real sources. The $(obj)/ prefix works for both cases with the help of VPATH. As mentioned above, $(obj) and $(src) are the same at this point, hence this commit has no functional change. I did not modify scripts/Makefile.userprogs because there is no use case where userspace C files are generated. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- Changes in v2: - replace $(src)/%.rs with $(obj)/%.rs because Rust files are also generated scripts/Makefile.build | 26 +++++++++++++------------- scripts/Makefile.host | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index baf86c0880b6..41138346afb0 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -113,13 +113,13 @@ endif quiet_cmd_cc_s_c =3D CC $(quiet_modtag) $@ cmd_cc_s_c =3D $(CC) $(filter-out $(DEBUG_CFLAGS) $(CC_FLAGS_LTO), $= (c_flags)) -fverbose-asm -S -o $@ $< =20 -$(obj)/%.s: $(src)/%.c FORCE +$(obj)/%.s: $(obj)/%.c FORCE $(call if_changed_dep,cc_s_c) =20 quiet_cmd_cpp_i_c =3D CPP $(quiet_modtag) $@ cmd_cpp_i_c =3D $(CPP) $(c_flags) -o $@ $< =20 -$(obj)/%.i: $(src)/%.c FORCE +$(obj)/%.i: $(obj)/%.c FORCE $(call if_changed_dep,cpp_i_c) =20 genksyms =3D scripts/genksyms/genksyms \ @@ -133,7 +133,7 @@ cmd_gensymtypes_c =3D $(CPP) -D__GENKSYMS__ $(c_flags) = $< | $(genksyms) quiet_cmd_cc_symtypes_c =3D SYM $(quiet_modtag) $@ cmd_cc_symtypes_c =3D $(call cmd_gensymtypes_c,true,$@) >/dev/null =20 -$(obj)/%.symtypes : $(src)/%.c FORCE +$(obj)/%.symtypes : $(obj)/%.c FORCE $(call cmd,cc_symtypes_c) =20 # LLVM assembly @@ -141,7 +141,7 @@ $(obj)/%.symtypes : $(src)/%.c FORCE quiet_cmd_cc_ll_c =3D CC $(quiet_modtag) $@ cmd_cc_ll_c =3D $(CC) $(c_flags) -emit-llvm -S -fno-discard-value-na= mes -o $@ $< =20 -$(obj)/%.ll: $(src)/%.c FORCE +$(obj)/%.ll: $(obj)/%.c FORCE $(call if_changed_dep,cc_ll_c) =20 # C (.c) files @@ -240,7 +240,7 @@ define rule_as_o_S endef =20 # Built-in and composite module parts -$(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE +$(obj)/%.o: $(obj)/%.c $(recordmcount_source) FORCE $(call if_changed_rule,cc_o_c) $(call cmd,force_checksrc) =20 @@ -257,7 +257,7 @@ quiet_cmd_cc_lst_c =3D MKLST $@ $(CONFIG_SHELL) $(srctree)/scripts/makelst $*.o \ System.map $(OBJDUMP) > $@ =20 -$(obj)/%.lst: $(src)/%.c FORCE +$(obj)/%.lst: $(obj)/%.c FORCE $(call if_changed_dep,cc_lst_c) =20 # Compile Rust sources (.rs) @@ -290,7 +290,7 @@ rust_common_cmd =3D \ quiet_cmd_rustc_o_rs =3D $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ cmd_rustc_o_rs =3D $(rust_common_cmd) --emit=3Dobj=3D$@ $< =20 -$(obj)/%.o: $(src)/%.rs FORCE +$(obj)/%.o: $(obj)/%.rs FORCE +$(call if_changed_dep,rustc_o_rs) =20 quiet_cmd_rustc_rsi_rs =3D $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ @@ -298,19 +298,19 @@ quiet_cmd_rustc_rsi_rs =3D $(RUSTC_OR_CLIPPY_QUIET) $= (quiet_modtag) $@ $(rust_common_cmd) -Zunpretty=3Dexpanded $< >$@; \ command -v $(RUSTFMT) >/dev/null && $(RUSTFMT) $@ =20 -$(obj)/%.rsi: $(src)/%.rs FORCE +$(obj)/%.rsi: $(obj)/%.rs FORCE +$(call if_changed_dep,rustc_rsi_rs) =20 quiet_cmd_rustc_s_rs =3D $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ cmd_rustc_s_rs =3D $(rust_common_cmd) --emit=3Dasm=3D$@ $< =20 -$(obj)/%.s: $(src)/%.rs FORCE +$(obj)/%.s: $(obj)/%.rs FORCE +$(call if_changed_dep,rustc_s_rs) =20 quiet_cmd_rustc_ll_rs =3D $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ cmd_rustc_ll_rs =3D $(rust_common_cmd) --emit=3Dllvm-ir=3D$@ $< =20 -$(obj)/%.ll: $(src)/%.rs FORCE +$(obj)/%.ll: $(obj)/%.rs FORCE +$(call if_changed_dep,rustc_ll_rs) =20 # Compile assembler sources (.S) @@ -336,14 +336,14 @@ cmd_gensymtypes_S =3D = \ quiet_cmd_cc_symtypes_S =3D SYM $(quiet_modtag) $@ cmd_cc_symtypes_S =3D $(call cmd_gensymtypes_S,true,$@) >/dev/null =20 -$(obj)/%.symtypes : $(src)/%.S FORCE +$(obj)/%.symtypes : $(obj)/%.S FORCE $(call cmd,cc_symtypes_S) =20 =20 quiet_cmd_cpp_s_S =3D CPP $(quiet_modtag) $@ cmd_cpp_s_S =3D $(CPP) $(a_flags) -o $@ $< =20 -$(obj)/%.s: $(src)/%.S FORCE +$(obj)/%.s: $(obj)/%.S FORCE $(call if_changed_dep,cpp_s_S) =20 quiet_cmd_as_o_S =3D AS $(quiet_modtag) $@ @@ -358,7 +358,7 @@ cmd_gen_symversions_S =3D $(call gen_symversions,S) =20 endif =20 -$(obj)/%.o: $(src)/%.S FORCE +$(obj)/%.o: $(obj)/%.S FORCE $(call if_changed_rule,as_o_S) =20 targets +=3D $(filter-out $(subdir-builtin), $(real-obj-y)) diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 3c17e6ba421c..d35f55e0d141 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -112,7 +112,7 @@ endif quiet_cmd_host-csingle =3D HOSTCC $@ cmd_host-csingle =3D $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) = -o $@ $< \ $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(target-stem)) -$(host-csingle): $(obj)/%: $(src)/%.c FORCE +$(host-csingle): $(obj)/%: $(obj)/%.c FORCE $(call if_changed_dep,host-csingle) =20 # Link an executable based on list of .o files, all plain c @@ -129,7 +129,7 @@ $(call multi_depend, $(host-cmulti), , -objs) # host-cobjs -> .o quiet_cmd_host-cobjs =3D HOSTCC $@ cmd_host-cobjs =3D $(HOSTCC) $(hostc_flags) -c -o $@ $< -$(host-cobjs): $(obj)/%.o: $(src)/%.c FORCE +$(host-cobjs): $(obj)/%.o: $(obj)/%.c FORCE $(call if_changed_dep,host-cobjs) =20 # Link an executable based on list of .o files, a mixture of .c and .cc --=20 2.40.1 From nobody Fri Dec 19 17:00:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA70022324; Sat, 27 Apr 2024 14:55:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714229714; cv=none; b=OqYmBEbmKh2vLb/uq8uDA0ogioOCVY2QIFpkbPCJcjF2MvTY1yWGOMqqzAaWHYUOVxF2A8EKqIJ/YMVX3LB9uPoir3Aa18Pu9vzyWRQOveEq58RcPARvTbRYAszBfVepaLvJUk8+TNE8HWszMdVSFPsA+ASgR5a2p0CDUUYXP5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714229714; c=relaxed/simple; bh=bjyWSDqXIkZFhmwi1HO9jpR/HO+N936RHmccnN32Ao8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rrAP+nNaJ3G847L1D2Qi4Mc4fRQ0cZFUSnZnTXR1P7Cz47x26vYKTxJqoNfo8FdNEFn/9UGckZMy7B6/jkv4NBVWmt3442Yf2i7Jr2wpvHuFX1SwQjRZY0WMFJP76zR1c0N/e731MuyQzjxcrf6N3zcTKmF7dtCkdfKBIGcVcCM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BrBSJz3E; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BrBSJz3E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36586C2BD11; Sat, 27 Apr 2024 14:55:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714229714; bh=bjyWSDqXIkZFhmwi1HO9jpR/HO+N936RHmccnN32Ao8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BrBSJz3EaETgOgBcLFexAqpW4EFbk5ua7x2iMplF8ADzpoMRQDXMykWpWkhpeX+fn yZ9J/nN/FrcvTDwV0YI3sUugXseMl/ICb0wKJ64gWETtROH5a7rYKxrghrrA5WMzDx t4aaMqs2HeCshiCnc6iDBjMZeJhkcUzGYq42WIiv0oFBCOofrnxzDO3nyQm6Ss4Zud 0dE8bZdAR9irWkWev5WV62dDqHcyrGRR4Q3qYcwoWkmlgRs3cFVzAndL8gIUHVgQho iZOoJ5n5yrxs/REgLwYSJEsYPQAqfp2nti3r9agN/2rABkR3s3+TztdJTCGDRt54QQ 2zZRmRj195y6Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Schier Subject: [PATCH v2 4/4] kbuild: use $(src) instead of $(srctree)/$(src) for source directory Date: Sat, 27 Apr 2024 23:55:02 +0900 Message-Id: <20240427145502.2804311-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240427145502.2804311-1-masahiroy@kernel.org> References: <20240427145502.2804311-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Kbuild conventionally uses $(obj)/ for generated files, and $(src)/ for checked-in source files. It is merely a convention without any functional difference. In fact, $(obj) and $(src) are exactly the same, as defined in scripts/Makefile.build: src :=3D $(obj) When the kernel is built in a separate output directory, $(src) does not accurately reflect the source directory location. While Kbuild resolves this discrepancy by specifying VPATH=3D$(srctree) to search for source files, it does not cover all cases. For example, when adding a header search path for local headers, -I$(srctree)/$(src) is typically passed to the compiler. This introduces inconsistency between upstream and downstream Makefiles because $(src) is used instead of $(srctree)/$(src) for the latter. To address this inconsistency, this commit changes the semantics of $(src) so that it always points to the directory in the source tree. Going forward, the variables used in Makefiles will have the following meanings: $(obj) - directory in the object tree $(src) - directory in the source tree (changed by this commit) $(objtree) - the top of the kernel object tree $(srctree) - the top of the kernel source tree Consequently, $(srctree)/$(src) in upstream Makefiles need to be replaced with $(src). Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- Changes in v2: - Rebase Documentation/Makefile | 8 ++++---- Documentation/devicetree/bindings/Makefile | 6 +++--- Documentation/kbuild/makefiles.rst | 12 ++++++------ Makefile | 7 +++++++ arch/arc/boot/dts/Makefile | 3 +-- arch/arm/Kbuild | 2 +- arch/arm/boot/Makefile | 3 +-- arch/arm/mach-s3c/Makefile | 2 +- arch/arm/plat-orion/Makefile | 2 +- arch/arm/tools/Makefile | 2 +- arch/arm64/kernel/vdso/Makefile | 2 +- arch/arm64/kvm/Makefile | 4 ++-- arch/arm64/kvm/hyp/Makefile | 2 +- arch/csky/boot/dts/Makefile | 4 +--- arch/csky/kernel/vdso/Makefile | 2 +- arch/loongarch/kvm/Makefile | 2 +- arch/loongarch/vdso/Makefile | 2 +- arch/mips/kernel/syscalls/Makefile | 2 +- arch/mips/vdso/Makefile | 4 ++-- arch/nios2/boot/dts/Makefile | 3 +-- arch/parisc/kernel/vdso32/Makefile | 2 +- arch/parisc/kernel/vdso64/Makefile | 2 +- arch/powerpc/boot/Makefile | 6 +++--- arch/powerpc/boot/dts/Makefile | 3 +-- arch/powerpc/boot/dts/fsl/Makefile | 3 +-- arch/powerpc/kernel/vdso/Makefile | 4 ++-- arch/riscv/kernel/compat_vdso/Makefile | 2 +- arch/riscv/kernel/vdso/Makefile | 2 +- arch/riscv/kvm/Makefile | 2 +- arch/s390/kernel/syscalls/Makefile | 4 ++-- arch/s390/kernel/vdso32/Makefile | 2 +- arch/s390/kernel/vdso64/Makefile | 2 +- arch/sparc/vdso/Makefile | 2 +- arch/um/kernel/Makefile | 2 +- arch/x86/boot/Makefile | 2 +- arch/x86/entry/vdso/Makefile | 2 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/mm/Makefile | 2 +- arch/x86/um/vdso/Makefile | 2 +- arch/xtensa/boot/dts/Makefile | 3 +-- certs/Makefile | 4 ++-- drivers/Makefile | 5 ----- drivers/crypto/intel/qat/qat_420xx/Makefile | 2 +- drivers/crypto/intel/qat/qat_4xxx/Makefile | 2 +- drivers/crypto/intel/qat/qat_c3xxx/Makefile | 2 +- drivers/crypto/intel/qat/qat_c3xxxvf/Makefile | 2 +- drivers/crypto/intel/qat/qat_c62x/Makefile | 2 +- drivers/crypto/intel/qat/qat_c62xvf/Makefile | 2 +- drivers/crypto/intel/qat/qat_dh895xcc/Makefile | 2 +- drivers/crypto/intel/qat/qat_dh895xccvf/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/arm/display/komeda/Makefile | 4 ++-- drivers/gpu/drm/i915/Makefile | 4 ++-- drivers/gpu/drm/imagination/Makefile | 2 +- drivers/gpu/drm/msm/Makefile | 8 ++++---- drivers/gpu/drm/nouveau/Kbuild | 10 ++++------ drivers/gpu/drm/xe/Makefile | 10 +++++----- drivers/hid/amd-sfh-hid/Makefile | 2 +- drivers/hid/intel-ish-hid/Makefile | 2 +- drivers/md/dm-vdo/Makefile | 2 +- drivers/net/ethernet/aquantia/atlantic/Makefile | 2 +- drivers/net/ethernet/chelsio/libcxgb/Makefile | 2 +- drivers/net/ethernet/fungible/funeth/Makefile | 2 +- drivers/net/ethernet/hisilicon/hns3/Makefile | 2 +- .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 ++-- .../broadcom/brcm80211/brcmfmac/bca/Makefile | 6 +++--- .../broadcom/brcm80211/brcmfmac/cyw/Makefile | 6 +++--- .../broadcom/brcm80211/brcmfmac/wcc/Makefile | 6 +++--- .../wireless/broadcom/brcm80211/brcmsmac/Makefile | 6 +++--- .../wireless/broadcom/brcm80211/brcmutil/Makefile | 2 +- drivers/net/wireless/intel/iwlwifi/dvm/Makefile | 2 +- drivers/net/wireless/intel/iwlwifi/mei/Makefile | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- drivers/net/wireless/intel/iwlwifi/tests/Makefile | 2 +- .../net/wireless/realtek/rtl818x/rtl8180/Makefile | 2 +- .../net/wireless/realtek/rtl818x/rtl8187/Makefile | 2 +- drivers/scsi/aic7xxx/Makefile | 12 ++++++------ drivers/staging/rtl8723bs/Makefile | 2 +- fs/iomap/Makefile | 2 +- fs/unicode/Makefile | 14 +++++++------- fs/xfs/Makefile | 4 ++-- init/Makefile | 2 +- lib/Makefile | 6 +++--- lib/raid6/Makefile | 2 +- net/wireless/Makefile | 2 +- rust/Makefile | 6 +++--- samples/bpf/Makefile | 2 +- samples/hid/Makefile | 2 +- scripts/Kbuild.include | 3 +-- scripts/Makefile.asm-generic | 6 +++--- scripts/Makefile.build | 2 +- scripts/Makefile.clean | 2 +- scripts/Makefile.lib | 10 +++++----- scripts/Makefile.modpost | 2 +- scripts/dtc/Makefile | 6 +++--- scripts/gdb/linux/Makefile | 2 +- scripts/genksyms/Makefile | 4 ++-- scripts/kconfig/Makefile | 8 ++++---- security/tomoyo/Makefile | 2 +- usr/Makefile | 2 +- usr/include/Makefile | 2 +- 102 files changed, 173 insertions(+), 182 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index b68f8c816897..66d15fff2089 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -76,22 +76,22 @@ loop_cmd =3D $(echo-cmd) $(cmd_$(1)) || exit; # * dest folder relative to $(BUILDDIR) and # * cache folder relative to $(BUILDDIR)/.doctrees # $4 dest subfolder e.g. "man" for man pages at userspace-api/media/man -# $5 reST source folder relative to $(srctree)/$(src), +# $5 reST source folder relative to $(src), # e.g. "userspace-api/media" for the linux-tv book-set at ./Documentati= on/userspace-api/media =20 quiet_cmd_sphinx =3D SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) cmd_sphinx =3D $(MAKE) BUILDDIR=3D$(abspath $(BUILDDIR)) $(build)=3D= Documentation/userspace-api/media $2 && \ PYTHONDONTWRITEBYTECODE=3D1 \ - BUILDDIR=3D$(abspath $(BUILDDIR)) SPHINX_CONF=3D$(abspath $(srctree)/$(sr= c)/$5/$(SPHINX_CONF)) \ + BUILDDIR=3D$(abspath $(BUILDDIR)) SPHINX_CONF=3D$(abspath $(src)/$5/$(SPH= INX_CONF)) \ $(PYTHON3) $(srctree)/scripts/jobserver-exec \ $(CONFIG_SHELL) $(srctree)/Documentation/sphinx/parallel-wrapper.sh \ $(SPHINXBUILD) \ -b $2 \ - -c $(abspath $(srctree)/$(src)) \ + -c $(abspath $(src)) \ -d $(abspath $(BUILDDIR)/.doctrees/$3) \ -D version=3D$(KERNELVERSION) -D release=3D$(KERNELRELEASE) \ $(ALLSPHINXOPTS) \ - $(abspath $(srctree)/$(src)/$5) \ + $(abspath $(src)/$5) \ $(abspath $(BUILDDIR)/$3/$4) && \ if [ "x$(DOCS_CSS)" !=3D "x" ]; then \ cp $(if $(patsubst /%,,$(DOCS_CSS)),$(abspath $(srctree)/$(DOCS_CSS)),$(= DOCS_CSS)) $(BUILDDIR)/$3/_static/; \ diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/dev= icetree/bindings/Makefile index 8cdda477987f..bf7d64632e20 100644 --- a/Documentation/devicetree/bindings/Makefile +++ b/Documentation/devicetree/bindings/Makefile @@ -25,7 +25,7 @@ quiet_cmd_extract_ex =3D DTEX $@ $(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE $(call if_changed,extract_ex) =20 -find_all_cmd =3D find $(srctree)/$(src) \( -name '*.yaml' ! \ +find_all_cmd =3D find $(src) \( -name '*.yaml' ! \ -name 'processed-schema*' \) =20 find_cmd =3D $(find_all_cmd) | \ @@ -37,12 +37,12 @@ CHK_DT_EXAMPLES :=3D $(patsubst $(srctree)/%.yaml,%.exa= mple.dtb, $(shell $(find_cm quiet_cmd_yamllint =3D LINT $(src) cmd_yamllint =3D ($(find_cmd) | \ xargs -n200 -P$$(nproc) \ - $(DT_SCHEMA_LINT) -f parsable -c $(srctree)/$(src)/.yamllint >&2) \ + $(DT_SCHEMA_LINT) -f parsable -c $(src)/.yamllint >&2) \ && touch $@ || true =20 quiet_cmd_chk_bindings =3D CHKDT $(src) cmd_chk_bindings =3D ($(find_cmd) | \ - xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(srctree)/$(src)) \ + xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(src)) \ && touch $@ || true =20 quiet_cmd_mk_schema =3D SCHEMA $@ diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/make= files.rst index ad118b7a1806..991ce6081e35 100644 --- a/Documentation/kbuild/makefiles.rst +++ b/Documentation/kbuild/makefiles.rst @@ -346,7 +346,7 @@ ccflags-y, asflags-y and ldflags-y Example:: =20 #arch/cris/boot/compressed/Makefile - ldflags-y +=3D -T $(srctree)/$(src)/decompress_$(arch-y).lds + ldflags-y +=3D -T $(src)/decompress_$(arch-y).lds =20 subdir-ccflags-y, subdir-asflags-y The two flags listed above are similar to ccflags-y and asflags-y. @@ -426,14 +426,14 @@ path to prerequisite files and target files. Two variables are used when defining custom rules: =20 $(src) - $(src) is a relative path which points to the directory - where the Makefile is located. Always use $(src) when + $(src) is the directory where the Makefile is located. Always use $(src)= when referring to files located in the src tree. =20 $(obj) - $(obj) is a relative path which points to the directory - where the target is saved. Always use $(obj) when - referring to generated files. + $(obj) is the directory where the target is saved. Always use $(obj) when + referring to generated files. Use $(obj) for pattern rules that need to = work + for both generated files and real sources (VPATH will help to find the + prerequisites not only in the object tree but also in the source tree). =20 Example:: =20 diff --git a/Makefile b/Makefile index 949b73bf6d0d..a1c19979e13e 100644 --- a/Makefile +++ b/Makefile @@ -263,7 +263,14 @@ srctree :=3D $(abs_srctree) endif =20 objtree :=3D . + +VPATH :=3D + +ifeq ($(KBUILD_EXTMOD),) +ifdef building_out_of_srctree VPATH :=3D $(srctree) +endif +endif =20 export building_out_of_srctree srctree objtree VPATH =20 diff --git a/arch/arc/boot/dts/Makefile b/arch/arc/boot/dts/Makefile index 4237aa5de3a3..48704dfdf75c 100644 --- a/arch/arc/boot/dts/Makefile +++ b/arch/arc/boot/dts/Makefile @@ -10,8 +10,7 @@ obj-y +=3D $(builtindtb-y).dtb.o dtb-y :=3D $(builtindtb-y).dtb =20 # for CONFIG_OF_ALL_DTBS test -dtstree :=3D $(srctree)/$(src) -dtb- :=3D $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) +dtb- :=3D $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts)) =20 # board-specific dtc flags DTC_FLAGS_hsdk +=3D --pad 20 diff --git a/arch/arm/Kbuild b/arch/arm/Kbuild index b506622e7e23..69de6b6243c7 100644 --- a/arch/arm/Kbuild +++ b/arch/arm/Kbuild @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_FPE_NWFPE) +=3D nwfpe/ # Put arch/arm/fastfpe/ to use this. -obj-$(CONFIG_FPE_FASTFPE) +=3D $(patsubst $(srctree)/$(src)/%,%,$(wildcard= $(srctree)/$(src)/fastfpe/)) +obj-$(CONFIG_FPE_FASTFPE) +=3D $(patsubst $(src)/%,%,$(wildcard $(src)/fas= tfpe/)) obj-$(CONFIG_VFP) +=3D vfp/ obj-$(CONFIG_XEN) +=3D xen/ obj-$(CONFIG_VDSO) +=3D vdso/ diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index abd6a2889fd0..ba9b9a802469 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -25,8 +25,7 @@ targets :=3D Image zImage xipImage bootpImage uImage =20 ifeq ($(CONFIG_XIP_KERNEL),y) =20 -cmd_deflate_xip_data =3D $(CONFIG_SHELL) -c \ - '$(srctree)/$(src)/deflate_xip_data.sh $< $@' +cmd_deflate_xip_data =3D $(CONFIG_SHELL) -c '$(src)/deflate_xip_data.sh $<= $@' =20 ifeq ($(CONFIG_XIP_DEFLATED_DATA),y) quiet_cmd_mkxip =3D XIPZ $@ diff --git a/arch/arm/mach-s3c/Makefile b/arch/arm/mach-s3c/Makefile index 713827bef831..988c49672715 100644 --- a/arch/arm/mach-s3c/Makefile +++ b/arch/arm/mach-s3c/Makefile @@ -2,7 +2,7 @@ # # Copyright 2009 Simtec Electronics =20 -include $(srctree)/$(src)/Makefile.s3c64xx +include $(src)/Makefile.s3c64xx =20 # Objects we always build independent of SoC choice =20 diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile index 830b0be038c6..e8c7580df8ca 100644 --- a/arch/arm/plat-orion/Makefile +++ b/arch/arm/plat-orion/Makefile @@ -2,7 +2,7 @@ # # Makefile for the linux kernel. # -ccflags-y :=3D -I$(srctree)/$(src)/include +ccflags-y :=3D -I$(src)/include =20 orion-gpio-$(CONFIG_GPIOLIB) +=3D gpio.o obj-$(CONFIG_PLAT_ORION_LEGACY) +=3D irq.o pcie.o time.o common.o mpp.o diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile index 81f13bdf32f2..28b6da8ac5f6 100644 --- a/arch/arm/tools/Makefile +++ b/arch/arm/tools/Makefile @@ -9,7 +9,7 @@ gen :=3D arch/$(ARCH)/include/generated kapi :=3D $(gen)/asm uapi :=3D $(gen)/uapi/asm syshdr :=3D $(srctree)/scripts/syscallhdr.sh -sysnr :=3D $(srctree)/$(src)/syscallnr.sh +sysnr :=3D $(src)/syscallnr.sh systbl :=3D $(srctree)/scripts/syscalltbl.sh syscall :=3D $(src)/syscall.tbl =20 diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makef= ile index 8818287f1095..53e86d3bc159 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -68,7 +68,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) =20 # Generate VDSO offsets using helper script -gen-vdsosym :=3D $(srctree)/$(src)/gen_vdso_offsets.sh +gen-vdsosym :=3D $(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym =3D VDSOSYM $@ cmd_vdsosym =3D $(NM) $< | $(gen-vdsosym) | LC_ALL=3DC sort > $@ =20 diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index c0c050e53157..ab474d444cef 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -3,7 +3,7 @@ # Makefile for Kernel-based Virtual Machine module # =20 -ccflags-y +=3D -I $(srctree)/$(src) +ccflags-y +=3D -I $(src) =20 include $(srctree)/virt/kvm/Makefile.kvm =20 @@ -30,7 +30,7 @@ define rule_gen_hyp_constants $(call filechk,offsets,__HYP_CONSTANTS_H__) endef =20 -CFLAGS_hyp-constants.o =3D -I $(srctree)/$(src)/hyp/include +CFLAGS_hyp-constants.o =3D -I $(src)/hyp/include $(obj)/hyp-constants.s: $(src)/hyp/hyp-constants.c FORCE $(call if_changed_dep,cc_s_c) =20 diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index a38dea6186c9..d61e44642f98 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -3,7 +3,7 @@ # Makefile for Kernel-based Virtual Machine module, HYP part # =20 -incdir :=3D $(srctree)/$(src)/include +incdir :=3D $(src)/include subdir-asflags-y :=3D -I$(incdir) subdir-ccflags-y :=3D -I$(incdir) =20 diff --git a/arch/csky/boot/dts/Makefile b/arch/csky/boot/dts/Makefile index 5f1f55e911ad..aabffc1912e8 100644 --- a/arch/csky/boot/dts/Makefile +++ b/arch/csky/boot/dts/Makefile @@ -1,4 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -dtstree :=3D $(srctree)/$(src) - -dtb-y :=3D $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) +dtb-y :=3D $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts)) diff --git a/arch/csky/kernel/vdso/Makefile b/arch/csky/kernel/vdso/Makefile index 24a01c22293e..e79a725f5075 100644 --- a/arch/csky/kernel/vdso/Makefile +++ b/arch/csky/kernel/vdso/Makefile @@ -57,4 +57,4 @@ quiet_cmd_vdsold =3D VDSOLD $@ # Extracts symbol offsets from the VDSO, converting them into an assembly = file # that contains the same symbols at the same offsets. quiet_cmd_so2s =3D SO2S $@ - cmd_so2s =3D $(NM) -D $< | $(srctree)/$(src)/so2s.sh > $@ + cmd_so2s =3D $(NM) -D $< | $(src)/so2s.sh > $@ diff --git a/arch/loongarch/kvm/Makefile b/arch/loongarch/kvm/Makefile index 244467d7792a..b2f4cbe01ae8 100644 --- a/arch/loongarch/kvm/Makefile +++ b/arch/loongarch/kvm/Makefile @@ -3,7 +3,7 @@ # Makefile for LoongArch KVM support # =20 -ccflags-y +=3D -I $(srctree)/$(src) +ccflags-y +=3D -I $(src) =20 include $(srctree)/virt/kvm/Makefile.kvm =20 diff --git a/arch/loongarch/vdso/Makefile b/arch/loongarch/vdso/Makefile index 75c6726382c3..cdfc4c793e2c 100644 --- a/arch/loongarch/vdso/Makefile +++ b/arch/loongarch/vdso/Makefile @@ -52,7 +52,7 @@ quiet_cmd_vdsoas_o_S =3D AS $@ cmd_vdsoas_o_S =3D $(CC) $(a_flags) -c -o $@ $< =20 # Generate VDSO offsets using helper script -gen-vdsosym :=3D $(srctree)/$(src)/gen_vdso_offsets.sh +gen-vdsosym :=3D $(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym =3D VDSOSYM $@ cmd_vdsosym =3D $(NM) $< | $(gen-vdsosym) | LC_ALL=3DC sort > $@ =20 diff --git a/arch/mips/kernel/syscalls/Makefile b/arch/mips/kernel/syscalls= /Makefile index e6b21de65cca..56f6f093bb88 100644 --- a/arch/mips/kernel/syscalls/Makefile +++ b/arch/mips/kernel/syscalls/Makefile @@ -5,7 +5,7 @@ uapi :=3D arch/$(SRCARCH)/include/generated/uapi/asm $(shell mkdir -p $(uapi) $(kapi)) =20 syshdr :=3D $(srctree)/scripts/syscallhdr.sh -sysnr :=3D $(srctree)/$(src)/syscallnr.sh +sysnr :=3D $(src)/syscallnr.sh systbl :=3D $(srctree)/scripts/syscalltbl.sh =20 quiet_cmd_syshdr =3D SYSHDR $@ diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index eb56581f6d73..40b839e91806 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile @@ -43,8 +43,8 @@ CFLAGS_vgettimeofday.o =3D -include $(c-gettimeofday-y) # config-n32-o32-env.c prepares the environment to build a 32bit vDSO # library on a 64bit kernel. # Note: Needs to be included before than the generic library. -CFLAGS_vgettimeofday-o32.o =3D -include $(srctree)/$(src)/config-n32-o32-e= nv.c -include $(c-gettimeofday-y) -CFLAGS_vgettimeofday-n32.o =3D -include $(srctree)/$(src)/config-n32-o32-e= nv.c -include $(c-gettimeofday-y) +CFLAGS_vgettimeofday-o32.o =3D -include $(src)/config-n32-o32-env.c -inclu= de $(c-gettimeofday-y) +CFLAGS_vgettimeofday-n32.o =3D -include $(src)/config-n32-o32-env.c -inclu= de $(c-gettimeofday-y) endif =20 CFLAGS_REMOVE_vgettimeofday.o =3D $(CC_FLAGS_FTRACE) diff --git a/arch/nios2/boot/dts/Makefile b/arch/nios2/boot/dts/Makefile index e9e31bb40df8..1a2e8996bec7 100644 --- a/arch/nios2/boot/dts/Makefile +++ b/arch/nios2/boot/dts/Makefile @@ -2,5 +2,4 @@ =20 obj-y :=3D $(patsubst %.dts,%.dtb.o,$(CONFIG_NIOS2_DTB_SOURCE)) =20 -dtstree :=3D $(srctree)/$(src) -dtb-$(CONFIG_OF_ALL_DTBS) :=3D $(patsubst $(dtstree)/%.dts,%.dtb, $(wildca= rd $(dtstree)/*.dts)) +dtb-$(CONFIG_OF_ALL_DTBS) :=3D $(patsubst $(src)/%.dts,%.dtb, $(wildcard $= (src)/*.dts)) diff --git a/arch/parisc/kernel/vdso32/Makefile b/arch/parisc/kernel/vdso32= /Makefile index 60dc708a0f80..1350d50c6306 100644 --- a/arch/parisc/kernel/vdso32/Makefile +++ b/arch/parisc/kernel/vdso32/Makefile @@ -40,7 +40,7 @@ quiet_cmd_vdso32as =3D VDSO32A $@ cmd_vdso32as =3D $(CROSS32CC) $(a_flags) -c -o $@ $< =20 # Generate VDSO offsets using helper script -gen-vdsosym :=3D $(srctree)/$(src)/gen_vdso_offsets.sh +gen-vdsosym :=3D $(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym =3D VDSOSYM $@ cmd_vdsosym =3D $(NM) $< | $(gen-vdsosym) | LC_ALL=3DC sort > $@ =20 diff --git a/arch/parisc/kernel/vdso64/Makefile b/arch/parisc/kernel/vdso64= /Makefile index 0982f3099ae2..0b1c1cc4c2c7 100644 --- a/arch/parisc/kernel/vdso64/Makefile +++ b/arch/parisc/kernel/vdso64/Makefile @@ -40,7 +40,7 @@ quiet_cmd_vdso64as =3D VDSO64A $@ cmd_vdso64as =3D $(CC) $(a_flags) -c -o $@ $< =20 # Generate VDSO offsets using helper script -gen-vdsosym :=3D $(srctree)/$(src)/gen_vdso_offsets.sh +gen-vdsosym :=3D $(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym =3D VDSOSYM $@ cmd_vdsosym =3D $(NM) $< | $(gen-vdsosym) | LC_ALL=3DC sort > $@ =20 diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 968aee2025b8..a0b3b5cc14cd 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -218,7 +218,7 @@ $(addprefix $(obj)/,$(libfdt) $(libfdtheader)): $(obj)/= %: $(srctree)/scripts/dtc $(obj)/empty.c: $(Q)touch $@ =20 -$(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)= /%.S +$(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(src)/%.S $(Q)cp $< $@ =20 clean-files :=3D $(zlib-) $(zlibheader-) $(zliblinuxheader-) \ @@ -252,9 +252,9 @@ targets +=3D $(patsubst $(obj)/%,%,$(obj-boot) wrapper= .a) zImage.lds extra-y :=3D $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds =20 -dtstree :=3D $(srctree)/$(src)/dts +dtstree :=3D $(src)/dts =20 -wrapper :=3D$(srctree)/$(src)/wrapper +wrapper :=3D $(src)/wrapper wrapperbits :=3D $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree) \ $(wrapper) FORCE =20 diff --git a/arch/powerpc/boot/dts/Makefile b/arch/powerpc/boot/dts/Makefile index fb335d05aae8..0cd0d8558b47 100644 --- a/arch/powerpc/boot/dts/Makefile +++ b/arch/powerpc/boot/dts/Makefile @@ -2,5 +2,4 @@ =20 subdir-y +=3D fsl =20 -dtstree :=3D $(srctree)/$(src) -dtb-$(CONFIG_OF_ALL_DTBS) :=3D $(patsubst $(dtstree)/%.dts,%.dtb, $(wildca= rd $(dtstree)/*.dts)) +dtb-$(CONFIG_OF_ALL_DTBS) :=3D $(patsubst $(src)/%.dts,%.dtb, $(wildcard $= (src)/*.dts)) diff --git a/arch/powerpc/boot/dts/fsl/Makefile b/arch/powerpc/boot/dts/fsl= /Makefile index 3bae982641e9..d3ecdf14bc42 100644 --- a/arch/powerpc/boot/dts/fsl/Makefile +++ b/arch/powerpc/boot/dts/fsl/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 =20 -dtstree :=3D $(srctree)/$(src) -dtb-$(CONFIG_OF_ALL_DTBS) :=3D $(patsubst $(dtstree)/%.dts,%.dtb, $(wildca= rd $(dtstree)/*.dts)) +dtb-$(CONFIG_OF_ALL_DTBS) :=3D $(patsubst $(src)/%.dts,%.dtb, $(wildcard $= (src)/*.dts)) diff --git a/arch/powerpc/kernel/vdso/Makefile b/arch/powerpc/kernel/vdso/M= akefile index a14eab366993..7d66b6e07993 100644 --- a/arch/powerpc/kernel/vdso/Makefile +++ b/arch/powerpc/kernel/vdso/Makefile @@ -90,10 +90,10 @@ $(obj)/vgettimeofday-64.o: %-64.o: %.c FORCE $(call if_changed_dep,cc_o_c) =20 # Generate VDSO offsets using helper script -gen-vdso32sym :=3D $(srctree)/$(src)/gen_vdso32_offsets.sh +gen-vdso32sym :=3D $(src)/gen_vdso32_offsets.sh quiet_cmd_vdso32sym =3D VDSO32SYM $@ cmd_vdso32sym =3D $(NM) $< | $(gen-vdso32sym) | LC_ALL=3DC sort > $@ -gen-vdso64sym :=3D $(srctree)/$(src)/gen_vdso64_offsets.sh +gen-vdso64sym :=3D $(src)/gen_vdso64_offsets.sh quiet_cmd_vdso64sym =3D VDSO64SYM $@ cmd_vdso64sym =3D $(NM) $< | $(gen-vdso64sym) | LC_ALL=3DC sort > $@ =20 diff --git a/arch/riscv/kernel/compat_vdso/Makefile b/arch/riscv/kernel/com= pat_vdso/Makefile index 3df4cb788c1f..362208dfa7ee 100644 --- a/arch/riscv/kernel/compat_vdso/Makefile +++ b/arch/riscv/kernel/compat_vdso/Makefile @@ -58,7 +58,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) =20 # Generate VDSO offsets using helper script -gen-compat_vdsosym :=3D $(srctree)/$(src)/gen_compat_vdso_offsets.sh +gen-compat_vdsosym :=3D $(src)/gen_compat_vdso_offsets.sh quiet_cmd_compat_vdsosym =3D VDSOSYM $@ cmd_compat_vdsosym =3D $(NM) $< | $(gen-compat_vdsosym) | LC_ALL=3DC sort= > $@ =20 diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makef= ile index 272c431ac5b9..25f0ee629971 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -60,7 +60,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) =20 # Generate VDSO offsets using helper script -gen-vdsosym :=3D $(srctree)/$(src)/gen_vdso_offsets.sh +gen-vdsosym :=3D $(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym =3D VDSOSYM $@ cmd_vdsosym =3D $(NM) $< | $(gen-vdsosym) | LC_ALL=3DC sort > $@ =20 diff --git a/arch/riscv/kvm/Makefile b/arch/riscv/kvm/Makefile index c9646521f113..c2cacfbc06a0 100644 --- a/arch/riscv/kvm/Makefile +++ b/arch/riscv/kvm/Makefile @@ -3,7 +3,7 @@ # Makefile for RISC-V KVM support # =20 -ccflags-y +=3D -I $(srctree)/$(src) +ccflags-y +=3D -I $(src) =20 include $(srctree)/virt/kvm/Makefile.kvm =20 diff --git a/arch/s390/kernel/syscalls/Makefile b/arch/s390/kernel/syscalls= /Makefile index fb85e797946d..1bb78b9468e8 100644 --- a/arch/s390/kernel/syscalls/Makefile +++ b/arch/s390/kernel/syscalls/Makefile @@ -4,8 +4,8 @@ gen :=3D arch/$(ARCH)/include/generated kapi :=3D $(gen)/asm uapi :=3D $(gen)/uapi/asm =20 -syscall :=3D $(srctree)/$(src)/syscall.tbl -systbl :=3D $(srctree)/$(src)/syscalltbl +syscall :=3D $(src)/syscall.tbl +systbl :=3D $(src)/syscalltbl =20 gen-y :=3D $(kapi)/syscall_table.h kapi-hdrs-y :=3D $(kapi)/unistd_nr.h diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Mak= efile index 70e9949c2612..c263b91adfb1 100644 --- a/arch/s390/kernel/vdso32/Makefile +++ b/arch/s390/kernel/vdso32/Makefile @@ -62,7 +62,7 @@ quiet_cmd_vdso32cc =3D VDSO32C $@ cmd_vdso32cc =3D $(CC) $(c_flags) -c -o $@ $< =20 # Generate VDSO offsets using helper script -gen-vdsosym :=3D $(srctree)/$(src)/gen_vdso_offsets.sh +gen-vdsosym :=3D $(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym =3D VDSOSYM $@ cmd_vdsosym =3D $(NM) $< | $(gen-vdsosym) | LC_ALL=3DC sort > $@ =20 diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Mak= efile index 2b3617b6d162..9566bed7d5b2 100644 --- a/arch/s390/kernel/vdso64/Makefile +++ b/arch/s390/kernel/vdso64/Makefile @@ -72,7 +72,7 @@ quiet_cmd_vdso64cc =3D VDSO64C $@ cmd_vdso64cc =3D $(CC) $(c_flags) -c -o $@ $< =20 # Generate VDSO offsets using helper script -gen-vdsosym :=3D $(srctree)/$(src)/gen_vdso_offsets.sh +gen-vdsosym :=3D $(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym =3D VDSOSYM $@ cmd_vdsosym =3D $(NM) $< | $(gen-vdsosym) | LC_ALL=3DC sort > $@ =20 diff --git a/arch/sparc/vdso/Makefile b/arch/sparc/vdso/Makefile index e8aef2c8ae99..0fe134abbcf1 100644 --- a/arch/sparc/vdso/Makefile +++ b/arch/sparc/vdso/Makefile @@ -103,7 +103,7 @@ quiet_cmd_vdso =3D VDSO $@ cmd_vdso =3D $(LD) -nostdlib -o $@ \ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -T $(filter %.lds,$^) $(filter %.o,$^) && \ - sh $(srctree)/$(src)/checkundef.sh '$(OBJDUMP)' '$@' + sh $(src)/checkundef.sh '$(OBJDUMP)' '$@' =20 VDSO_LDFLAGS =3D -shared --hash-style=3Dboth --build-id=3Dsha1 -Bsymbolic GCOV_PROFILE :=3D n diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile index 811188be954c..f8567b933ffa 100644 --- a/arch/um/kernel/Makefile +++ b/arch/um/kernel/Makefile @@ -47,7 +47,7 @@ $(obj)/config.c: $(src)/config.c.in $(obj)/config.tmp FOR= CE $(call if_changed,quote2) =20 quiet_cmd_mkcapflags =3D MKCAP $@ - cmd_mkcapflags =3D $(CONFIG_SHELL) $(srctree)/$(src)/../../x86/kerne= l/cpu/mkcapflags.sh $@ $^ + cmd_mkcapflags =3D $(CONFIG_SHELL) $(src)/../../x86/kernel/cpu/mkcap= flags.sh $@ $^ =20 cpufeature =3D $(src)/../../x86/include/asm/cpufeatures.h vmxfeature =3D $(src)/../../x86/include/asm/vmxfeatures.h diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 3cece19b7473..29cda98c65f8 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -129,7 +129,7 @@ targets +=3D mtools.conf # genimage.sh requires bash, but it also has a bunch of other # external dependencies. quiet_cmd_genimage =3D GENIMAGE $3 -cmd_genimage =3D $(BASH) $(srctree)/$(src)/genimage.sh $2 $3 $(obj)/bzImag= e \ + cmd_genimage =3D $(BASH) $(src)/genimage.sh $2 $3 $(obj)/bzImage \ $(obj)/mtools.conf '$(FDARGS)' $(FDINITRD) =20 PHONY +=3D bzdisk fdimage fdimage144 fdimage288 hdimage isoimage diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 3d64bcc403cf..c003452dba8c 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -176,7 +176,7 @@ quiet_cmd_vdso =3D VDSO $@ cmd_vdso =3D $(LD) -o $@ \ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -T $(filter %.lds,$^) $(filter %.o,$^) && \ - sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' + sh $(src)/checkundef.sh '$(NM)' '$@' =20 VDSO_LDFLAGS =3D -shared --hash-style=3Dboth --build-id=3Dsha1 \ $(call ld-option, --eh-frame-hdr) -Bsymbolic -z noexecstack diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 74077694da7d..8a9fc9ec69d3 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -40,7 +40,7 @@ KMSAN_SANITIZE_sev.o :=3D n KCOV_INSTRUMENT_head$(BITS).o :=3D n KCOV_INSTRUMENT_sev.o :=3D n =20 -CFLAGS_irq.o :=3D -I $(srctree)/$(src)/../include/asm/trace +CFLAGS_irq.o :=3D -I $(src)/../include/asm/trace =20 obj-y +=3D head_$(BITS).o obj-y +=3D head$(BITS).o diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index eb4dbcdf41f1..a02bba0ed6b9 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -60,7 +60,7 @@ obj-$(CONFIG_ACRN_GUEST) +=3D acrn.o obj-$(CONFIG_DEBUG_FS) +=3D debugfs.o =20 quiet_cmd_mkcapflags =3D MKCAP $@ - cmd_mkcapflags =3D $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $= @ $^ + cmd_mkcapflags =3D $(CONFIG_SHELL) $(src)/mkcapflags.sh $@ $^ =20 cpufeature =3D $(src)/../../include/asm/cpufeatures.h vmxfeature =3D $(src)/../../include/asm/vmxfeatures.h diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 428048e73bd2..8d3a00e5c528 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -34,7 +34,7 @@ obj-y +=3D pat/ CFLAGS_physaddr.o :=3D -fno-stack-protector CFLAGS_mem_encrypt_identity.o :=3D -fno-stack-protector =20 -CFLAGS_fault.o :=3D -I $(srctree)/$(src)/../include/asm/trace +CFLAGS_fault.o :=3D -I $(src)/../include/asm/trace =20 obj-$(CONFIG_X86_32) +=3D pgtable_32.o iomap_32.o =20 diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile index b86d634730b2..2303fa59971c 100644 --- a/arch/x86/um/vdso/Makefile +++ b/arch/x86/um/vdso/Makefile @@ -63,7 +63,7 @@ quiet_cmd_vdso =3D VDSO $@ cmd_vdso =3D $(CC) -nostdlib -o $@ \ $(CC_FLAGS_LTO) $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^= F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ - sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' + sh $(src)/checkundef.sh '$(NM)' '$@' =20 VDSO_LDFLAGS =3D -fPIC -shared -Wl,--hash-style=3Dsysv -z noexecstack GCOV_PROFILE :=3D n diff --git a/arch/xtensa/boot/dts/Makefile b/arch/xtensa/boot/dts/Makefile index 720628c0d8b9..d6408c16d74e 100644 --- a/arch/xtensa/boot/dts/Makefile +++ b/arch/xtensa/boot/dts/Makefile @@ -10,5 +10,4 @@ obj-$(CONFIG_OF) +=3D $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_SOURCE)) =20 # for CONFIG_OF_ALL_DTBS test -dtstree :=3D $(srctree)/$(src) -dtb- :=3D $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) +dtb- :=3D $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts)) diff --git a/certs/Makefile b/certs/Makefile index 799ad7b9e68a..1094e3860c2a 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -13,7 +13,7 @@ CFLAGS_blacklist_hashes.o :=3D -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list =3D GEN $@ cmd_check_and_copy_blacklist_hash_list =3D \ $(if $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST), \ - $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BL= ACKLIST_HASH_LIST) >&2; \ + $(AWK) -f $(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HAS= H_LIST) >&2; \ { cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST); echo $(comma) NULL; } > $@, \ echo NULL > $@) =20 @@ -55,7 +55,7 @@ $(obj)/signing_key.pem: $(obj)/x509.genkey FORCE targets +=3D signing_key.pem =20 quiet_cmd_copy_x509_config =3D COPY $@ - cmd_copy_x509_config =3D cat $(srctree)/$(src)/default_x509.genkey >= $@ + cmd_copy_x509_config =3D cat $(src)/default_x509.genkey > $@ =20 # You can provide your own config file. If not present, copy the default o= ne. $(obj)/x509.genkey: diff --git a/drivers/Makefile b/drivers/Makefile index 3bf5cab4b451..fe9ceb0d2288 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -6,11 +6,6 @@ # Rewritten to use lists instead of if-statements. # =20 -# Some driver Makefiles miss $(srctree)/ for include directive. -ifdef building_out_of_srctree -MAKEFLAGS +=3D --include-dir=3D$(srctree) -endif - obj-y +=3D cache/ obj-y +=3D irqchip/ obj-y +=3D bus/ diff --git a/drivers/crypto/intel/qat/qat_420xx/Makefile b/drivers/crypto/i= ntel/qat/qat_420xx/Makefile index a90fbe00b3c8..45728659fbc4 100644 --- a/drivers/crypto/intel/qat/qat_420xx/Makefile +++ b/drivers/crypto/intel/qat/qat_420xx/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y :=3D -I $(srctree)/$(src)/../qat_common +ccflags-y :=3D -I $(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_420XX) +=3D qat_420xx.o qat_420xx-objs :=3D adf_drv.o adf_420xx_hw_data.o diff --git a/drivers/crypto/intel/qat/qat_4xxx/Makefile b/drivers/crypto/in= tel/qat/qat_4xxx/Makefile index ff9c8b5897ea..9ba202079a22 100644 --- a/drivers/crypto/intel/qat/qat_4xxx/Makefile +++ b/drivers/crypto/intel/qat/qat_4xxx/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only) -ccflags-y :=3D -I $(srctree)/$(src)/../qat_common +ccflags-y :=3D -I $(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_4XXX) +=3D qat_4xxx.o qat_4xxx-objs :=3D adf_drv.o adf_4xxx_hw_data.o diff --git a/drivers/crypto/intel/qat/qat_c3xxx/Makefile b/drivers/crypto/i= ntel/qat/qat_c3xxx/Makefile index 92ef416ccc78..7a06ad519bfc 100644 --- a/drivers/crypto/intel/qat/qat_c3xxx/Makefile +++ b/drivers/crypto/intel/qat/qat_c3xxx/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y :=3D -I $(srctree)/$(src)/../qat_common +ccflags-y :=3D -I $(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_C3XXX) +=3D qat_c3xxx.o qat_c3xxx-objs :=3D adf_drv.o adf_c3xxx_hw_data.o diff --git a/drivers/crypto/intel/qat/qat_c3xxxvf/Makefile b/drivers/crypto= /intel/qat/qat_c3xxxvf/Makefile index b6d76825a92c..7ef633058c4f 100644 --- a/drivers/crypto/intel/qat/qat_c3xxxvf/Makefile +++ b/drivers/crypto/intel/qat/qat_c3xxxvf/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y :=3D -I $(srctree)/$(src)/../qat_common +ccflags-y :=3D -I $(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_C3XXXVF) +=3D qat_c3xxxvf.o qat_c3xxxvf-objs :=3D adf_drv.o adf_c3xxxvf_hw_data.o diff --git a/drivers/crypto/intel/qat/qat_c62x/Makefile b/drivers/crypto/in= tel/qat/qat_c62x/Makefile index d581f7c87d6c..cc9255b3b198 100644 --- a/drivers/crypto/intel/qat/qat_c62x/Makefile +++ b/drivers/crypto/intel/qat/qat_c62x/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y :=3D -I $(srctree)/$(src)/../qat_common +ccflags-y :=3D -I $(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_C62X) +=3D qat_c62x.o qat_c62x-objs :=3D adf_drv.o adf_c62x_hw_data.o diff --git a/drivers/crypto/intel/qat/qat_c62xvf/Makefile b/drivers/crypto/= intel/qat/qat_c62xvf/Makefile index 446c3d638605..256786662d60 100644 --- a/drivers/crypto/intel/qat/qat_c62xvf/Makefile +++ b/drivers/crypto/intel/qat/qat_c62xvf/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y :=3D -I $(srctree)/$(src)/../qat_common +ccflags-y :=3D -I $(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_C62XVF) +=3D qat_c62xvf.o qat_c62xvf-objs :=3D adf_drv.o adf_c62xvf_hw_data.o diff --git a/drivers/crypto/intel/qat/qat_dh895xcc/Makefile b/drivers/crypt= o/intel/qat/qat_dh895xcc/Makefile index 38d6f8e1624a..cfd3bd757715 100644 --- a/drivers/crypto/intel/qat/qat_dh895xcc/Makefile +++ b/drivers/crypto/intel/qat/qat_dh895xcc/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y :=3D -I $(srctree)/$(src)/../qat_common +ccflags-y :=3D -I $(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_DH895xCC) +=3D qat_dh895xcc.o qat_dh895xcc-objs :=3D adf_drv.o adf_dh895xcc_hw_data.o diff --git a/drivers/crypto/intel/qat/qat_dh895xccvf/Makefile b/drivers/cry= pto/intel/qat/qat_dh895xccvf/Makefile index 0153c85ce743..64b54e92b2b4 100644 --- a/drivers/crypto/intel/qat/qat_dh895xccvf/Makefile +++ b/drivers/crypto/intel/qat/qat_dh895xccvf/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y :=3D -I $(srctree)/$(src)/../qat_common +ccflags-y :=3D -I $(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_DH895xCCVF) +=3D qat_dh895xccvf.o qat_dh895xccvf-objs :=3D adf_drv.o adf_dh895xccvf_hw_data.o diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdg= pu/Makefile index 4536c8ad0e11..e568e89283c0 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -23,7 +23,7 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. =20 -FULL_AMD_PATH=3D$(srctree)/$(src)/.. +FULL_AMD_PATH=3D$(src)/.. DISPLAY_FOLDER_NAME=3Ddisplay FULL_AMD_DISPLAY_PATH =3D $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME) =20 diff --git a/drivers/gpu/drm/arm/display/komeda/Makefile b/drivers/gpu/drm/= arm/display/komeda/Makefile index 1931a7fa1a14..cf5287fcbbc2 100644 --- a/drivers/gpu/drm/arm/display/komeda/Makefile +++ b/drivers/gpu/drm/arm/display/komeda/Makefile @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 =20 ccflags-y :=3D \ - -I $(srctree)/$(src)/../include \ - -I $(srctree)/$(src) + -I $(src)/../include \ + -I $(src) =20 komeda-y :=3D \ komeda_drv.o \ diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index fba73c38e235..2220448ed07f 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -41,7 +41,7 @@ CFLAGS_display/intel_fbdev.o =3D -Wno-override-init # drivers. Define I915 when building i915. subdir-ccflags-y +=3D -DI915 =20 -subdir-ccflags-y +=3D -I$(srctree)/$(src) +subdir-ccflags-y +=3D -I$(src) =20 # Please keep these build lists sorted! =20 @@ -434,7 +434,7 @@ no-header-test :=3D \ =20 always-$(CONFIG_DRM_I915_WERROR) +=3D \ $(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \ - $(shell cd $(srctree)/$(src) && find * -name '*.h'))) + $(shell cd $(src) && find * -name '*.h'))) =20 quiet_cmd_hdrtest =3D HDRTEST $(patsubst %.hdrtest,%.h,$@) cmd_hdrtest =3D $(CC) $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o= /dev/null -x c /dev/null -include $<; \ diff --git a/drivers/gpu/drm/imagination/Makefile b/drivers/gpu/drm/imagina= tion/Makefile index ec6db8e9b403..9bc6a3884c22 100644 --- a/drivers/gpu/drm/imagination/Makefile +++ b/drivers/gpu/drm/imagination/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only OR MIT # Copyright (c) 2023 Imagination Technologies Ltd. =20 -subdir-ccflags-y :=3D -I$(srctree)/$(src) +subdir-ccflags-y :=3D -I$(src) =20 powervr-y :=3D \ pvr_ccb.o \ diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index b21ae2880c71..b8cc007fc1b9 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y :=3D -I $(srctree)/$(src) -ccflags-y +=3D -I $(srctree)/$(src)/disp/dpu1 -ccflags-$(CONFIG_DRM_MSM_DSI) +=3D -I $(srctree)/$(src)/dsi -ccflags-$(CONFIG_DRM_MSM_DP) +=3D -I $(srctree)/$(src)/dp +ccflags-y :=3D -I $(src) +ccflags-y +=3D -I $(src)/disp/dpu1 +ccflags-$(CONFIG_DRM_MSM_DSI) +=3D -I $(src)/dsi +ccflags-$(CONFIG_DRM_MSM_DP) +=3D -I $(src)/dp =20 msm-y :=3D \ adreno/adreno_device.o \ diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild index cf6b3a80c0c8..c32c01827c1d 100644 --- a/drivers/gpu/drm/nouveau/Kbuild +++ b/drivers/gpu/drm/nouveau/Kbuild @@ -1,10 +1,8 @@ -NOUVEAU_PATH ?=3D $(srctree) - # SPDX-License-Identifier: MIT -ccflags-y +=3D -I $(NOUVEAU_PATH)/$(src)/include -ccflags-y +=3D -I $(NOUVEAU_PATH)/$(src)/include/nvkm -ccflags-y +=3D -I $(NOUVEAU_PATH)/$(src)/nvkm -ccflags-y +=3D -I $(NOUVEAU_PATH)/$(src) +ccflags-y +=3D -I $(src)/include +ccflags-y +=3D -I $(src)/include/nvkm +ccflags-y +=3D -I $(src)/nvkm +ccflags-y +=3D -I $(src) =20 # NVKM - HW resource manager #- code also used by various userspace tools/tests diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index c29a850859ad..8162a522222b 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -32,7 +32,7 @@ endif # Enable -Werror in CI and development subdir-ccflags-$(CONFIG_DRM_XE_WERROR) +=3D -Werror =20 -subdir-ccflags-y +=3D -I$(obj) -I$(srctree)/$(src) +subdir-ccflags-y +=3D -I$(obj) -I$(src) =20 # generated sources hostprogs :=3D xe_gen_wa_oob @@ -43,7 +43,7 @@ quiet_cmd_wa_oob =3D GEN $(notdir $(generated_oob)) cmd_wa_oob =3D mkdir -p $(@D); $^ $(generated_oob) =20 $(obj)/generated/%_wa_oob.c $(obj)/generated/%_wa_oob.h: $(obj)/xe_gen_wa_= oob \ - $(srctree)/$(src)/xe_wa_oob.rules + $(src)/xe_wa_oob.rules $(call cmd,wa_oob) =20 uses_generated_oob :=3D \ @@ -166,8 +166,8 @@ endif =20 # i915 Display compat #defines and #includes subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) +=3D \ - -I$(srctree)/$(src)/display/ext \ - -I$(srctree)/$(src)/compat-i915-headers \ + -I$(src)/display/ext \ + -I$(src)/compat-i915-headers \ -I$(srctree)/drivers/gpu/drm/i915/display/ \ -Ddrm_i915_gem_object=3Dxe_bo \ -Ddrm_i915_private=3Dxe_device @@ -310,7 +310,7 @@ ifneq ($(CONFIG_DRM_XE_DISPLAY),y) endif =20 always-$(CONFIG_DRM_XE_WERROR) +=3D \ - $(patsubst %.h,%.hdrtest, $(shell cd $(srctree)/$(src) && find * -name '*= .h' $(hdrtest_find_args))) + $(patsubst %.h,%.hdrtest, $(shell cd $(src) && find * -name '*.h' $(hdrte= st_find_args))) =20 quiet_cmd_hdrtest =3D HDRTEST $(patsubst %.hdrtest,%.h,$@) cmd_hdrtest =3D $(CC) -DHDRTEST $(filter-out $(CFLAGS_GCOV), $(c_fla= gs)) -S -o /dev/null -x c /dev/null -include $<; touch $@ diff --git a/drivers/hid/amd-sfh-hid/Makefile b/drivers/hid/amd-sfh-hid/Mak= efile index 0222170ab7ad..106514b54d16 100644 --- a/drivers/hid/amd-sfh-hid/Makefile +++ b/drivers/hid/amd-sfh-hid/Makefile @@ -13,4 +13,4 @@ amd_sfh-objs +=3D sfh1_1/amd_sfh_init.o amd_sfh-objs +=3D sfh1_1/amd_sfh_interface.o amd_sfh-objs +=3D sfh1_1/amd_sfh_desc.o =20 -ccflags-y +=3D -I $(srctree)/$(src)/ +ccflags-y +=3D -I $(src)/ diff --git a/drivers/hid/intel-ish-hid/Makefile b/drivers/hid/intel-ish-hid= /Makefile index f0a82b1c7cb9..db4974c43431 100644 --- a/drivers/hid/intel-ish-hid/Makefile +++ b/drivers/hid/intel-ish-hid/Makefile @@ -23,4 +23,4 @@ intel-ishtp-hid-objs +=3D ishtp-hid-client.o obj-$(CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER) +=3D intel-ishtp-loader.o intel-ishtp-loader-objs +=3D ishtp-fw-loader.o =20 -ccflags-y +=3D -I $(srctree)/$(src)/ishtp +ccflags-y +=3D -I $(src)/ishtp diff --git a/drivers/md/dm-vdo/Makefile b/drivers/md/dm-vdo/Makefile index 33e09abc6acd..9476957bfbf4 100644 --- a/drivers/md/dm-vdo/Makefile +++ b/drivers/md/dm-vdo/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only =20 -ccflags-y :=3D -I$(srctree)/$(src) -I$(srctree)/$(src)/indexer +ccflags-y :=3D -I$(src) -I$(src)/indexer =20 obj-$(CONFIG_DM_VDO) +=3D dm-vdo.o =20 diff --git a/drivers/net/ethernet/aquantia/atlantic/Makefile b/drivers/net/= ethernet/aquantia/atlantic/Makefile index 8ebcc68e807f..f6a96931c89a 100644 --- a/drivers/net/ethernet/aquantia/atlantic/Makefile +++ b/drivers/net/ethernet/aquantia/atlantic/Makefile @@ -8,7 +8,7 @@ =20 obj-$(CONFIG_AQTION) +=3D atlantic.o =20 -ccflags-y +=3D -I$(srctree)/$(src) +ccflags-y +=3D -I$(src) =20 atlantic-objs :=3D aq_main.o \ aq_nic.o \ diff --git a/drivers/net/ethernet/chelsio/libcxgb/Makefile b/drivers/net/et= hernet/chelsio/libcxgb/Makefile index aa79264e72ba..fbedc31674b3 100644 --- a/drivers/net/ethernet/chelsio/libcxgb/Makefile +++ b/drivers/net/ethernet/chelsio/libcxgb/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y :=3D -I $(srctree)/$(src)/../cxgb4 +ccflags-y :=3D -I $(src)/../cxgb4 =20 obj-$(CONFIG_CHELSIO_LIB) +=3D libcxgb.o =20 diff --git a/drivers/net/ethernet/fungible/funeth/Makefile b/drivers/net/et= hernet/fungible/funeth/Makefile index 646d69595b4f..d51e4c2b4a1a 100644 --- a/drivers/net/ethernet/fungible/funeth/Makefile +++ b/drivers/net/ethernet/fungible/funeth/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) =20 -ccflags-y +=3D -I$(srctree)/$(src)/../funcore -I$(srctree)/$(src) +ccflags-y +=3D -I$(src)/../funcore -I$(src) =20 obj-$(CONFIG_FUN_ETH) +=3D funeth.o =20 diff --git a/drivers/net/ethernet/hisilicon/hns3/Makefile b/drivers/net/eth= ernet/hisilicon/hns3/Makefile index e214bfaece1f..8e9293e57bfd 100644 --- a/drivers/net/ethernet/hisilicon/hns3/Makefile +++ b/drivers/net/ethernet/hisilicon/hns3/Makefile @@ -3,7 +3,7 @@ # Makefile for the HISILICON network device drivers. # =20 -ccflags-y +=3D -I$(srctree)/$(src) +ccflags-y +=3D -I$(src) ccflags-y +=3D -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3pf ccflags-y +=3D -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3vf ccflags-y +=3D -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3_common diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/dr= ivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile index dc6d27a36faa..e5ca0f511822 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile @@ -6,8 +6,8 @@ # =20 ccflags-y +=3D \ - -I $(srctree)/$(src) \ - -I $(srctree)/$(src)/../include + -I $(src) \ + -I $(src)/../include =20 obj-$(CONFIG_BRCMFMAC) +=3D brcmfmac.o brcmfmac-objs +=3D \ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile = b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile index 46098705e236..5e37c638f966 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile @@ -3,9 +3,9 @@ # Copyright (c) 2022 Broadcom Corporation =20 ccflags-y +=3D \ - -I $(srctree)/$(src) \ - -I $(srctree)/$(src)/.. \ - -I $(srctree)/$(src)/../../include + -I $(src) \ + -I $(src)/.. \ + -I $(src)/../../include =20 obj-m +=3D brcmfmac-bca.o brcmfmac-bca-objs +=3D \ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile = b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile index 5e1fddaff79e..33e86724ba14 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile @@ -3,9 +3,9 @@ # Copyright (c) 2022 Broadcom Corporation =20 ccflags-y +=3D \ - -I $(srctree)/$(src) \ - -I $(srctree)/$(src)/.. \ - -I $(srctree)/$(src)/../../include + -I $(src) \ + -I $(src)/.. \ + -I $(src)/../../include =20 obj-m +=3D brcmfmac-cyw.o brcmfmac-cyw-objs +=3D \ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile = b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile index 7f455a19a2b1..3db4cce44f42 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile @@ -3,9 +3,9 @@ # Copyright (c) 2022 Broadcom Corporation =20 ccflags-y +=3D \ - -I $(srctree)/$(src) \ - -I $(srctree)/$(src)/.. \ - -I $(srctree)/$(src)/../../include + -I $(src) \ + -I $(src)/.. \ + -I $(src)/../../include =20 obj-m +=3D brcmfmac-wcc.o brcmfmac-wcc-objs +=3D \ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile b/dr= ivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile index 090757730ba6..ffdd17eabe1d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile @@ -16,9 +16,9 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. =20 ccflags-y :=3D \ - -I $(srctree)/$(src) \ - -I $(srctree)/$(src)/phy \ - -I $(srctree)/$(src)/../include + -I $(src) \ + -I $(src)/phy \ + -I $(src)/../include =20 brcmsmac-y :=3D \ mac80211_if.o \ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile b/dr= ivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile index 7a82d615ba2a..f9b40cab766c 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2011 Broadcom Corporation # -ccflags-y :=3D -I $(srctree)/$(src)/../include +ccflags-y :=3D -I $(src)/../include =20 obj-$(CONFIG_BRCMUTIL) +=3D brcmutil.o brcmutil-objs =3D utils.o d11.o diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile b/drivers/net/= wireless/intel/iwlwifi/dvm/Makefile index 0486b17d7c41..6109d64006db 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile @@ -11,4 +11,4 @@ iwldvm-objs +=3D rxon.o devices.o iwldvm-$(CONFIG_IWLWIFI_LEDS) +=3D led.o iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) +=3D debugfs.o =20 -ccflags-y +=3D -I $(srctree)/$(src)/../ +ccflags-y +=3D -I $(src)/../ diff --git a/drivers/net/wireless/intel/iwlwifi/mei/Makefile b/drivers/net/= wireless/intel/iwlwifi/mei/Makefile index 8e3ef0347db7..e05f9421be4a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mei/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/mei/Makefile @@ -5,4 +5,4 @@ iwlmei-y +=3D net.o iwlmei-$(CONFIG_IWLWIFI_DEVICE_TRACING) +=3D trace.o CFLAGS_trace.o :=3D -I$(src) =20 -ccflags-y +=3D -I $(srctree)/$(src)/../ +ccflags-y +=3D -I $(src)/../ diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile b/drivers/net/= wireless/intel/iwlwifi/mvm/Makefile index 593fe28d89cf..764ba73cde1e 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile @@ -15,4 +15,4 @@ iwlmvm-$(CONFIG_IWLWIFI_LEDS) +=3D led.o iwlmvm-$(CONFIG_PM) +=3D d3.o iwlmvm-$(CONFIG_IWLMEI) +=3D vendor-cmd.o =20 -ccflags-y +=3D -I $(srctree)/$(src)/../ +ccflags-y +=3D -I $(src)/../ diff --git a/drivers/net/wireless/intel/iwlwifi/tests/Makefile b/drivers/ne= t/wireless/intel/iwlwifi/tests/Makefile index 5658471bdf0a..84491488f589 100644 --- a/drivers/net/wireless/intel/iwlwifi/tests/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/tests/Makefile @@ -2,6 +2,6 @@ =20 iwlwifi-tests-y +=3D module.o devinfo.o =20 -ccflags-y +=3D -I$(srctree)/$(src)/../ +ccflags-y +=3D -I$(src)/../ =20 obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) +=3D iwlwifi-tests.o diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile b/driver= s/net/wireless/realtek/rtl818x/rtl8180/Makefile index 565a9a114134..1044105c2557 100644 --- a/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile +++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile @@ -3,4 +3,4 @@ rtl818x_pci-objs :=3D dev.o rtl8225.o sa2400.o max2820.o gr= f5101.o rtl8225se.o =20 obj-$(CONFIG_RTL8180) +=3D rtl818x_pci.o =20 -ccflags-y +=3D -I $(srctree)/$(src)/.. +ccflags-y +=3D -I $(src)/.. diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile b/driver= s/net/wireless/realtek/rtl818x/rtl8187/Makefile index 0bf64dfb233a..3deded2c05b6 100644 --- a/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile +++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile @@ -3,4 +3,4 @@ rtl8187-objs :=3D dev.o rtl8225.o leds.o rfkill.o =20 obj-$(CONFIG_RTL8187) +=3D rtl8187.o =20 -ccflags-y +=3D -I $(srctree)/$(src)/.. +ccflags-y +=3D -I $(src)/.. diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile index e0188ecd85b2..853c72a81ae0 100644 --- a/drivers/scsi/aic7xxx/Makefile +++ b/drivers/scsi/aic7xxx/Makefile @@ -55,9 +55,9 @@ aicasm-7xxx-opts-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) :=3D \ =20 ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y) $(obj)/aic7xxx_seq.h: $(src)/aic7xxx.seq $(src)/aic7xxx.reg $(obj)/aicasm/= aicasm - $(obj)/aicasm/aicasm -I$(srctree)/$(src) -r $(obj)/aic7xxx_reg.h \ + $(obj)/aicasm/aicasm -I $(src) -r $(obj)/aic7xxx_reg.h \ $(aicasm-7xxx-opts-y) -o $(obj)/aic7xxx_seq.h \ - $(srctree)/$(src)/aic7xxx.seq + $(src)/aic7xxx.seq =20 $(aic7xxx-gen-y): $(objtree)/$(obj)/aic7xxx_seq.h @true @@ -73,9 +73,9 @@ aicasm-79xx-opts-$(CONFIG_AIC79XX_REG_PRETTY_PRINT) :=3D \ =20 ifeq ($(CONFIG_AIC79XX_BUILD_FIRMWARE),y) $(obj)/aic79xx_seq.h: $(src)/aic79xx.seq $(src)/aic79xx.reg $(obj)/aicasm/= aicasm - $(obj)/aicasm/aicasm -I$(srctree)/$(src) -r $(obj)/aic79xx_reg.h \ + $(obj)/aicasm/aicasm -I $(src) -r $(obj)/aic79xx_reg.h \ $(aicasm-79xx-opts-y) -o $(obj)/aic79xx_seq.h \ - $(srctree)/$(src)/aic79xx.seq + $(src)/aic79xx.seq =20 $(aic79xx-gen-y): $(objtree)/$(obj)/aic79xx_seq.h @true @@ -83,5 +83,5 @@ else $(obj)/aic79xx_reg_print.c: $(src)/aic79xx_reg_print.c_shipped endif =20 -$(obj)/aicasm/aicasm: $(srctree)/$(src)/aicasm/*.[chyl] - $(MAKE) -C $(srctree)/$(src)/aicasm OUTDIR=3D$(shell pwd)/$(obj)/aicasm/ +$(obj)/aicasm/aicasm: $(src)/aicasm/*.[chyl] + $(MAKE) -C $(src)/aicasm OUTDIR=3D$(shell pwd)/$(obj)/aicasm/ diff --git a/drivers/staging/rtl8723bs/Makefile b/drivers/staging/rtl8723bs= /Makefile index 590bde02058c..7f5067e89295 100644 --- a/drivers/staging/rtl8723bs/Makefile +++ b/drivers/staging/rtl8723bs/Makefile @@ -62,4 +62,4 @@ r8723bs-y =3D \ =20 obj-$(CONFIG_RTL8723BS) :=3D r8723bs.o =20 -ccflags-y +=3D -I$(srctree)/$(src)/include -I$(srctree)/$(src)/hal +ccflags-y +=3D -I$(src)/include -I$(src)/hal diff --git a/fs/iomap/Makefile b/fs/iomap/Makefile index fc070184b7fa..381d76c5c232 100644 --- a/fs/iomap/Makefile +++ b/fs/iomap/Makefile @@ -4,7 +4,7 @@ # All Rights Reserved. # =20 -ccflags-y +=3D -I $(srctree)/$(src) # needed for trace events +ccflags-y +=3D -I $(src) # needed for trace events =20 obj-$(CONFIG_FS_IOMAP) +=3D iomap.o =20 diff --git a/fs/unicode/Makefile b/fs/unicode/Makefile index 0e51c0025a16..e309afe2b2bb 100644 --- a/fs/unicode/Makefile +++ b/fs/unicode/Makefile @@ -18,13 +18,13 @@ ifdef REGENERATE_UTF8DATA =20 quiet_cmd_utf8data =3D GEN $@ cmd_utf8data =3D $< \ - -a $(srctree)/$(src)/DerivedAge.txt \ - -c $(srctree)/$(src)/DerivedCombiningClass.txt \ - -p $(srctree)/$(src)/DerivedCoreProperties.txt \ - -d $(srctree)/$(src)/UnicodeData.txt \ - -f $(srctree)/$(src)/CaseFolding.txt \ - -n $(srctree)/$(src)/NormalizationCorrections.txt \ - -t $(srctree)/$(src)/NormalizationTest.txt \ + -a $(src)/DerivedAge.txt \ + -c $(src)/DerivedCombiningClass.txt \ + -p $(src)/DerivedCoreProperties.txt \ + -d $(src)/UnicodeData.txt \ + -f $(src)/CaseFolding.txt \ + -n $(src)/NormalizationCorrections.txt \ + -t $(src)/NormalizationTest.txt \ -o $@ =20 $(obj)/utf8data.c: $(obj)/mkutf8data $(filter %.txt, $(cmd_utf8data)) FORCE diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index 76674ad5833e..c5a35e32adf0 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -4,8 +4,8 @@ # All Rights Reserved. # =20 -ccflags-y +=3D -I $(srctree)/$(src) # needed for trace events -ccflags-y +=3D -I $(srctree)/$(src)/libxfs +ccflags-y +=3D -I $(src) # needed for trace events +ccflags-y +=3D -I $(src)/libxfs =20 obj-$(CONFIG_XFS_FS) +=3D xfs.o =20 diff --git a/init/Makefile b/init/Makefile index cbac576c57d6..3c48d97538c1 100644 --- a/init/Makefile +++ b/init/Makefile @@ -52,7 +52,7 @@ CFLAGS_version.o :=3D -include $(obj)/utsversion-tmp.h # Build version-timestamp.c with final UTS_VERSION # =20 -include/generated/utsversion.h: build-version-auto =3D $(shell $(srctree)/= $(src)/build-version) +include/generated/utsversion.h: build-version-auto =3D $(shell $(src)/buil= d-version) include/generated/utsversion.h: build-timestamp-auto =3D $(shell LC_ALL=3D= C date) include/generated/utsversion.h: FORCE $(call filechk,uts_version) diff --git a/lib/Makefile b/lib/Makefile index ffc6b2341b45..27baa6e6daa8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -352,7 +352,7 @@ $(obj)/oid_registry_data.c: $(srctree)/include/linux/oi= d_registry.h \ $(call cmd,build_OID_registry) =20 quiet_cmd_build_OID_registry =3D GEN $@ - cmd_build_OID_registry =3D perl $(srctree)/$(src)/build_OID_registry= $< $@ + cmd_build_OID_registry =3D perl $(src)/build_OID_registry $< $@ =20 clean-files +=3D oid_registry_data.c =20 @@ -412,8 +412,8 @@ obj-$(CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED) +=3D devmem= _is_allowed.o obj-$(CONFIG_FIRMWARE_TABLE) +=3D fw_table.o =20 # FORTIFY_SOURCE compile-time behavior tests -TEST_FORTIFY_SRCS =3D $(wildcard $(srctree)/$(src)/test_fortify/*-*.c) -TEST_FORTIFY_LOGS =3D $(patsubst $(srctree)/$(src)/%.c, %.log, $(TEST_FORT= IFY_SRCS)) +TEST_FORTIFY_SRCS =3D $(wildcard $(src)/test_fortify/*-*.c) +TEST_FORTIFY_LOGS =3D $(patsubst $(src)/%.c, %.log, $(TEST_FORTIFY_SRCS)) TEST_FORTIFY_LOG =3D test_fortify.log =20 quiet_cmd_test_fortify =3D TEST $@ diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile index 385a94aa0b99..8785353c6140 100644 --- a/lib/raid6/Makefile +++ b/lib/raid6/Makefile @@ -53,7 +53,7 @@ endif endif =20 quiet_cmd_unroll =3D UNROLL $@ - cmd_unroll =3D $(AWK) -v N=3D$* -f $(srctree)/$(src)/unroll.awk < $<= > $@ + cmd_unroll =3D $(AWK) -v N=3D$* -f $(src)/unroll.awk < $< > $@ =20 targets +=3D int1.c int2.c int4.c int8.c $(obj)/int%.c: $(src)/int.uc $(src)/unroll.awk FORCE diff --git a/net/wireless/Makefile b/net/wireless/Makefile index 72074fd36df4..1d49cc8b6da1 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -25,7 +25,7 @@ ifneq ($(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR),) cfg80211-y +=3D extra-certs.o endif =20 -$(obj)/shipped-certs.c: $(sort $(wildcard $(srctree)/$(src)/certs/*.hex)) +$(obj)/shipped-certs.c: $(sort $(wildcard $(src)/certs/*.hex)) @$(kecho) " GEN $@" $(Q)(echo '#include "reg.h"'; \ echo 'const u8 shipped_regdb_certs[] =3D {'; \ diff --git a/rust/Makefile b/rust/Makefile index 846e6ab9d5a9..85e46dde2a5b 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -239,7 +239,7 @@ quiet_cmd_rustsysroot =3D RUSTSYSROOT rm -rf $(objtree)/$(obj)/test; \ mkdir -p $(objtree)/$(obj)/test; \ cp -a $(rustc_sysroot) $(objtree)/$(obj)/test/sysroot; \ - cp -r $(srctree)/$(src)/alloc/* \ + cp -r $(src)/alloc/* \ $(objtree)/$(obj)/test/sysroot/lib/rustlib/src/rust/library/alloc/src; \ echo '\#!/bin/sh' > $(objtree)/$(obj)/test/rustc_sysroot; \ echo "$(RUSTC) --sysroot=3D$(abspath $(objtree)/$(obj)/test/sysroot) \"\$= $@\"" \ @@ -340,7 +340,7 @@ quiet_cmd_bindgen =3D BINDGEN $@ $(bindgen_target_cflags) $(bindgen_target_extra) =20 $(obj)/bindings/bindings_generated.rs: private bindgen_target_flags =3D \ - $(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters) + $(shell grep -Ev '^#|^$$' $(src)/bindgen_parameters) $(obj)/bindings/bindings_generated.rs: private bindgen_target_extra =3D ; \ sed -Ei 's/pub const RUST_CONST_HELPER_([a-zA-Z0-9_]*)/pub const \1/g'= $@ $(obj)/bindings/bindings_generated.rs: $(src)/bindings/bindings_helper.h \ @@ -348,7 +348,7 @@ $(obj)/bindings/bindings_generated.rs: $(src)/bindings/= bindings_helper.h \ $(call if_changed_dep,bindgen) =20 $(obj)/uapi/uapi_generated.rs: private bindgen_target_flags =3D \ - $(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters) + $(shell grep -Ev '^#|^$$' $(src)/bindgen_parameters) $(obj)/uapi/uapi_generated.rs: $(src)/uapi/uapi_helper.h \ $(src)/bindgen_parameters FORCE $(call if_changed_dep,bindgen) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 933f6c3fe6b0..f054e0828f13 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 =20 -BPF_SAMPLES_PATH ?=3D $(abspath $(srctree)/$(src)) +BPF_SAMPLES_PATH ?=3D $(abspath $(src)) TOOLS_PATH :=3D $(BPF_SAMPLES_PATH)/../../tools =20 pound :=3D \# diff --git a/samples/hid/Makefile b/samples/hid/Makefile index 9f7fe29dd749..c128ccd49974 100644 --- a/samples/hid/Makefile +++ b/samples/hid/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 =20 -HID_SAMPLES_PATH ?=3D $(abspath $(srctree)/$(src)) +HID_SAMPLES_PATH ?=3D $(abspath $(src)) TOOLS_PATH :=3D $(HID_SAMPLES_PATH)/../../tools =20 pound :=3D \# diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 2f331879816b..faf37bafa3f8 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -62,8 +62,7 @@ stringify =3D $(squote)$(quote)$1$(quote)$(squote) =20 ### # The path to Kbuild or Makefile. Kbuild has precedence over Makefile. -kbuild-dir =3D $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) -kbuild-file =3D $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefi= le) +kbuild-file =3D $(or $(wildcard $(src)/Kbuild),$(src)/Makefile) =20 ### # Read a file, replacing newlines with spaces diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic index 8d01b37b7677..1486abf34c7c 100644 --- a/scripts/Makefile.asm-generic +++ b/scripts/Makefile.asm-generic @@ -9,7 +9,7 @@ PHONY :=3D all all: =20 -src :=3D $(subst /generated,,$(obj)) +src :=3D $(srctree)/$(subst /generated,,$(obj)) =20 include $(srctree)/scripts/Kbuild.include -include $(kbuild-file) @@ -20,14 +20,14 @@ include $(srctree)/$(generic)/Kbuild endif =20 redundant :=3D $(filter $(mandatory-y) $(generated-y), $(generic-y)) -redundant +=3D $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src= )/$(f)),$(f))) +redundant +=3D $(foreach f, $(generic-y), $(if $(wildcard $(src)/$(f)),$(f= ))) redundant :=3D $(sort $(redundant)) $(if $(redundant),\ $(warning redundant generic-y found in $(src)/Kbuild: $(redundant))) =20 # If arch does not implement mandatory headers, fallback to asm-generic on= es. mandatory-y :=3D $(filter-out $(generated-y), $(mandatory-y)) -generic-y +=3D $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$= (src)/$(f)),,$(f))) +generic-y +=3D $(foreach f, $(mandatory-y), $(if $(wildcard $(src)/$(f))= ,,$(f))) =20 generic-y :=3D $(addprefix $(obj)/, $(generic-y)) generated-y :=3D $(addprefix $(obj)/, $(generated-y)) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 41138346afb0..43b71c3d0ff6 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -3,7 +3,7 @@ # Building # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -src :=3D $(obj) +src :=3D $(if $(VPATH),$(VPATH)/)$(obj) =20 PHONY :=3D $(obj)/ $(obj)/: diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index f2cb4d7ffd96..4fcfab40ed61 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean @@ -3,7 +3,7 @@ # Cleaning up # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -src :=3D $(obj) +src :=3D $(if $(VPATH),$(VPATH)/)$(obj) =20 PHONY :=3D __clean __clean: diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index e67f066c0cea..5972ec4ee29b 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -209,13 +209,13 @@ _c_flags +=3D $(if $(patsubst n%,, \ -D__KCSAN_INSTRUMENT_BARRIERS__) endif =20 -# $(srctree)/$(src) for including checkin headers from generated source fi= les -# $(objtree)/$(obj) for including generated headers from checkin source fi= les +# $(src) for including checkin headers from generated source files +# $(obj) for including generated headers from checkin source files ifeq ($(KBUILD_EXTMOD),) ifdef building_out_of_srctree -_c_flags +=3D $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtre= e)/,$(obj)) -_a_flags +=3D $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtre= e)/,$(obj)) -_cpp_flags +=3D $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtre= e)/,$(obj)) +_c_flags +=3D $(addprefix -I, $(src) $(obj)) +_a_flags +=3D $(addprefix -I, $(src) $(obj)) +_cpp_flags +=3D $(addprefix -I, $(src) $(obj)) endif endif =20 diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 739402f45509..68c4f9ee0c90 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -112,7 +112,7 @@ else =20 # set src + obj - they may be used in the modules's Makefile obj :=3D $(KBUILD_EXTMOD) -src :=3D $(obj) +src :=3D $(if $(VPATH),$(VPATH)/)$(obj) =20 # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS include $(kbuild-file) diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index 4d32b9497da9..a18657072541 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -16,12 +16,12 @@ libfdt =3D $(addprefix libfdt/,$(libfdt-objs)) fdtoverlay-objs :=3D $(libfdt) fdtoverlay.o util.o =20 # Source files need to get at the userspace version of libfdt_env.h to com= pile -HOST_EXTRACFLAGS +=3D -I $(srctree)/$(src)/libfdt +HOST_EXTRACFLAGS +=3D -I $(src)/libfdt HOST_EXTRACFLAGS +=3D -DNO_YAML =20 # Generated files need one more search path to include headers in source t= ree -HOSTCFLAGS_dtc-lexer.lex.o :=3D -I $(srctree)/$(src) -HOSTCFLAGS_dtc-parser.tab.o :=3D -I $(srctree)/$(src) +HOSTCFLAGS_dtc-lexer.lex.o :=3D -I $(src) +HOSTCFLAGS_dtc-parser.tab.o :=3D -I $(src) =20 # dependencies on generated files need to be listed explicitly $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h diff --git a/scripts/gdb/linux/Makefile b/scripts/gdb/linux/Makefile index 48941faa6ea6..d77ad9079d0f 100644 --- a/scripts/gdb/linux/Makefile +++ b/scripts/gdb/linux/Makefile @@ -2,7 +2,7 @@ =20 ifdef building_out_of_srctree =20 -symlinks :=3D $(patsubst $(srctree)/$(src)/%,%,$(wildcard $(srctree)/$(src= )/*.py)) +symlinks :=3D $(patsubst $(src)/%,%,$(wildcard $(src)/*.py)) =20 quiet_cmd_symlink =3D SYMLINK $@ cmd_symlink =3D ln -fsn $(patsubst $(obj)/%,$(abspath $(srctree))/$(= src)/%,$@) $@ diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile index d6a422a63b6a..312edccda736 100644 --- a/scripts/genksyms/Makefile +++ b/scripts/genksyms/Makefile @@ -23,8 +23,8 @@ $(obj)/pars%.tab.c $(obj)/pars%.tab.h: $(src)/pars%.y FOR= CE endif =20 # -I needed for generated C source to include headers in source tree -HOSTCFLAGS_parse.tab.o :=3D -I $(srctree)/$(src) -HOSTCFLAGS_lex.lex.o :=3D -I $(srctree)/$(src) +HOSTCFLAGS_parse.tab.o :=3D -I $(src) +HOSTCFLAGS_lex.lex.o :=3D -I $(src) =20 # dependencies on generated files need to be listed explicitly $(obj)/lex.lex.o: $(obj)/parse.tab.h diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ea1bf3b3dbde..a0a0be38cbdc 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -57,7 +57,7 @@ $(foreach c, config menuconfig nconfig gconfig xconfig, $= (eval $(call config_rul =20 PHONY +=3D localmodconfig localyesconfig localyesconfig localmodconfig: $(obj)/conf - $(Q)$(PERL) $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kcon= fig) > .tmp.config + $(Q)$(PERL) $(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp= .config $(Q)if [ -f .config ]; then \ cmp -s .tmp.config .config || \ (mv -f .config .config.old.1; \ @@ -118,7 +118,7 @@ tinyconfig: # CHECK: -o cache_dir=3D working? PHONY +=3D testconfig testconfig: $(obj)/conf - $(Q)$(PYTHON3) -B -m pytest $(srctree)/$(src)/tests \ + $(Q)$(PYTHON3) -B -m pytest $(src)/tests \ -o cache_dir=3D$(abspath $(obj)/tests/.cache) \ $(if $(findstring 1,$(KBUILD_VERBOSE)),--capture=3Dno) clean-files +=3D tests/.cache @@ -165,8 +165,8 @@ common-objs :=3D confdata.o expr.o lexer.lex.o menu.o p= arser.tab.o \ preprocess.o symbol.o util.o =20 $(obj)/lexer.lex.o: $(obj)/parser.tab.h -HOSTCFLAGS_lexer.lex.o :=3D -I $(srctree)/$(src) -HOSTCFLAGS_parser.tab.o :=3D -I $(srctree)/$(src) +HOSTCFLAGS_lexer.lex.o :=3D -I $(src) +HOSTCFLAGS_parser.tab.o :=3D -I $(src) =20 # conf: Used for defconfig, oldconfig and related targets hostprogs +=3D conf diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile index 884ff155edc3..55c67b9846a9 100644 --- a/security/tomoyo/Makefile +++ b/security/tomoyo/Makefile @@ -11,7 +11,7 @@ quiet_cmd_policy =3D POLICY $@ printf '\t"";\n';) \ } > $@ =20 -$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(srctree)/$(src)= /policy/*.conf.default) FORCE +$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(src)/policy/*.c= onf.default) FORCE $(call if_changed,policy) =20 ifndef CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING diff --git a/usr/Makefile b/usr/Makefile index f8e1ad19e05c..132ef7e96e6d 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -22,7 +22,7 @@ cpio-data :=3D # If CONFIG_INITRAMFS_SOURCE is empty, generate a small initramfs with the # default contents. ifeq ($(ramfs-input),) -ramfs-input :=3D $(srctree)/$(src)/default_cpio_list +ramfs-input :=3D $(src)/default_cpio_list endif =20 ifeq ($(words $(ramfs-input)),1) diff --git a/usr/include/Makefile b/usr/include/Makefile index 338c81f1fcf3..771e32872b2a 100644 --- a/usr/include/Makefile +++ b/usr/include/Makefile @@ -78,7 +78,7 @@ quiet_cmd_hdrtest =3D HDRTEST $< cmd_hdrtest =3D \ $(CC) $(c_flags) -fsyntax-only -x c /dev/null \ $(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \ - $(PERL) $(srctree)/$(src)/headers_check.pl $(obj) $(SRCARCH) $<; \ + $(PERL) $(src)/headers_check.pl $(obj) $(SRCARCH) $<; \ touch $@ =20 $(obj)/%.hdrtest: $(obj)/%.h FORCE --=20 2.40.1