Received-SPF: pass (google.com: domain of linux-kernel+bounces-215332-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Kris Van Hees <kris.van.hees@oracle.com>
To: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
        linux-modules@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Cc: Kris Van Hees <kris.van.hees@oracle.com>,
        Nick Alcock <nick.alcock@oracle.com>,
        Masahiro Yamada <masahiroy@kernel.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        Luis Chamberlain <mcgrof@kernel.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Jiri Olsa <olsajiri@gmail.com>,
        Elena Zannoni <elena.zannoni@oracle.com>
Subject: [PATCH v4 3/3] module: add install target for modules.builtin.ranges
Date: Fri, 14 Jun 2024 13:14:28 -0400
Message-ID: <20240614171428.968174-4-kris.van.hees@oracle.com>
In-Reply-To: <20240614171428.968174-1-kris.van.hees@oracle.com>
References: <20240614171428.968174-1-kris.van.hees@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?q3rVf7tXsNR/CdTWSn5UeNEhTXYT/c41H1EjFvi8XhpNpTBPi0m4WjcwTqiX?=
 =?us-ascii?Q?D08jRZZFUkhpmuYONRJvflBqijSlKR2UHwRo+r1navB5yeYs2/reutfblxQt?=
 =?us-ascii?Q?1AvA3oJsetmhfLUegxLhpaUI5Z4BFcLaRGqoK2MN3yl9MbwMX8CjalF0I6CX?=
 =?us-ascii?Q?XP7NPosfALwrNmOgQmU7JCfMse/CSzaE7laEEDaKLe9EemXHG3iJLnLYL69r?=
 =?us-ascii?Q?3+IJjsL6mhotTrfr1Q9HmIpZ/PAK9uQupuaxLEitT0Se4IbwXJhJrYntXrp6?=
 =?us-ascii?Q?bOuKshc2g5GuEpBvy8fZhZaDekd9OxBHhAVQ8Mbca9+N3NfVXE9+Cf35ddOQ?=
 =?us-ascii?Q?1PSb3j5+UIMMCgpafp6SRuZtZ0oUflC/N3NYYWa37j540vPCCl+ANqPHKjVx?=
 =?us-ascii?Q?eSG0oXiBO8hDYXfQJzv3SUfuXpPDuAU7xGL7I0kbePQAHE/4CTaVeRW3PkC8?=
 =?us-ascii?Q?f0TLdHMjT8Lv3W21hOoAvi1kG5bf4OZ3TCoaLLqgwt22GBum/sJNTcgFb+An?=
 =?us-ascii?Q?hAehJdE3pzEi9tRRvN4ek1uXXB5vvGPxBY+bBpyKcra7hStbjg0bIQlhLj5Q?=
 =?us-ascii?Q?DEODTt625u7wZ2uXGWtKM2KaWIJ1C38ek+gDQUPpYbAahmyGmVxOX1eZYiby?=
 =?us-ascii?Q?oOUXkJn4WT4goBdh5olbxQXalkqb5tRhFPDppjZmne/+sSRMEw8KavqZP3bO?=
 =?us-ascii?Q?z9ZRVu1PlWG6D/28VDONWF/cxFNkXPZQHhWp1mHTL+wuhMNsSdZmdV7iOjkM?=
 =?us-ascii?Q?ofNjfTmEytVEEVkMWvQkhucRYFUrWOM4iztcX1XeWXCMSNcOznEddAFvg6pU?=
 =?us-ascii?Q?exNcIFpY6MGrk9aZ00HVo5V2IqjaM0VyyXOve3MnhEEA9gsZIRLKZOVmLaK9?=
 =?us-ascii?Q?fAf51wMdVdq7AZn0e0sasg6MZielsNkrrtRibx6ky8Q40Jjl4fNsG1nLVjBC?=
 =?us-ascii?Q?NnK22qp9sT3WwWsspP5HmdEVOVWDHkrGRzA8pYIKAHhjmUyDumecw7NA476d?=
 =?us-ascii?Q?oXoKjYJMHEEe6xss/p0IkqEraOi4L1Wg9fsQBpBMd0b1elZWj/+/y4g3FAuH?=
 =?us-ascii?Q?dXoRFOt654da6PecrGrzOYGFQBuhvI6m8GBQ6bry06sE4Mb8c32jHGS6sLKv?=
 =?us-ascii?Q?3sUtg+zksQM8nhyHqkc+ffojJ6UrQLjAJnlUZJ6KEMF2ydsUhyHrRgwFWoS3?=
 =?us-ascii?Q?jAgZjG32HjlrQZ+tGOce/t923JfmRoZNSgL3WNo+w4mRlbw5Cnny1KwKHrBp?=
 =?us-ascii?Q?+HBl4KWNPpbdYfDuxQQlnYOabwJShzS8iG//KgVG5WbYkp3N0jJL/1sOzx06?=
 =?us-ascii?Q?/LVkyDtonw4MJehmwNK6XZM+Vy4txG5Y+ILBEr6+ZixDwpHrcHbocYDMjtfs?=
 =?us-ascii?Q?kqOF1M71SE2U18P/mmIigrh7vwd0M4lNpYaXd8t7Kp3MiwAdjm+nsKb9yNm4?=
 =?us-ascii?Q?801jwj8TRGlvyGnC7KsNfACI+bDs+nEhNbekGW7L/nBfOovHXTOLtrCsEznE?=
 =?us-ascii?Q?BW8woBe+T8Npw0TNklMPYK3oME59fMW7hisgMWSJ9fPXeUA+F6u2x5JZQmeZ?=
 =?us-ascii?Q?UQAcqOMCG+OaZKfim68tm+uA80t09X2ZI249cj6aRqYjVE64SkbjXJezKPEm?=
 =?us-ascii?Q?sg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	+dDwP8ptQzkppY15NxVabOuDY3e42RhtXP4wmReaDtCQCZfyxTqF9bzRdqdhNa26nwCZaGniJuGXKEtkMOwfzz5M8L9HUumc9Qf84uwRn4qL21stiZxQQ0fyqh9CTQnhikp1IUe9VNZl/fNi4frZLNXmhCd6pJfrM9YlQRJvyJek2rXAsJKYzMd/lhu1XbVnPnQmO1spQRRc7gksWq15IHeqwbTxvbPuy/INKFwqKVVz6eW34+m+Leb8olEABJbmjb3F4lqXhupme/60FzSuzhmalZXRHgt8SMfNxgtvDXb8B78c6iZY8jThs3d0fDXhVHbrDUI6brfysoWtreumAsKS25Yy5LjxA4Y8ZxmogHeYtuAC2ZqvkCLBQGBzhKKwxlKXgXoC6gZ6fcEgk2YD9Q0+ogHbHbedIRbVeH/sGa+YHTjMnfY6iaV13/BCtsgSkzid98lMVRiM8tmu5gmfRAe6jL87+/nK05WZXTvt17Zxnbw0TiB1G38hNc8QO7ExIRgfaAwgJhAB8uFtn/fJ+QJrVcZOhsmP6icamFhRljE/n4JEWG1/NgjuJReTQqTiVtStOOvrinBIshYf5bkzOsoFkrYLMZXzOF6LSiwo9GA=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4c276b3e-1b91-4760-8956-08dc8c95ce1d
X-MS-Exchange-CrossTenant-AuthSource: SN7PR10MB6287.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 17:17:01.6666
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Zu9KFrUo5RgW0Igmp6lyWOffCzIUK+7aFM5oQ9o92/lhK4FDBAMg6QmfD7LXxwoSGDSOEQXlGQXihe12cdcEJPdruXli2KmKF9/JkAKoIww=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB8176
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-14_15,2024-06-14_03,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0
 malwarescore=0 spamscore=0 mlxscore=0 phishscore=0 mlxlogscore=999
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2406140118
X-Proofpoint-GUID: l3YaTr6CDcep0jLCGi63rtYayDKUysdl
X-Proofpoint-ORIG-GUID: l3YaTr6CDcep0jLCGi63rtYayDKUysdl

When CONFIG_BUILTIN_MODULE_RANGES is enabled, the modules.builtin.ranges
file should be installed in the module install location.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Reviewed-by: Nick Alcock <nick.alcock@oracle.com>
---
Changes since v3:
 - Only install modules.builtin.ranges if CONFIG_BUILTIN_MODULE_RANGES=y
---
 scripts/Makefile.modinst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 0afd75472679..c38bf63a33be 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -30,10 +30,12 @@ $(MODLIB)/modules.order: modules.order FORCE
 quiet_cmd_install_modorder = INSTALL $@
       cmd_install_modorder = sed 's:^\(.*\)\.o$$:kernel/\1.ko:' $< > $@
 
-# Install modules.builtin(.modinfo) even when CONFIG_MODULES is disabled.
+# Install modules.builtin(.modinfo,.ranges) even when CONFIG_MODULES is disabled.
 install-y += $(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo)
 
-$(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo): $(MODLIB)/%: % FORCE
+install-$(CONFIG_BUILTIN_MODULE_RANGES) += $(MODLIB)/modules.builtin.ranges
+
+$(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo modules.builtin.ranges): $(MODLIB)/%: % FORCE
 	$(call cmd,install)
 
 endif
-- 
2.45.1