From nobody Wed Nov 19 01:56:08 2025 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=1762878030; cv=none; d=zohomail.com; s=zohoarc; b=m40YpPifLyvOhUgBAnsPV2RM1SqHUdBMdNUciMIHfFVOgFf303h1OrvMWwawu7D9F7shF9ll4p1JxzpwddGfiu7Qob5FCemi4y9tcMjrFJeNgK5gJsSpoQ9mhJ15HInbYO+CiIoC35auUJzzlDqKrCBF0wryEioALuiwwtllPwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762878030; 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=9sxmnTjwEbOo9LTw+g6Xhcgog1RwNkt63wuL1s3lR+k=; b=Zb2ATKEwThDqSCue5zeYAJU8cHrYeP8ocl7Y7IVUWVbrx4fjIrZMxv8B1CuCuf9/hsv/DxZszZ+a8fJj8wyo8tpMmrAcL64xYT4eMrrPAfUqv/W2fpEUKQUoLHFlO3TGW9BfHLCSuQFlHSopivvQwnyy4YS7mjEq/JMVpuVucWo= 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 1762878030143364.43260061613466; Tue, 11 Nov 2025 08:20:30 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1159089.1487494 (Exim 4.92) (envelope-from ) id 1vIr6I-0002Ld-7v; Tue, 11 Nov 2025 16:20:10 +0000 Received: by outflank-mailman (output) from mailman id 1159089.1487494; Tue, 11 Nov 2025 16:20:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vIr6I-0002LW-4z; Tue, 11 Nov 2025 16:20:10 +0000 Received: by outflank-mailman (input) for mailman id 1159089; Tue, 11 Nov 2025 16:20:09 +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 1vIr6H-00027n-4N for xen-devel@lists.xenproject.org; Tue, 11 Nov 2025 16:20:09 +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 4a53aac1-bf1a-11f0-9d18-b5c5bf9af7f9; Tue, 11 Nov 2025 17:20:08 +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-out1.suse.de (Postfix) with ESMTPS id 38DC521CE4; Tue, 11 Nov 2025 16:20:08 +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 CFEB414A47; Tue, 11 Nov 2025 16:20:07 +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 KzMnMTdiE2lDDQAAD6G6ig (envelope-from ); Tue, 11 Nov 2025 16:20:07 +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: 4a53aac1-bf1a-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878008; 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=9sxmnTjwEbOo9LTw+g6Xhcgog1RwNkt63wuL1s3lR+k=; b=sSbz6ggdRUHPgJNvKpQMkLp7A5AgFSdjhbyP4Q3EYxoGIU3pYDYKoInd6QPS0Yr636gBEB 4DU43bl1WTZ+vmr3d3shL1soy0ADrsKzWH/zN6kHhbMpfhraiQFph2+9p6CdPCCDnuDUsQ Y0sUynag83H/BDJeBxGtIU4FmOtoxbM= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=sSbz6ggd DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878008; 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=9sxmnTjwEbOo9LTw+g6Xhcgog1RwNkt63wuL1s3lR+k=; b=sSbz6ggdRUHPgJNvKpQMkLp7A5AgFSdjhbyP4Q3EYxoGIU3pYDYKoInd6QPS0Yr636gBEB 4DU43bl1WTZ+vmr3d3shL1soy0ADrsKzWH/zN6kHhbMpfhraiQFph2+9p6CdPCCDnuDUsQ Y0sUynag83H/BDJeBxGtIU4FmOtoxbM= 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 1/5] config: remove stale definition from Config.mk Date: Tue, 11 Nov 2025 17:19:55 +0100 Message-ID: <20251111161959.13667-2-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111161959.13667-1-jgross@suse.com> References: <20251111161959.13667-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 38DC521CE4 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 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)[]; 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)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(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)[9]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:email,suse.com:mid,suse.com:dkim,config.mk:url]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; 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: 1762878032128153000 Content-Type: text/plain; charset="utf-8" buildmakevars2shellvars is used nowhere, so remove it. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- Config.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Config.mk b/Config.mk index 7edbab8efe..e1556dfbfa 100644 --- a/Config.mk +++ b/Config.mk @@ -149,12 +149,6 @@ else date =3D $(shell LC_ALL=3DC date $(1)) endif =20 -define buildmakevars2shellvars - export PREFIX=3D"$(prefix)"; = \ - export XEN_SCRIPT_DIR=3D"$(XEN_SCRIPT_DIR)"; = \ - export XEN_ROOT=3D"$(XEN_ROOT)" -endef - # # Compare $(1) and $(2) and replace $(2) with $(1) if they differ # --=20 2.51.0 From nobody Wed Nov 19 01:56:08 2025 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=1762878031; cv=none; d=zohomail.com; s=zohoarc; b=NpN3svQcfCr9GYnJ+rV45/4KRtgP0CbNQEdQwTVRyrHEyXyFBERSL+0OauCo21kIrrz9EpaWejSk4s+E58yQ42TtOwNmDSXktY93LQL1Ya5Q5wpon3Uobs1fS0dtTVrUSaSp5fN3p3lPmtTQ4jo8ZPcRYVMwHsTvpw94tGmPqWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762878031; 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=6/icCTTtv5rJ6FYoAuIqJyhSavJniLkM4kKGv1wpb8o=; b=lJcaaN5oAtai97cKJGat/UmZrJ3M+dRfI1Yp+f12bs3uznNeOR/0OXvmX97CEmxKZ6L3p5/6uFFtwX8WXF/Thdh1EwR1r/T6h7iSeXTewA84BbzjHs2csYJZg90oO66bFXwI8z+CsB5N9mbP4eimqDmpXi+nM9OrD98+g/Y5tMc= 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 1762878031483582.330233027892; Tue, 11 Nov 2025 08:20:31 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1159090.1487504 (Exim 4.92) (envelope-from ) id 1vIr6Q-0002fL-Fq; Tue, 11 Nov 2025 16:20:18 +0000 Received: by outflank-mailman (output) from mailman id 1159090.1487504; Tue, 11 Nov 2025 16:20:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vIr6Q-0002fE-CF; Tue, 11 Nov 2025 16:20:18 +0000 Received: by outflank-mailman (input) for mailman id 1159090; Tue, 11 Nov 2025 16:20:16 +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 1vIr6O-0002cf-HU for xen-devel@lists.xenproject.org; Tue, 11 Nov 2025 16:20:16 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 4dc7bffa-bf1a-11f0-980a-7dc792cee155; Tue, 11 Nov 2025 17:20:14 +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-out1.suse.de (Postfix) with ESMTPS id EA1CF21CE5; Tue, 11 Nov 2025 16:20:13 +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 9815A14A47; Tue, 11 Nov 2025 16:20:13 +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 /xtlIz1iE2lYDQAAD6G6ig (envelope-from ); Tue, 11 Nov 2025 16:20:13 +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: 4dc7bffa-bf1a-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878014; 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=6/icCTTtv5rJ6FYoAuIqJyhSavJniLkM4kKGv1wpb8o=; b=emMRyEOJEMR4txVJq43sjPHczZwLu3XjxqJ1ggsiy8mKxM6jFoEpCQDA0UXixoWsnvoLvL 3uk/aZ/Xni/BvdmJcvbkEWHpjJmWXDC2Xpvv/3QgWu34DeKKJ1m31hwywgm49xUFon1f4k e5AbGWFel2dt9MdPB4PGOzTfghmf0Ig= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=tOGIctiu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878013; 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=6/icCTTtv5rJ6FYoAuIqJyhSavJniLkM4kKGv1wpb8o=; b=tOGIctiuADyOGbDT4ZOWRU9iDqJFmnl3cOXk3NsGSXTujVd6V9nTFzpNm/R1qaXxqANtSz tWIm7VFr8wPXL/RbyM0GH515oGnr/pv+gDtXiTHV5V+ntMjeJD0l1cwMbklyjQ7Uc3xgQW kyePb/BXc8kyOapdYScJY3GCOLrv7vk= 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 2/5] build: add new make pattern for making file from file.src Date: Tue, 11 Nov 2025 17:19:56 +0100 Message-ID: <20251111161959.13667-3-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111161959.13667-1-jgross@suse.com> References: <20251111161959.13667-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: EA1CF21CE5 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 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)[]; 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)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(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)[9]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:email,suse.com:mid,suse.com:dkim,config.mk:url]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; 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) (identity @suse.com) X-ZM-MESSAGEID: 1762878032431158500 Content-Type: text/plain; charset="utf-8" Add a new make pattern for creating from .src at build time. Define the recipe as a macro in order to avoid replicating it for cases where it needs to handle subdirectories (creating / from /.src). This can be used instead of the current approach to perform the similar step for file.in during ./configure by renaming the source file to file.src. 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 --- Config.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Config.mk b/Config.mk index e1556dfbfa..0ea1640371 100644 --- a/Config.mk +++ b/Config.mk @@ -159,6 +159,20 @@ 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)) + +define apply-build-vars + sed $(foreach v, $(BUILD_MAKE_VARS), -e 's#@$(v)@#$($(v))#g') <$< >$@ +endef + +%:: %.src + $(apply-build-vars) + CFLAGS +=3D -fno-strict-aliasing =20 CFLAGS +=3D -std=3Dgnu99 --=20 2.51.0 From nobody Wed Nov 19 01:56:08 2025 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=1762878038; cv=none; d=zohomail.com; s=zohoarc; b=fthJVVLsVkDrfHHEIcjhXvTux40y1WUMtBHvhw2f+1wvSjziKUV+e7C+Qcg92pnx7DWRvKBuMKGGuet1/Rr15c2syjJFhfNqRFALGaIZohRmMQY83hpGM8XMkOh9o91stqtqrSx6UyEasPInjp+ZePOFsFR91TFpneYHX8elYyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762878038; 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=a+soXsd5RJ+tn6vw+rsKME/DKU3Va+AYoo0xgD3bolg=; b=IGCZK6Nq3k8jWjxBul6SgEwbYrhHlFy3kE3YEVf4Q85axev1IGrWATF/zjpKT5tfDT+Le3qDlTRNEQRthCNxjh/N/2pq68dLHCNwtgsYhunCeuLs8mIkYmezXGZ6y/s+Hub8C/q/s/9jso7mP+fRdKthy2G/iC4wclkwJGPYeSs= 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 1762878038509953.6792473219194; Tue, 11 Nov 2025 08:20:38 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1159093.1487514 (Exim 4.92) (envelope-from ) id 1vIr6U-0002yE-MW; Tue, 11 Nov 2025 16:20:22 +0000 Received: by outflank-mailman (output) from mailman id 1159093.1487514; Tue, 11 Nov 2025 16:20:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vIr6U-0002y7-JC; Tue, 11 Nov 2025 16:20:22 +0000 Received: by outflank-mailman (input) for mailman id 1159093; Tue, 11 Nov 2025 16:20:20 +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 1vIr6S-00027n-RZ for xen-devel@lists.xenproject.org; Tue, 11 Nov 2025 16:20:20 +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 5136b0b8-bf1a-11f0-9d18-b5c5bf9af7f9; Tue, 11 Nov 2025 17:20:20 +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 C285D21CE4; Tue, 11 Nov 2025 16:20:19 +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 94A5E14A47; Tue, 11 Nov 2025 16:20:19 +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 jYZZIENiE2ldDQAAD6G6ig (envelope-from ); Tue, 11 Nov 2025 16:20:19 +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: 5136b0b8-bf1a-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878019; 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=a+soXsd5RJ+tn6vw+rsKME/DKU3Va+AYoo0xgD3bolg=; b=iQu0Lniq9q9KFB5LLSufnptCv2dv0wVj/G7cbRshOi3prYanYMOKX3UuPDFPr1paEVE3HM oF+WE+Kze2uLABmbG2dgIpfm63yK9dDYIwOdrjFbOiXQjmpaqYgiVdh8Phdn/niSPj56BT jshC8s6j5hIqx/McrkbobT/d13V7prY= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878019; 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=a+soXsd5RJ+tn6vw+rsKME/DKU3Va+AYoo0xgD3bolg=; b=iQu0Lniq9q9KFB5LLSufnptCv2dv0wVj/G7cbRshOi3prYanYMOKX3UuPDFPr1paEVE3HM oF+WE+Kze2uLABmbG2dgIpfm63yK9dDYIwOdrjFbOiXQjmpaqYgiVdh8Phdn/niSPj56BT jshC8s6j5hIqx/McrkbobT/d13V7prY= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Anthony PERARD Subject: [PATCH 3/5] docs: rename *.in files to *.src Date: Tue, 11 Nov 2025 17:19:57 +0100 Message-ID: <20251111161959.13667-4-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111161959.13667-1-jgross@suse.com> References: <20251111161959.13667-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)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:mid,suse.com:email,pod.in:url,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCPT_COUNT_THREE(0.00)[3]; 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: 1762878040274158500 Content-Type: text/plain; charset="utf-8" Rename the *.in files under docs to *.src, resulting to replace the @...@ markers 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 --- docs/Makefile | 8 +++++++- docs/configure | 7 +------ docs/configure.ac | 9 +-------- ...guration.5.pod.in =3D> xl-disk-configuration.5.pod.src} | 0 ...ation.5.pod.in =3D> xl-network-configuration.5.pod.src} | 0 docs/man/{xl.1.pod.in =3D> xl.1.pod.src} | 0 docs/man/{xl.cfg.5.pod.in =3D> xl.cfg.5.pod.src} | 0 docs/man/{xl.conf.5.pod.in =3D> xl.conf.5.pod.src} | 0 8 files changed, 9 insertions(+), 15 deletions(-) rename docs/man/{xl-disk-configuration.5.pod.in =3D> xl-disk-configuration= .5.pod.src} (100%) rename docs/man/{xl-network-configuration.5.pod.in =3D> xl-network-configu= ration.5.pod.src} (100%) rename docs/man/{xl.1.pod.in =3D> xl.1.pod.src} (100%) rename docs/man/{xl.cfg.5.pod.in =3D> xl.cfg.5.pod.src} (100%) rename docs/man/{xl.conf.5.pod.in =3D> xl.conf.5.pod.src} (100%) diff --git a/docs/Makefile b/docs/Makefile index 37776d303c..5d7fbcb032 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -8,8 +8,10 @@ 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 +GEN-MAN :=3D $(sort $(patsubst %.src,%,$(wildcard man/*.pod.src))) + # 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) $(GEN-= MAN))) =20 RST-SRC-y :=3D $(sort $(filter-out %index.rst,$(shell find * -type f -name= '*.rst' -print))) =20 @@ -77,11 +79,15 @@ clean: clean-man-pages distclean: clean rm -rf $(XEN_ROOT)/config/Docs.mk config.log config.status config.cache \ autom4te.cache + rm -f $(GEN-MAN) =20 # Top level install targets =20 .PHONY: man-pages install-man-pages clean-man-pages uninstall-man-pages =20 +man/%: man/%.src + $(apply-build-vars) + # 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 diff --git a/docs/man/xl-disk-configuration.5.pod.in b/docs/man/xl-disk-con= figuration.5.pod.src similarity index 100% rename from docs/man/xl-disk-configuration.5.pod.in rename to docs/man/xl-disk-configuration.5.pod.src diff --git a/docs/man/xl-network-configuration.5.pod.in b/docs/man/xl-netwo= rk-configuration.5.pod.src similarity index 100% rename from docs/man/xl-network-configuration.5.pod.in rename to docs/man/xl-network-configuration.5.pod.src diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.src similarity index 100% rename from docs/man/xl.1.pod.in rename to docs/man/xl.1.pod.src diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.src similarity index 100% rename from docs/man/xl.cfg.5.pod.in rename to docs/man/xl.cfg.5.pod.src diff --git a/docs/man/xl.conf.5.pod.in b/docs/man/xl.conf.5.pod.src similarity index 100% rename from docs/man/xl.conf.5.pod.in rename to docs/man/xl.conf.5.pod.src --=20 2.51.0 From nobody Wed Nov 19 01:56:08 2025 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=1762878038; cv=none; d=zohomail.com; s=zohoarc; b=EQppaDraIJIE8Kkwd2NFKt+gIiyzhW6RVO+rw5JUJ1OHRluwmjWRBMgzJpuK8oSm8DI6aXrOnN+7uRqmAWL+XGpT3PlqH/tPBwKi/021H3vGXYAWAYfP5a49dOcEN18ceW90mDH1t0mgIjiGz2HIuKZFaKbPlAhFM8SOcBPwF94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762878038; 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=Cfv/xgHZLZE2wANukYWztkqRSmV6C5Zi4y/LQSiOMQM=; b=aAjmBww1zSFGYeDsMRIcLWV1WLzRLNVSIBoAyHAFZ/hBRaYcVOmZLC9g68lmav4VKLwtWZFLaCM1tUAG4FJaxPB/XChglPeQItnOFqaBe4LFxihKk/0ySWPQDbw08uipduipKfVbbjgAeqNabW8vfBzYTPnK70KDDsAnRO0OUFo= 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 1762878038510895.2733965229155; Tue, 11 Nov 2025 08:20:38 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1159097.1487524 (Exim 4.92) (envelope-from ) id 1vIr6Z-0003Lc-4r; Tue, 11 Nov 2025 16:20:27 +0000 Received: by outflank-mailman (output) from mailman id 1159097.1487524; Tue, 11 Nov 2025 16:20:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vIr6Z-0003LR-1Z; Tue, 11 Nov 2025 16:20:27 +0000 Received: by outflank-mailman (input) for mailman id 1159097; Tue, 11 Nov 2025 16:20:26 +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 1vIr6Y-00027n-9u for xen-devel@lists.xenproject.org; Tue, 11 Nov 2025 16:20:26 +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 548ed356-bf1a-11f0-9d18-b5c5bf9af7f9; Tue, 11 Nov 2025 17:20:25 +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 667F521CE4; Tue, 11 Nov 2025 16:20:25 +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 3E5B614A47; Tue, 11 Nov 2025 16:20:25 +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 qlSlDUliE2lpDQAAD6G6ig (envelope-from ); Tue, 11 Nov 2025 16:20:25 +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: 548ed356-bf1a-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878025; 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=Cfv/xgHZLZE2wANukYWztkqRSmV6C5Zi4y/LQSiOMQM=; b=Y2keFVwknK7R+SgY5Tll5//kL6L1r8wxCK2oP6BdCXxS7+yIu6qBXoRJ84z83aCftZGw86 wS0MhKEWQNjE7/AGH1D9mwV/hV7tOASpLHonJ0whcsta5Qc1g5b54avZzej2VjvG/WdgCE FY3q6kOKI4YcB/aGuh2yBiDgo/GnS7U= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878025; 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=Cfv/xgHZLZE2wANukYWztkqRSmV6C5Zi4y/LQSiOMQM=; b=Y2keFVwknK7R+SgY5Tll5//kL6L1r8wxCK2oP6BdCXxS7+yIu6qBXoRJ84z83aCftZGw86 wS0MhKEWQNjE7/AGH1D9mwV/hV7tOASpLHonJ0whcsta5Qc1g5b54avZzej2VjvG/WdgCE FY3q6kOKI4YcB/aGuh2yBiDgo/GnS7U= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Anthony PERARD Subject: [PATCH 4/5] config: remove unused paths from config/Paths.mk.in Date: Tue, 11 Nov 2025 17:19:58 +0100 Message-ID: <20251111161959.13667-5-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111161959.13667-1-jgross@suse.com> References: <20251111161959.13667-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%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCPT_COUNT_THREE(0.00)[3]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Score: -2.80 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1762878040151158500 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 --- config/Paths.mk.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index bc42748b7a..668545be2f 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -20,10 +20,7 @@ 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 +31,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 Wed Nov 19 01:56:08 2025 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=1762878051; cv=none; d=zohomail.com; s=zohoarc; b=b8nbzdJsiaYokRagNO8Ay5l0GIsrObe3oQuSiqR8ZmMLQl4niMDLZy9qdPQFnbtPMG9l6qSxe0h69pruEIr3d86suH184NWNf596VqRTMsENmjQqcdZw+0+r/affzDKGi+jD+uD0icc5zzHkUBeXuzypJkntMBZogdhWtKHhzT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762878051; 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=R8kSGCqMJe/YFQNzWivvH+Qqy7p73QZsAmfOgR9P6UU=; b=nVZu5O7haj4upu9pmkkCilBr6gXbGEuqtldt0y7xbM0M7/1Q4JSFTyMtDZz7fdaG0LC8eWZVJAsn5yLFJenKLb4lmK9Ua/uVk/j5+qjUj+HrCYq46FDcpk4jI44i0fXOYmvMDa7i8vfzUAPsjbswT6V8a4Q4Puu5OOEA4SHJqEU= 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 1762878051917514.2708139662633; Tue, 11 Nov 2025 08:20:51 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1159114.1487534 (Exim 4.92) (envelope-from ) id 1vIr6i-000442-Fw; Tue, 11 Nov 2025 16:20:36 +0000 Received: by outflank-mailman (output) from mailman id 1159114.1487534; Tue, 11 Nov 2025 16:20:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vIr6i-00043g-Br; Tue, 11 Nov 2025 16:20:36 +0000 Received: by outflank-mailman (input) for mailman id 1159114; Tue, 11 Nov 2025 16:20:35 +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 1vIr6g-00027n-WD for xen-devel@lists.xenproject.org; Tue, 11 Nov 2025 16:20:35 +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 581ec7d4-bf1a-11f0-9d18-b5c5bf9af7f9; Tue, 11 Nov 2025 17:20:31 +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 2C09E21CEB; Tue, 11 Nov 2025 16:20:31 +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 CB38914A49; Tue, 11 Nov 2025 16:20:30 +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 WPYBME5iE2lwDQAAD6G6ig (envelope-from ); Tue, 11 Nov 2025 16:20:30 +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: 581ec7d4-bf1a-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878031; 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=R8kSGCqMJe/YFQNzWivvH+Qqy7p73QZsAmfOgR9P6UU=; b=hJLpvTPUhjeuG1xQvcwENY8hbZXdYxJNftj+YwaMbUD5/3KX69vvWtPiNK5biR8Rg0/GLa x5twkbSTlxXXt46JrZQ4XaIrPBzNfBwridnMn/5sWNEBGKJSy9X3MuZ+MW/D6VLPbLcfBN 21MKc+7NnHuZS2Zd4Rk9JllmvQFxNx4= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1762878031; 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=R8kSGCqMJe/YFQNzWivvH+Qqy7p73QZsAmfOgR9P6UU=; b=hJLpvTPUhjeuG1xQvcwENY8hbZXdYxJNftj+YwaMbUD5/3KX69vvWtPiNK5biR8Rg0/GLa x5twkbSTlxXXt46JrZQ4XaIrPBzNfBwridnMn/5sWNEBGKJSy9X3MuZ+MW/D6VLPbLcfBN 21MKc+7NnHuZS2Zd4Rk9JllmvQFxNx4= 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 5/5] tools: rename most *.in files to *.src Date: Tue, 11 Nov 2025 17:19:59 +0100 Message-ID: <20251111161959.13667-6-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111161959.13667-1-jgross@suse.com> References: <20251111161959.13667-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)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo] X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1762878054498153000 Content-Type: text/plain; charset="utf-8" Rename the *.in files under tools read by configure to *.src, resulting to replace the @...@ markers 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 themin the *.src files. Add the generated files to the distclean target. Signed-off-by: Juergen Gross --- .gitignore | 1 + Config.mk | 2 +- config/Tools-paths.mk.in | 10 +++++++++ tools/configure | 21 ++----------------- tools/configure.ac | 19 +---------------- tools/hotplug/FreeBSD/Makefile | 8 ++++++- .../rc.d/{xencommons.in =3D> xencommons.src} | 0 ...xendriverdomain.in =3D> xendriverdomain.src} | 0 tools/hotplug/Linux/Makefile | 11 +++++++++- ...xencommons.in =3D> sysconfig.xencommons.src} | 0 ...xendomains.in =3D> sysconfig.xendomains.src} | 0 .../{xen-watchdog.in =3D> xen-watchdog.src} | 0 .../init.d/{xencommons.in =3D> xencommons.src} | 0 .../init.d/{xendomains.in =3D> xendomains.src} | 0 ...xendriverdomain.in =3D> xendriverdomain.src} | 0 ...launch-xenstore.in =3D> launch-xenstore.src} | 0 .../Linux/{vif-setup.in =3D> vif-setup.src} | 0 ...common.sh.in =3D> xen-hotplug-common.sh.src} | 0 .../Linux/{xendomains.in =3D> xendomains.src} | 0 tools/hotplug/NetBSD/Makefile | 8 ++++++- .../rc.d/{xencommons.in =3D> xencommons.src} | 0 ...xendriverdomain.in =3D> xendriverdomain.src} | 0 tools/hotplug/common/Makefile | 5 ++++- .../{hotplugpath.sh.in =3D> hotplugpath.sh.src} | 0 tools/ocaml/libs/xs/Makefile | 7 +++++++ .../libs/xs/{paths.ml.in =3D> paths.ml.src} | 0 tools/ocaml/xenstored/Makefile | 7 ++++++- ...oxenstored.conf.in =3D> oxenstored.conf.src} | 0 .../xenstored/{paths.ml.in =3D> paths.ml.src} | 0 29 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 config/Tools-paths.mk.in rename tools/hotplug/FreeBSD/rc.d/{xencommons.in =3D> xencommons.src} (100= %) rename tools/hotplug/FreeBSD/rc.d/{xendriverdomain.in =3D> xendriverdomain= .src} (100%) rename tools/hotplug/Linux/init.d/{sysconfig.xencommons.in =3D> sysconfig.= xencommons.src} (100%) rename tools/hotplug/Linux/init.d/{sysconfig.xendomains.in =3D> sysconfig.= xendomains.src} (100%) rename tools/hotplug/Linux/init.d/{xen-watchdog.in =3D> xen-watchdog.src} = (100%) rename tools/hotplug/Linux/init.d/{xencommons.in =3D> xencommons.src} (100= %) rename tools/hotplug/Linux/init.d/{xendomains.in =3D> xendomains.src} (100= %) rename tools/hotplug/Linux/init.d/{xendriverdomain.in =3D> xendriverdomain= .src} (100%) rename tools/hotplug/Linux/{launch-xenstore.in =3D> launch-xenstore.src} (= 100%) rename tools/hotplug/Linux/{vif-setup.in =3D> vif-setup.src} (100%) rename tools/hotplug/Linux/{xen-hotplug-common.sh.in =3D> xen-hotplug-comm= on.sh.src} (100%) rename tools/hotplug/Linux/{xendomains.in =3D> xendomains.src} (100%) rename tools/hotplug/NetBSD/rc.d/{xencommons.in =3D> xencommons.src} (100%) rename tools/hotplug/NetBSD/rc.d/{xendriverdomain.in =3D> xendriverdomain.= src} (100%) rename tools/hotplug/common/{hotplugpath.sh.in =3D> hotplugpath.sh.src} (1= 00%) rename tools/ocaml/libs/xs/{paths.ml.in =3D> paths.ml.src} (100%) rename tools/ocaml/xenstored/{oxenstored.conf.in =3D> oxenstored.conf.src}= (100%) rename tools/ocaml/xenstored/{paths.ml.in =3D> paths.ml.src} (100%) 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.mk b/Config.mk index 0ea1640371..713fb5eb89 100644 --- a/Config.mk +++ b/Config.mk @@ -159,7 +159,7 @@ 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 +PATH_FILES :=3D Paths Tools-paths INC_FILES :=3D $(foreach f, $(PATH_FILES), $(XEN_ROOT)/config/$(f).mk) =20 include $(INC_FILES) 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/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..0ad4372687 100644 --- a/tools/hotplug/FreeBSD/Makefile +++ b/tools/hotplug/FreeBSD/Makefile @@ -8,6 +8,11 @@ XEN_SCRIPT_DATA :=3D =20 XEN_RCD_PROG :=3D rc.d/xencommons rc.d/xendriverdomain =20 +GEN_FILES :=3D rc.d/xencommons rc.d/xendriverdomain + +rc.d/%:: rc.d/%.src + $(apply-build-vars) + .PHONY: all all: =20 @@ -35,7 +40,7 @@ uninstall-scripts: rm -f $(addprefix $(DESTDIR)$(XEN_SCRIPT_DIR)/, $(XEN_SCRIPT_DATA)) =20 .PHONY: install-rcd -install-rcd: +install-rcd: $(GEN_FILES) $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) set -e; for i in $(XEN_RCD_PROG); \ do \ @@ -51,3 +56,4 @@ clean: =20 .PHONY: distclean distclean: clean + rm -rf $(GEN_FILES) diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeB= SD/rc.d/xencommons.src similarity index 100% rename from tools/hotplug/FreeBSD/rc.d/xencommons.in rename to tools/hotplug/FreeBSD/rc.d/xencommons.src diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/= FreeBSD/rc.d/xendriverdomain.src similarity index 100% rename from tools/hotplug/FreeBSD/rc.d/xendriverdomain.in rename to tools/hotplug/FreeBSD/rc.d/xendriverdomain.src diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 9a7b3a3515..59f7bab96b 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -26,6 +26,14 @@ 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 +GEN_FILES :=3D launch-xenstore vif-setup xendomains xen-hotplug-common.sh +GEN_FILES +=3D init.d/sysconfig.xendomains init.d/xen-watchdog +GEN_FILES +=3D init.d/xencommons init.d/xendomains +GEN_FILES +=3D init.d/xendriverdomain init.d/sysconfig.xencommons + +init.d/%:: init.d/%.src + $(apply-build-vars) + .PHONY: all all: subdirs-all =20 @@ -37,7 +45,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: $(GEN_FILES) $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -81,3 +89,4 @@ clean: subdirs-clean =20 .PHONY: distclean distclean: clean + rm -rf $(GEN_FILES) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hot= plug/Linux/init.d/sysconfig.xencommons.src similarity index 100% rename from tools/hotplug/Linux/init.d/sysconfig.xencommons.in rename to tools/hotplug/Linux/init.d/sysconfig.xencommons.src diff --git a/tools/hotplug/Linux/init.d/sysconfig.xendomains.in b/tools/hot= plug/Linux/init.d/sysconfig.xendomains.src similarity index 100% rename from tools/hotplug/Linux/init.d/sysconfig.xendomains.in rename to tools/hotplug/Linux/init.d/sysconfig.xendomains.src diff --git a/tools/hotplug/Linux/init.d/xen-watchdog.in b/tools/hotplug/Lin= ux/init.d/xen-watchdog.src similarity index 100% rename from tools/hotplug/Linux/init.d/xen-watchdog.in rename to tools/hotplug/Linux/init.d/xen-watchdog.src diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux= /init.d/xencommons.src similarity index 100% rename from tools/hotplug/Linux/init.d/xencommons.in rename to tools/hotplug/Linux/init.d/xencommons.src diff --git a/tools/hotplug/Linux/init.d/xendomains.in b/tools/hotplug/Linux= /init.d/xendomains.src similarity index 100% rename from tools/hotplug/Linux/init.d/xendomains.in rename to tools/hotplug/Linux/init.d/xendomains.src diff --git a/tools/hotplug/Linux/init.d/xendriverdomain.in b/tools/hotplug/= Linux/init.d/xendriverdomain.src similarity index 100% rename from tools/hotplug/Linux/init.d/xendriverdomain.in rename to tools/hotplug/Linux/init.d/xendriverdomain.src diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/l= aunch-xenstore.src similarity index 100% rename from tools/hotplug/Linux/launch-xenstore.in rename to tools/hotplug/Linux/launch-xenstore.src diff --git a/tools/hotplug/Linux/vif-setup.in b/tools/hotplug/Linux/vif-set= up.src similarity index 100% rename from tools/hotplug/Linux/vif-setup.in rename to tools/hotplug/Linux/vif-setup.src diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/L= inux/xen-hotplug-common.sh.src similarity index 100% rename from tools/hotplug/Linux/xen-hotplug-common.sh.in rename to tools/hotplug/Linux/xen-hotplug-common.sh.src diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendom= ains.src similarity index 100% rename from tools/hotplug/Linux/xendomains.in rename to tools/hotplug/Linux/xendomains.src diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 1cd3db2ccb..7953fd4360 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -12,6 +12,11 @@ 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 +GEN_FILES :=3D rc.d/xencommons rc.d/xendriverdomain + +rc.d/%:: rc.d/%.src + $(apply-build-vars) + .PHONY: all all: =20 @@ -39,7 +44,7 @@ uninstall-scripts: rm -f $(addprefix $(DESTDIR)$(XEN_SCRIPT_DIR)/, $(XEN_SCRIPT_DATA)) =20 .PHONY: install-rcd -install-rcd: +install-rcd: $(GEN_FILES) $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) set -e; for i in $(XEN_RCD_PROG); \ do \ @@ -57,3 +62,4 @@ clean: =20 .PHONY: distclean distclean: clean + rm -rf $(GEN_FILES) diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD= /rc.d/xencommons.src similarity index 100% rename from tools/hotplug/NetBSD/rc.d/xencommons.in rename to tools/hotplug/NetBSD/rc.d/xencommons.src diff --git a/tools/hotplug/NetBSD/rc.d/xendriverdomain.in b/tools/hotplug/N= etBSD/rc.d/xendriverdomain.src similarity index 100% rename from tools/hotplug/NetBSD/rc.d/xendriverdomain.in rename to tools/hotplug/NetBSD/rc.d/xendriverdomain.src diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile index 62afe1019e..e9cbd35881 100644 --- a/tools/hotplug/common/Makefile +++ b/tools/hotplug/common/Makefile @@ -7,6 +7,8 @@ include $(XEN_ROOT)/tools/Rules.mk XEN_SCRIPTS :=3D XEN_SCRIPT_DATA :=3D hotplugpath.sh =20 +GEN_FILES :=3D hotplugpath.sh + .PHONY: all all: =20 @@ -17,7 +19,7 @@ install: install-scripts uninstall: uninstall-scripts =20 .PHONY: install-scripts -install-scripts: all +install-scripts: all $(GEN_FILES) $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ @@ -38,3 +40,4 @@ clean: =20 .PHONY: distclean distclean: clean + rm -rf $(GEN_FILES) diff --git a/tools/hotplug/common/hotplugpath.sh.in b/tools/hotplug/common/= hotplugpath.sh.src similarity index 100% rename from tools/hotplug/common/hotplugpath.sh.in rename to tools/hotplug/common/hotplugpath.sh.src diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile index e160e6a711..a9b534c929 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 +GEN_FILES :=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,8 @@ LIBS =3D xenstore.cma xenstore.cmxa =20 all: $(PREINTF) $(PRELIBS) $(INTF) $(LIBS) $(PROGRAMS) =20 +$(OBJS): $(GEN_FILES) + bins: $(PROGRAMS) =20 libs: $(LIBS) @@ -43,4 +47,7 @@ install: $(LIBS) META uninstall: $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xenstore =20 +.PHONY: distclean + rm -rf $(GEN_FILES) + include $(OCAML_TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/libs/xs/paths.ml.in b/tools/ocaml/libs/xs/paths.ml= .src similarity index 100% rename from tools/ocaml/libs/xs/paths.ml.in rename to tools/ocaml/libs/xs/paths.ml.src diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index c333394a34..138537ee7a 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -72,6 +72,8 @@ 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 +GEN_FILES :=3D paths.ml oxenstored.conf + PROGRAMS =3D oxenstored =20 oxenstored_LIBS =3D $(XENSTOREDLIBS) @@ -83,7 +85,7 @@ oxenstored_OBJS =3D $(oxenstored_MLSORTED:.ml=3D) =20 OCAML_PROGRAM =3D oxenstored =20 -all: $(INTF) $(LIBS) $(PROGRAMS) +all: $(GEN_FILES) $(INTF) $(LIBS) $(PROGRAMS) =20 bins: $(PROGRAMS) =20 @@ -99,4 +101,7 @@ uninstall: rm -f $(DESTDIR)$(XEN_CONFIG_DIR)/oxenstored.conf rm -f $(DESTDIR)$(sbindir)/oxenstored =20 +distclean: + rm -rf $(GEN_FILES) + include $(OCAML_TOPLEVEL)/Makefile.rules diff --git a/tools/ocaml/xenstored/oxenstored.conf.in b/tools/ocaml/xenstor= ed/oxenstored.conf.src similarity index 100% rename from tools/ocaml/xenstored/oxenstored.conf.in rename to tools/ocaml/xenstored/oxenstored.conf.src diff --git a/tools/ocaml/xenstored/paths.ml.in b/tools/ocaml/xenstored/path= s.ml.src similarity index 100% rename from tools/ocaml/xenstored/paths.ml.in rename to tools/ocaml/xenstored/paths.ml.src --=20 2.51.0