Re: [PATCH v2 4/4] tools: replace @xxx@ markers at build time

[Jürgen Groß]

On 14.11.25 12:54, Andrew Cooper wrote:

On 14/11/2025 11:32 am, Juergen Gross wrote:

diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile
index a6552c9884..8de923781c 100644
--- a/tools/hotplug/FreeBSD/Makefile
+++ b/tools/hotplug/FreeBSD/Makefile
@@ -51,3 +55,4 @@ clean:

  distclean: clean
+       rm -rf $(IN_FILES)

.PHONY: distclean

In addition to the points in patch 2, can we use $(RM) (which includes
-f IIRC) when adding these.  None of the generated files are
directories, so the -r wants dropping.

Okay.

But again, this is far nicer than v1 overall.

diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index 9a7b3a3515..6fcf84a6f4 100644
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -37,7 +44,7 @@ uninstall: uninstall-initd uninstall-scripts subdirs-uninstall

  .PHONY: install-initd
-install-initd:
+install-initd: $(IN_FILES)
        $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)

# See docs/misc/distro_mapping.txt for INITD_DIR location

Hmm.  Logically, generating the files should be part of the build step,
not the install step.

Agreed. Will change this.


Juergen

OpenPGP_0xB0DE9DD628BF132F.asc
Description: OpenPGP public key

OpenPGP_signature.asc
Description: OpenPGP digital signature