From nobody Sun Feb 8 23:01:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763731449; cv=none; d=zohomail.com; s=zohoarc; b=PARduzk6QnoqKjIrS3bWmhE9WCpfFyurHMDzKr4QZqQ+i2yy+NVkKBrnn+ScvDV9R6siXxC+uYEjFkiP8I66OYUo2/7hdOYGkivVnRyS/mGOmsr1iEi6JPmWShB2lOAHqpAQQijRjeVLbYbz5aUlYEVRqhz2Iq0bLH/B69HRx3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763731449; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6IHGZClk/KYaiG3r2nLzBNmUn7FuRkkHZ6zOcK9gZrU=; b=MVXZlIzAU9HkiIqi9QC9Dp7+T3ot96I37wszzhY3SQDzvnxULZ2yw33C0e1FRLJWukM/HdgvNchHEkYLnaHw7oGdloIkbNgxsx8lTVqcaWsitNtmk1rR5lw11v8FTzExqkEeheq+vSv6WGi42nEbZnslVgdqG7toVcRXPPcrxPQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763731449330543.2664174382173; Fri, 21 Nov 2025 05:24:09 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1169202.1495006 (Exim 4.92) (envelope-from ) id 1vMR71-0006U4-H9; Fri, 21 Nov 2025 13:23:43 +0000 Received: by outflank-mailman (output) from mailman id 1169202.1495006; Fri, 21 Nov 2025 13:23:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vMR71-0006Tx-EJ; Fri, 21 Nov 2025 13:23:43 +0000 Received: by outflank-mailman (input) for mailman id 1169202; Fri, 21 Nov 2025 13:23:42 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vMR70-0006Tj-Go for xen-devel@lists.xenproject.org; Fri, 21 Nov 2025 13:23:42 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4bcfe626-c6dd-11f0-9d18-b5c5bf9af7f9; Fri, 21 Nov 2025 14:23:41 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D963321289; Fri, 21 Nov 2025 13:23:40 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8BAAC3EA61; Fri, 21 Nov 2025 13:23:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id z798INxnIGkkVQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:23:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4bcfe626-c6dd-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763731420; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6IHGZClk/KYaiG3r2nLzBNmUn7FuRkkHZ6zOcK9gZrU=; b=Iuqc9UN8LcQcX89oU+wk0GG2gsxQRqQocGi5YyIVig8C1RmzHhQvU58mMZRK9VP/XPRZQm 6PAPoJhVWpkJPKHo76nAZEOyJTfvUSSIa5HdbWmWxOFFNnjrnIwU7qGZdEX28n3jTfHDCS TrqoZAP1AlYZznZNCDoxDWykPqshdjM= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763731420; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6IHGZClk/KYaiG3r2nLzBNmUn7FuRkkHZ6zOcK9gZrU=; b=Iuqc9UN8LcQcX89oU+wk0GG2gsxQRqQocGi5YyIVig8C1RmzHhQvU58mMZRK9VP/XPRZQm 6PAPoJhVWpkJPKHo76nAZEOyJTfvUSSIa5HdbWmWxOFFNnjrnIwU7qGZdEX28n3jTfHDCS TrqoZAP1AlYZznZNCDoxDWykPqshdjM= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v3 1/4] build: add make macro for making file from file.in Date: Fri, 21 Nov 2025 14:23:29 +0100 Message-ID: <20251121132332.23514-2-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251121132332.23514-1-jgross@suse.com> References: <20251121132332.23514-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:mid,suse.com:email]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_SEVEN(0.00)[9]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1763731451850018900 Content-Type: text/plain; charset="utf-8" Add a new make macro for creating from .in at build time. To be used like this: $(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) This can be used instead of the current approach to perform the similar step for file.in during ./configure. This will avoid having to run ./configure just because of modifying a file depending on a variable set by configure. Prepare to have multiple files as source for the replacement patterns. Signed-off-by: Juergen Gross --- V2: - don't use pattern rule, but create explicit dependency in macro, don't require to rename source files (Jan Beulich, Andrew Cooper) V3: - prepare for $(PATH_FILES) to be extended by other Makefile - let generated file depend on $(INC_FILES) --- Config.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Config.mk b/Config.mk index e1556dfbfa..39e8007b9c 100644 --- a/Config.mk +++ b/Config.mk @@ -159,6 +159,19 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef =20 +PATH_FILES :=3D Paths +INC_FILES =3D $(foreach f, $(PATH_FILES), $(XEN_ROOT)/config/$(f).mk) + +include $(INC_FILES) + +BUILD_MAKE_VARS =3D $(foreach f, $(PATH_FILES), $(shell awk '$$2 =3D=3D ":= =3D" { print $$1; }' $(XEN_ROOT)/config/$(f).mk.in)) + +# Replace @xxx@ markers in $(1).in with $(xxx) variable contents, write to= $(1) +define apply-build-vars + $(1): $(1).in $$(INC_FILES) + sed $$(foreach v, $$(BUILD_MAKE_VARS), -e 's#@$$(v)@#$$($$(v))#g') <$$< >= $$@ +endef + CFLAGS +=3D -fno-strict-aliasing =20 CFLAGS +=3D -std=3Dgnu99 --=20 2.51.0 From nobody Sun Feb 8 23:01:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763731450; cv=none; d=zohomail.com; s=zohoarc; b=aEBaPZN3+Ws53Dpzf0K0fzfi27BrXF896v8pKZAzFBS4KeSBLXrnd9paXy+gEiolwCKALvNrCMvgiRT5JnuNZZFPlDS5MQHJcoeMIA4r3AHKjXlFaxQYGq6KqUJA7cD3p3AD6kkpETTCzI/xXnVOkgM3rxjXt6Ro54q7e0yt8X4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763731450; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CkRKojTRFnPJl1IrQaG507FF4g4A7BM7UpW5MiCRfuo=; b=AV3/Pd5pfhB8Nb6QLRFFaJbn5T2Ts1goCfnvtKfZSpX8efjs/dvYzwwA4+UjlpMPaviB3x7U4E8QjeFNDCAbGzRKRDUjWlLvTochCZOlATnrx2EqbPHT8V1iXnRg7Qj87lXMziazGoA5hoQ4FuzxeJErInJCX19VOic8DkorUWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763731450554454.3852524034037; Fri, 21 Nov 2025 05:24:10 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1169203.1495017 (Exim 4.92) (envelope-from ) id 1vMR78-0006ll-OM; Fri, 21 Nov 2025 13:23:50 +0000 Received: by outflank-mailman (output) from mailman id 1169203.1495017; Fri, 21 Nov 2025 13:23:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vMR78-0006lc-Kq; Fri, 21 Nov 2025 13:23:50 +0000 Received: by outflank-mailman (input) for mailman id 1169203; Fri, 21 Nov 2025 13:23:49 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vMR76-0006GA-Uj for xen-devel@lists.xenproject.org; Fri, 21 Nov 2025 13:23:48 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [2a07:de40:b251:101:10:150:64:2]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 4f44fd28-c6dd-11f0-980a-7dc792cee155; Fri, 21 Nov 2025 14:23:47 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 74F6D20FF4; Fri, 21 Nov 2025 13:23:46 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4BC453EA61; Fri, 21 Nov 2025 13:23:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id UaHHEOJnIGmrVQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:23:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4f44fd28-c6dd-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763731426; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CkRKojTRFnPJl1IrQaG507FF4g4A7BM7UpW5MiCRfuo=; b=cqbxdF/sDjzBGE+do8eQtg0T0biRoNDx+EkW5K9m5S1AF/oung6veRtkNSIefBR6Yya/aa ASYuYkgWkdp+Z/rjNhqRJY2/qcOo0EA2TtsJsa07wsaYLXzskvMe13cwxiKZAl/JZYRZor kQpZvpKs8lcpGmxeHk3h7g7fZ8Nz4rc= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b="cqbxdF/s" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763731426; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CkRKojTRFnPJl1IrQaG507FF4g4A7BM7UpW5MiCRfuo=; b=cqbxdF/sDjzBGE+do8eQtg0T0biRoNDx+EkW5K9m5S1AF/oung6veRtkNSIefBR6Yya/aa ASYuYkgWkdp+Z/rjNhqRJY2/qcOo0EA2TtsJsa07wsaYLXzskvMe13cwxiKZAl/JZYRZor kQpZvpKs8lcpGmxeHk3h7g7fZ8Nz4rc= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Anthony PERARD Subject: [PATCH v3 2/4] docs: replace @xxx@ markers at build time Date: Fri, 21 Nov 2025 14:23:30 +0100 Message-ID: <20251121132332.23514-3-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251121132332.23514-1-jgross@suse.com> References: <20251121132332.23514-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 74F6D20FF4 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid,suse.com:dkim]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1763731452541018900 Content-Type: text/plain; charset="utf-8" Use the apply-build-vars make macro to replace the @xxx@ markers in *.in files only at build time. This allows to change the affected document files without having to run "configure" for making the change effective. While at it add the generated files to the distclean make target. Signed-off-by: Juergen Gross --- V2: - don't rename source files V3: - rename IN_FILES to IN_TARGETS (Jan Beulich) - add only one file to IN_TARGETS per line (Andrew Cooper) - use $(RM) instead of rm -f (Andrew Cooper) --- docs/Makefile | 11 ++++++++++- docs/configure | 7 +------ docs/configure.ac | 9 +-------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 37776d303c..8e68300e3b 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -8,8 +8,14 @@ DATE :=3D $(call date,"+%Y-%m-%d") DOC_ARCHES :=3D arm ppc riscv x86_32 x86_64 MAN_SECTIONS :=3D 1 5 7 8 =20 +IN_TARGETS :=3D man/xl-disk-configuration.5.pod +IN_TARGETS +=3D man/xl-network-configuration.5.pod +IN_TARGETS +=3D man/xl.1.pod +IN_TARGETS +=3D man/xl.cfg.5.pod +IN_TARGETS +=3D man/xl.conf.5.pod + # Documentation sources to build -MAN-SRC-y :=3D $(sort $(basename $(wildcard man/*.pod man/*.pandoc))) +MAN-SRC-y :=3D $(sort $(basename $(wildcard man/*.pod man/*.pandoc) $(IN_T= ARGETS))) =20 RST-SRC-y :=3D $(sort $(filter-out %index.rst,$(shell find * -type f -name= '*.rst' -print))) =20 @@ -77,11 +83,14 @@ clean: clean-man-pages distclean: clean rm -rf $(XEN_ROOT)/config/Docs.mk config.log config.status config.cache \ autom4te.cache + $(RM) $(IN_TARGETS) =20 # Top level install targets =20 .PHONY: man-pages install-man-pages clean-man-pages uninstall-man-pages =20 +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + # Metarules for generating manpages. Run with $(1) substitued for section define GENERATE_MANPAGE_RULES =20 diff --git a/docs/configure b/docs/configure index 98dda3cd0f..8871914dcb 100755 --- a/docs/configure +++ b/docs/configure @@ -1794,7 +1794,7 @@ ac_compiler_gnu=3D$ac_cv_c_compiler_gnu =20 =20 =20 -ac_config_files=3D"$ac_config_files ../config/Docs.mk man/xl.cfg.5.pod man= /xl.1.pod man/xl-disk-configuration.5.pod man/xl-network-configuration.5.po= d man/xl.conf.5.pod" +ac_config_files=3D"$ac_config_files ../config/Docs.mk" =20 =20 =20 @@ -3063,11 +3063,6 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Docs.mk") CONFIG_FILES=3D"$CONFIG_FILES ../config/Docs.mk" = ;; - "man/xl.cfg.5.pod") CONFIG_FILES=3D"$CONFIG_FILES man/xl.cfg.5.pod" ;; - "man/xl.1.pod") CONFIG_FILES=3D"$CONFIG_FILES man/xl.1.pod" ;; - "man/xl-disk-configuration.5.pod") CONFIG_FILES=3D"$CONFIG_FILES man/x= l-disk-configuration.5.pod" ;; - "man/xl-network-configuration.5.pod") CONFIG_FILES=3D"$CONFIG_FILES ma= n/xl-network-configuration.5.pod" ;; - "man/xl.conf.5.pod") CONFIG_FILES=3D"$CONFIG_FILES man/xl.conf.5.pod" = ;; =20 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/docs/configure.ac b/docs/configure.ac index c2e5edd3b3..43dc516056 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -5,14 +5,7 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor Documentation], m4_esyscmd([../version.sh ../xen/M= akefile]), [xen-devel@lists.xen.org], [xen], [https://www.xen.org/]) AC_CONFIG_SRCDIR([misc/xen-command-line.pandoc]) -AC_CONFIG_FILES([ -../config/Docs.mk -man/xl.cfg.5.pod -man/xl.1.pod -man/xl-disk-configuration.5.pod -man/xl-network-configuration.5.pod -man/xl.conf.5.pod -]) +AC_CONFIG_FILES([../config/Docs.mk]) AC_CONFIG_AUX_DIR([../]) =20 # M4 Macro includes --=20 2.51.0 From nobody Sun Feb 8 23:01:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763731454; cv=none; d=zohomail.com; s=zohoarc; b=lUVo+CYv61OqfgHTHMBY84/P3HcH+qmYp+H8dvESywFgbvKLp5Xc4K36+khhG4uoAowTokhEovb20MBFWe79Z8H0zjl8nDv6blg3M8zqEwmMwV4MrPR5TfWBe1a5kkKoLSifjPaquwvSKJxJ+XNPS7DK/9/bQRxAB3XfmLL+tqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763731454; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5HfPyk2SmSsnfHk+oKinm7kif7+gloN22+4AVob9AOM=; b=nYhH4OtlY/ojA5Hbuk4woy8fHSm8P+VxTCldozIKQ+Zp7nwRnGAGFFAwXgDFYWytCmBZ2smfwDrg1q4gYd4yXFlwMswp2XQxFkYCLsLWe1GybH9dUVSIVp8Oub9KCFdFMqwimykai1rKWAWpowDgGNdL73NGxV8G0/sfgqfMtCY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763731454427257.542818490581; Fri, 21 Nov 2025 05:24:14 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1169205.1495026 (Exim 4.92) (envelope-from ) id 1vMR7C-00073K-4M; Fri, 21 Nov 2025 13:23:54 +0000 Received: by outflank-mailman (output) from mailman id 1169205.1495026; Fri, 21 Nov 2025 13:23:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vMR7C-00073B-1i; Fri, 21 Nov 2025 13:23:54 +0000 Received: by outflank-mailman (input) for mailman id 1169205; Fri, 21 Nov 2025 13:23:53 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vMR7B-0006Tj-0F for xen-devel@lists.xenproject.org; Fri, 21 Nov 2025 13:23:53 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2a07:de40:b251:101:10:150:64:1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5272ce02-c6dd-11f0-9d18-b5c5bf9af7f9; Fri, 21 Nov 2025 14:23:52 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 05A6121236; Fri, 21 Nov 2025 13:23:52 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D7B903EA61; Fri, 21 Nov 2025 13:23:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id WXA3M+dnIGnLVQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:23:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5272ce02-c6dd-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763731432; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5HfPyk2SmSsnfHk+oKinm7kif7+gloN22+4AVob9AOM=; b=a9E+l7BQZo+k+wvJys7spwMmi9feCl9uWjs6V6p2I0vC4z86HyXnJj2Egi3FH39cTiANKH DAxfh9iyzB/x9ir8Ms/ELRaWAUuUnyTbnCgehkm+Z49lfekGOmbaMnEUXyXvzHDtJgvULw Jk0iI73/jFEvytkpN3RvmqJRqvqU+W0= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763731432; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5HfPyk2SmSsnfHk+oKinm7kif7+gloN22+4AVob9AOM=; b=a9E+l7BQZo+k+wvJys7spwMmi9feCl9uWjs6V6p2I0vC4z86HyXnJj2Egi3FH39cTiANKH DAxfh9iyzB/x9ir8Ms/ELRaWAUuUnyTbnCgehkm+Z49lfekGOmbaMnEUXyXvzHDtJgvULw Jk0iI73/jFEvytkpN3RvmqJRqvqU+W0= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Anthony PERARD Subject: [PATCH v3 3/4] config: remove unused paths from config/Paths.mk.in Date: Fri, 21 Nov 2025 14:23:31 +0100 Message-ID: <20251121132332.23514-4-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251121132332.23514-1-jgross@suse.com> References: <20251121132332.23514-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid] X-Spam-Flag: NO X-Spam-Score: -2.80 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1763731456551018900 Content-Type: text/plain; charset="utf-8" Some paths in config/Paths.mk.in are used nowhere, so remove them. Signed-off-by: Juergen Gross --- V3: - remove htmldir, too (Andrew Cooper) --- config/Paths.mk.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index bc42748b7a..6aa392b9f2 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -20,10 +20,6 @@ libexecdir :=3D @libexecdir@ datarootdir :=3D @datarootdir@ mandir :=3D @mandir@ docdir :=3D @docdir@ -dvidir :=3D @dvidir@ -htmldir :=3D @htmldir@ -pdfdir :=3D @pdfdir@ -psdir :=3D @psdir@ includedir :=3D @includedir@ localstatedir :=3D @localstatedir@ sysconfdir :=3D @sysconfdir@ @@ -34,8 +30,6 @@ LIBEXEC_LIB :=3D @LIBEXEC_LIB@ LIBEXEC_INC :=3D @LIBEXEC_INC@ =20 SHAREDIR :=3D @SHAREDIR@ -MAN1DIR :=3D $(mandir)/man1 -MAN8DIR :=3D $(mandir)/man8 =20 XEN_RUN_DIR :=3D @XEN_RUN_DIR@ XEN_LOG_DIR :=3D @XEN_LOG_DIR@ --=20 2.51.0 From nobody Sun Feb 8 23:01:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763731455; cv=none; d=zohomail.com; s=zohoarc; b=Ek4rFsEC56mRXU247c6dPX2tdo2OrxppWc51ZkWruDS5NbR1DT59DCRSIdP5VKPWcJ75Ytac9+L85YeiS2stuTTulGrSQ29di2OEuQNBbx3JaeLrdH3kSksicQkDWirgxrx49zQENAz/cPme8f6KYy/z+FErbNBzAgkVJ4dBN50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763731455; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mTXx2nXJy3NDD3WyLkj5aeUH5vd0fwILn2bvkWmgeB4=; b=A4F/MLrB08fZBazTDlsGXcG9JhNuY8Wqrm9xQ6jdcaFplknxgxdW09NoMa80q5PcsOLMwhx0C+3NBuBxQ4H5DJ1rB7lCO7802FvtINn0m23+ax07R/sWWMvqPSw3KL1bOkyDlHcag/7QPWz8aSQ7RPOG5X/pZ5OYjZxgCfBvkuw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763731455286248.87707562252353; Fri, 21 Nov 2025 05:24:15 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1169214.1495037 (Exim 4.92) (envelope-from ) id 1vMR7K-0007WR-Da; Fri, 21 Nov 2025 13:24:02 +0000 Received: by outflank-mailman (output) from mailman id 1169214.1495037; Fri, 21 Nov 2025 13:24:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vMR7K-0007WH-Ae; Fri, 21 Nov 2025 13:24:02 +0000 Received: by outflank-mailman (input) for mailman id 1169214; Fri, 21 Nov 2025 13:24:01 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vMR7J-0006GA-Ie for xen-devel@lists.xenproject.org; Fri, 21 Nov 2025 13:24:01 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [2a07:de40:b251:101:10:150:64:2]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 56c8081e-c6dd-11f0-980a-7dc792cee155; Fri, 21 Nov 2025 14:23:59 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C810520FD7; Fri, 21 Nov 2025 13:23:57 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 704D53EA61; Fri, 21 Nov 2025 13:23:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id Dbm4Ge1nIGnVVQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:23:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 56c8081e-c6dd-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763731439; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mTXx2nXJy3NDD3WyLkj5aeUH5vd0fwILn2bvkWmgeB4=; b=l4vcmY4Q6V9zEtXsARQtx6nMiByEU6XAn/EbnJ1fhaomvYNsP2b/VlzWOIqte2RjZ4LmrW ggf62tRotAA7qrPxEd+gb6mhZ6Dpzg+e22Lhb84Nt8UCoQNYpPVypmQVpgjPRosyeY+6Qa iBNyeEHbq+wfuxEeFv6Vxk2vdCycoh0= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=nKptOczk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763731437; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mTXx2nXJy3NDD3WyLkj5aeUH5vd0fwILn2bvkWmgeB4=; b=nKptOczkd76omXXxPpuSnWp//mL0e/RwOC9bAY5FxaNbOZmo/DVMNcESrpm+h1mmrik6e1 gh2NsC8tzjwgJFBGip1/h5CcveWdDw+6UpaLQ5k2LWwZmTAC2NLWdvm/tJmI84vIh2sKhG 9P7HBQuSwR55BXGMdGtN4MWkUpdM83U= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Christian Lindig , David Scott Subject: [PATCH v3 4/4] tools: replace @xxx@ markers at build time Date: Fri, 21 Nov 2025 14:23:32 +0100 Message-ID: <20251121132332.23514-5-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251121132332.23514-1-jgross@suse.com> References: <20251121132332.23514-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Spam-Flag: NO X-Rspamd-Queue-Id: C810520FD7 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_SEVEN(0.00)[11]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.com:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.com:dkim,suse.com:mid,suse.com:email] X-Spam-Score: -3.01 X-ZohoMail-DKIM: pass (identity @suse.com) (identity @suse.com) X-ZM-MESSAGEID: 1763731456825018900 Content-Type: text/plain; charset="utf-8" Use the apply-build-vars make macro to replace the @xxx@ markers in most *.in files only at build time. As some of the markers are local to tools/configure, introduce config/Tools-paths.mk.in and add the related make variables to it. Add Tools-paths to the PATH_FILES make variable in order to include the definitions for replacing them in the *.in files. Add the generated files to the distclean target. Signed-off-by: Juergen Gross --- V2: - don't rename source files V3: - add Tools-paths to PATH_FILES only in tools/Rules.mk (Jan Beulich) - rename IN_FILES to IN_TARGETS (Jan Beulich) - add only one file to IN_TARGETS per line (Andrew Cooper) - add build target depending on generated files (Andrew Cooper) - use $(RM) instead of rm -f (Andrew Cooper) --- .gitignore | 1 + config/Tools-paths.mk.in | 10 ++++++++++ tools/Rules.mk | 4 ++++ tools/configure | 21 ++------------------- tools/configure.ac | 19 +------------------ tools/hotplug/FreeBSD/Makefile | 13 +++++++++++-- tools/hotplug/Linux/Makefile | 21 +++++++++++++++++++-- tools/hotplug/NetBSD/Makefile | 13 +++++++++++-- tools/hotplug/common/Makefile | 10 +++++++++- tools/ocaml/libs/xs/Makefile | 9 +++++++++ tools/ocaml/xenstored/Makefile | 10 +++++++++- 11 files changed, 86 insertions(+), 45 deletions(-) create mode 100644 config/Tools-paths.mk.in diff --git a/.gitignore b/.gitignore index d83427aba8..57d54f676f 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ config.status config.cache config/Toplevel.mk config/Paths.mk +config/Tools-paths.mk =20 dist/* extras/ diff --git a/config/Tools-paths.mk.in b/config/Tools-paths.mk.in new file mode 100644 index 0000000000..ac6298e761 --- /dev/null +++ b/config/Tools-paths.mk.in @@ -0,0 +1,10 @@ +-include $(XEN_ROOT)/config/Paths.mk + +XENSTORED :=3D @XENSTORED@ +XENSTORED_KVA :=3D @XENSTORED_KVA@ +XENSTORED_PORT :=3D @XENSTORED_PORT@ +XEN_RUN_STORED :=3D @XEN_RUN_STORED@ + +LINUX_BACKEND_MODULES :=3D @LINUX_BACKEND_MODULES@ + +qemu_xen_path :=3D @qemu_xen_path@ diff --git a/tools/Rules.mk b/tools/Rules.mk index 725c3c32e9..c3afc836ba 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -11,6 +11,10 @@ XEN_FULLVERSION=3D$(shell env \ XEN_VENDORVERSION=3D$(XEN_VENDORVERSION) \ $(SHELL) $(XEN_ROOT)/version.sh --full $(XEN_ROOT)/xen/Makefile) =20 +PATH_FILES +=3D Tools-paths + +-include $(XEN_ROOT)/config/Tools-paths.mk + export _INSTALL :=3D $(INSTALL) INSTALL =3D $(XEN_ROOT)/tools/cross-install =20 diff --git a/tools/configure b/tools/configure index 3111f5688c..479c7c9a3c 100755 --- a/tools/configure +++ b/tools/configure @@ -2742,7 +2742,7 @@ ac_compiler_gnu=3D$ac_cv_c_compiler_gnu =20 =20 =20 -ac_config_files=3D"$ac_config_files ../config/Tools.mk hotplug/common/hotp= lugpath.sh hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdo= main hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/sysconf= ig.xendomains hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencom= mons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain h= otplug/Linux/launch-xenstore hotplug/Linux/vif-setup hotplug/Linux/xen-hotp= lug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotpl= ug/NetBSD/rc.d/xendriverdomain ocaml/libs/xs/paths.ml ocaml/xenstored/paths= .ml ocaml/xenstored/oxenstored.conf" +ac_config_files=3D"$ac_config_files ../config/Tools.mk ../config/Tools-pat= hs.mk" =20 ac_config_headers=3D"$ac_config_headers config.h" =20 @@ -11268,24 +11268,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Tools.mk") CONFIG_FILES=3D"$CONFIG_FILES ../config/Tools.mk= " ;; - "hotplug/common/hotplugpath.sh") CONFIG_FILES=3D"$CONFIG_FILES hotplug= /common/hotplugpath.sh" ;; - "hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES=3D"$CONFIG_FILES hotpl= ug/FreeBSD/rc.d/xencommons" ;; - "hotplug/FreeBSD/rc.d/xendriverdomain") CONFIG_FILES=3D"$CONFIG_FILES = hotplug/FreeBSD/rc.d/xendriverdomain" ;; - "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES=3D"$CONFIG_F= ILES hotplug/Linux/init.d/sysconfig.xencommons" ;; - "hotplug/Linux/init.d/sysconfig.xendomains") CONFIG_FILES=3D"$CONFIG_F= ILES hotplug/Linux/init.d/sysconfig.xendomains" ;; - "hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES=3D"$CONFIG_FILES hot= plug/Linux/init.d/xen-watchdog" ;; - "hotplug/Linux/init.d/xencommons") CONFIG_FILES=3D"$CONFIG_FILES hotpl= ug/Linux/init.d/xencommons" ;; - "hotplug/Linux/init.d/xendomains") CONFIG_FILES=3D"$CONFIG_FILES hotpl= ug/Linux/init.d/xendomains" ;; - "hotplug/Linux/init.d/xendriverdomain") CONFIG_FILES=3D"$CONFIG_FILES = hotplug/Linux/init.d/xendriverdomain" ;; - "hotplug/Linux/launch-xenstore") CONFIG_FILES=3D"$CONFIG_FILES hotplug= /Linux/launch-xenstore" ;; - "hotplug/Linux/vif-setup") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux= /vif-setup" ;; - "hotplug/Linux/xen-hotplug-common.sh") CONFIG_FILES=3D"$CONFIG_FILES h= otplug/Linux/xen-hotplug-common.sh" ;; - "hotplug/Linux/xendomains") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linu= x/xendomains" ;; - "hotplug/NetBSD/rc.d/xencommons") CONFIG_FILES=3D"$CONFIG_FILES hotplu= g/NetBSD/rc.d/xencommons" ;; - "hotplug/NetBSD/rc.d/xendriverdomain") CONFIG_FILES=3D"$CONFIG_FILES h= otplug/NetBSD/rc.d/xendriverdomain" ;; - "ocaml/libs/xs/paths.ml") CONFIG_FILES=3D"$CONFIG_FILES ocaml/libs/xs/= paths.ml" ;; - "ocaml/xenstored/paths.ml") CONFIG_FILES=3D"$CONFIG_FILES ocaml/xensto= red/paths.ml" ;; - "ocaml/xenstored/oxenstored.conf") CONFIG_FILES=3D"$CONFIG_FILES ocaml= /xenstored/oxenstored.conf" ;; + "../config/Tools-paths.mk") CONFIG_FILES=3D"$CONFIG_FILES ../config/To= ols-paths.mk" ;; "config.h") CONFIG_HEADERS=3D"$CONFIG_HEADERS config.h" ;; "hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES=3D"$CONFIG_FILES = hotplug/Linux/systemd/proc-xen.mount" ;; "hotplug/Linux/systemd/xen-init-dom0.service") CONFIG_FILES=3D"$CONFIG= _FILES hotplug/Linux/systemd/xen-init-dom0.service" ;; diff --git a/tools/configure.ac b/tools/configure.ac index 285b4ea128..ecd45e782e 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -7,24 +7,7 @@ AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh = ../xen/Makefile]), AC_CONFIG_SRCDIR([libs/light/libxl.c]) AC_CONFIG_FILES([ ../config/Tools.mk -hotplug/common/hotplugpath.sh -hotplug/FreeBSD/rc.d/xencommons -hotplug/FreeBSD/rc.d/xendriverdomain -hotplug/Linux/init.d/sysconfig.xencommons -hotplug/Linux/init.d/sysconfig.xendomains -hotplug/Linux/init.d/xen-watchdog -hotplug/Linux/init.d/xencommons -hotplug/Linux/init.d/xendomains -hotplug/Linux/init.d/xendriverdomain -hotplug/Linux/launch-xenstore -hotplug/Linux/vif-setup -hotplug/Linux/xen-hotplug-common.sh -hotplug/Linux/xendomains -hotplug/NetBSD/rc.d/xencommons -hotplug/NetBSD/rc.d/xendriverdomain -ocaml/libs/xs/paths.ml -ocaml/xenstored/paths.ml -ocaml/xenstored/oxenstored.conf +../config/Tools-paths.mk ]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile index a6552c9884..a7c1c461ef 100644 --- a/tools/hotplug/FreeBSD/Makefile +++ b/tools/hotplug/FreeBSD/Makefile @@ -8,9 +8,17 @@ XEN_SCRIPT_DATA :=3D =20 XEN_RCD_PROG :=3D rc.d/xencommons rc.d/xendriverdomain =20 +IN_TARGETS :=3D rc.d/xencommons +IN_TARGETS +=3D rc.d/xendriverdomain + .PHONY: all all: =20 +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +.PHONY: build +build: $(IN_TARGETS) + .PHONY: install install: install-scripts install-rcd =20 @@ -18,7 +26,7 @@ install: install-scripts install-rcd uninstall: uninstall-script uninstall-rcd =20 .PHONY: install-scripts -install-scripts: +install-scripts: build $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ @@ -35,7 +43,7 @@ uninstall-scripts: rm -f $(addprefix $(DESTDIR)$(XEN_SCRIPT_DIR)/, $(XEN_SCRIPT_DATA)) =20 .PHONY: install-rcd -install-rcd: +install-rcd: build $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) set -e; for i in $(XEN_RCD_PROG); \ do \ @@ -51,3 +59,4 @@ clean: =20 .PHONY: distclean distclean: clean + $(RM) $(IN_TARGETS) diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 9a7b3a3515..b60e39e1cd 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -26,9 +26,25 @@ XEN_SCRIPT_DATA :=3D xen-script-common.sh locking.sh log= ging.sh XEN_SCRIPT_DATA +=3D xen-hotplug-common.sh xen-network-common.sh vif-commo= n.sh XEN_SCRIPT_DATA +=3D block-common.sh =20 +IN_TARGETS :=3D launch-xenstore +IN_TARGETS +=3D vif-setup +IN_TARGETS +=3D xendomains +IN_TARGETS +=3D xen-hotplug-common.sh +IN_TARGETS +=3D init.d/sysconfig.xendomains +IN_TARGETS +=3D init.d/xen-watchdog +IN_TARGETS +=3D init.d/xencommons +IN_TARGETS +=3D init.d/xendomains +IN_TARGETS +=3D init.d/xendriverdomain +IN_TARGETS +=3D init.d/sysconfig.xencommons + .PHONY: all all: subdirs-all =20 +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +.PHONY: build +build: $(IN_TARGETS) + .PHONY: install install: install-initd install-scripts subdirs-install =20 @@ -37,7 +53,7 @@ uninstall: uninstall-initd uninstall-scripts subdirs-unin= stall =20 # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd -install-initd: +install-initd: build $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -60,7 +76,7 @@ uninstall-initd: rm -f $(DESTDIR)$(SYSCONFIG_DIR)/xendomains =20 .PHONY: install-scripts -install-scripts: +install-scripts: build $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ @@ -81,3 +97,4 @@ clean: subdirs-clean =20 .PHONY: distclean distclean: clean + $(RM) $(IN_TARGETS) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 1cd3db2ccb..8ae788131e 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -12,9 +12,17 @@ XEN_SCRIPTS +=3D qemu-ifup XEN_SCRIPT_DATA :=3D XEN_RCD_PROG :=3D rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/x= endriverdomain =20 +IN_TARGETS :=3D rc.d/xencommons +IN_TARGETS +=3D rc.d/xendriverdomain + .PHONY: all all: =20 +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +.PHONY: build +build: $(IN_TARGETS) + .PHONY: install install: install-scripts install-rcd =20 @@ -22,7 +30,7 @@ install: install-scripts install-rcd uninstall: uninstall-scripts uninstall-rcd =20 .PHONY: install-scripts -install-scripts: +install-scripts: build $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ @@ -39,7 +47,7 @@ uninstall-scripts: rm -f $(addprefix $(DESTDIR)$(XEN_SCRIPT_DIR)/, $(XEN_SCRIPT_DATA)) =20 .PHONY: install-rcd -install-rcd: +install-rcd: build $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) set -e; for i in $(XEN_RCD_PROG); \ do \ @@ -57,3 +65,4 @@ clean: =20 .PHONY: distclean distclean: clean + $(RM) $(IN_TARGETS) diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile index 62afe1019e..3b0b5a0296 100644 --- a/tools/hotplug/common/Makefile +++ b/tools/hotplug/common/Makefile @@ -7,8 +7,15 @@ include $(XEN_ROOT)/tools/Rules.mk XEN_SCRIPTS :=3D XEN_SCRIPT_DATA :=3D hotplugpath.sh =20 +IN_TARGETS :=3D hotplugpath.sh + .PHONY: all -all: +all: build + +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +.PHONY: build +build: $(IN_TARGETS) =20 .PHONY: install install: install-scripts @@ -38,3 +45,4 @@ clean: =20 .PHONY: distclean distclean: clean + $(RM) $(IN_TARGETS) diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile index e160e6a711..b0963611fb 100644 --- a/tools/ocaml/libs/xs/Makefile +++ b/tools/ocaml/libs/xs/Makefile @@ -8,6 +8,8 @@ OCAMLOPTFLAGS +=3D -for-pack Xenstore .NOTPARALLEL: # Ocaml is such a PITA! =20 +IN_TARGETS :=3D paths.ml + PREINTF =3D xsraw.cmi xst.cmi PREOBJS =3D queueop xsraw xst PRELIBS =3D $(foreach obj, $(PREOBJS),$(obj).cmo) $(foreach obj,$(PREOJBS)= ,$(obj).cmx) @@ -17,6 +19,10 @@ LIBS =3D xenstore.cma xenstore.cmxa =20 all: $(PREINTF) $(PRELIBS) $(INTF) $(LIBS) $(PROGRAMS) =20 +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) + +$(OBJS): $(IN_TARGETS) + bins: $(PROGRAMS) =20 libs: $(LIBS) @@ -43,4 +49,7 @@ install: $(LIBS) META uninstall: $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore =20 +.PHONY: distclean + $(RM) $(IN_TARGETS) + include $(OCAML_TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index c333394a34..b3d1a8b8de 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -72,6 +72,9 @@ XENSTOREDLIBS =3D \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xsd_glue $(OCAML_TOPLEVEL)/libs/x= sd_glue/plugin_interface_v1.cmxa \ -ccopt -L -ccopt $(XEN_ROOT)/tools/libs/ctrl =20 +IN_TARGETS :=3D paths.ml +IN_TARGETS +=3D oxenstored.conf + PROGRAMS =3D oxenstored =20 oxenstored_LIBS =3D $(XENSTOREDLIBS) @@ -83,7 +86,9 @@ oxenstored_OBJS =3D $(oxenstored_MLSORTED:.ml=3D) =20 OCAML_PROGRAM =3D oxenstored =20 -all: $(INTF) $(LIBS) $(PROGRAMS) +all: $(IN_TARGETS) $(INTF) $(LIBS) $(PROGRAMS) + +$(foreach file,$(IN_TARGETS),$(eval $(call apply-build-vars,$(file)))) =20 bins: $(PROGRAMS) =20 @@ -99,4 +104,7 @@ uninstall: rm -f $(DESTDIR)$(XEN_CONFIG_DIR)/oxenstored.conf rm -f $(DESTDIR)$(sbindir)/oxenstored =20 +distclean: + $(RM) $(IN_TARGETS) + include $(OCAML_TOPLEVEL)/Makefile.rules --=20 2.51.0