[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 4/4] tools: replace @xxx@ markers at build time
- To: Juergen Gross <jgross@xxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Fri, 14 Nov 2025 11:54:16 +0000
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=D+7YXKWCSILIEXb8JNs06kc3dr+L/tP/IkNr3smpeHk=; b=PGmBokA5RPCF1JhdO94r8w2P6JpSeGSZf2kYS8FKpfrDvwFSgccUtvxWV0yDd/6+5Qgsms0uesjSSDejxJ6INtUS2QXQ2em+I2q3YWGbvdtbV99prnhkaxaXBTn6t+PTvmm3UA25oL2zWgSr4ZVADACJWUYb5XnXU9W/DafMErJfQxyfXVjVXIMHgJm3abieQCBk+fTlDYTqP/Ro/rd1nPEgPhGxW2jLO0s3rOUGQnCNEPmZH2utxJYZcGb+u30NYMpVUMlq58I/sWUHkguDsiTKMyg7WJVqtUL0H1NSvw0tewLRbWR1qL18MCEfW4W2PKOkUBnjyc5QWTMPciGqzQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ab45AB4kFf+6r0weWuxBvDgPOIHvy2zCI65CSECIMuYRvIgGUMiL8u8GP9RoQRKUowkJhN3MiqoQx/2uA+uxBRRsdVKPFWQVsqnlE54O1+KmURdhrMT+MwHlqFfO8WjDffxrL7EABM0FzZk8Hkjn53t1A+Zr23gMTzR6fo9b1w6iWGzqmT0ClVYrU+JaNzezGzfQMP8zWlydf5OG6qHaW0EWqP7uzbdRXQTdFG2EXOwCNaMcRrVdxJG2TbCKetFZ8mvPEWdj9nBWJVOJRBXHvBUdvViNQVFzMeI367vpE9b844MBmVzkqxfbJnqzH3EAQzHy3OwCtWKsoKXLlcAalg==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Anthony PERARD <anthony.perard@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Julien Grall <julien@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Christian Lindig <christian.lindig@xxxxxxxxxx>, David Scott <dave@xxxxxxxxxx>
- Delivery-date: Fri, 14 Nov 2025 11:54:31 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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:
>
> .PHONY: distclean
> distclean: clean
> + rm -rf $(IN_FILES)
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.
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
>
> # See docs/misc/distro_mapping.txt for INITD_DIR location
> .PHONY: install-initd
> -install-initd:
> +install-initd: $(IN_FILES)
> $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
> $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
> $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
Hmm. Logically, generating the files should be part of the build step,
not the install step.
I see you already had to adapt this way for Ocaml, where the generated
files are source files, not just config.
~Andrew
|
