From nobody Wed May 15 10:55:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=windriver.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1646989811204974.6667416766148; Fri, 11 Mar 2022 01:10:11 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-359-FokKGj0WPnO5Th1gs-Jkzw-1; Fri, 11 Mar 2022 04:10:08 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E056680B710; Fri, 11 Mar 2022 09:10:05 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6ECC21454535; Fri, 11 Mar 2022 09:10:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1FCE91949763; Fri, 11 Mar 2022 09:10:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EAA1919452D2 for ; Thu, 10 Mar 2022 21:08:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D7189C080B6; Thu, 10 Mar 2022 21:08:53 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D245AC080B5 for ; Thu, 10 Mar 2022 21:08:53 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B401D811E75 for ; Thu, 10 Mar 2022 21:08:53 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-610-uJFfXPzwN-2GFlAiKNlT7g-1; Thu, 10 Mar 2022 16:08:52 -0500 Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22AEqqHA012330 for ; Thu, 10 Mar 2022 20:53:28 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2173.outbound.protection.outlook.com [104.47.58.173]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ekw304s6f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Mar 2022 20:53:28 +0000 Received: from BY5PR11MB3992.namprd11.prod.outlook.com (2603:10b6:a03:188::10) by PH0PR11MB5641.namprd11.prod.outlook.com (2603:10b6:510:d6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.17; Thu, 10 Mar 2022 20:53:24 +0000 Received: from BY5PR11MB3992.namprd11.prod.outlook.com ([fe80::389d:5330:bc19:13c4]) by BY5PR11MB3992.namprd11.prod.outlook.com ([fe80::389d:5330:bc19:13c4%7]) with mapi id 15.20.5061.022; Thu, 10 Mar 2022 20:53:24 +0000 X-MC-Unique: FokKGj0WPnO5Th1gs-Jkzw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: uJFfXPzwN-2GFlAiKNlT7g-1 From: Joe Slater To: libvir-list@redhat.com Subject: [PATCH] add build dependency on lxc_protocol.h to remote_daemon Date: Thu, 10 Mar 2022 12:53:10 -0800 Message-Id: <20220310205310.30183-1-joe.slater@windriver.com> X-ClientProxiedBy: BY5PR20CA0014.namprd20.prod.outlook.com (2603:10b6:a03:1f4::27) To BY5PR11MB3992.namprd11.prod.outlook.com (2603:10b6:a03:188::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9cc71f04-01d7-4d0c-46eb-08da02d804d6 X-MS-TrafficTypeDiagnostic: PH0PR11MB5641:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: veA387NHhw/uQ2/pIAd07H3YmzLQx0W2ruxQHBgnxWBrP1CFPjwPaC+oZ8y1EE9FbtriA032jjT+I5HdPks1O+1wGDSM/c5l+/bp2wWVhHQtlu71KeAuRv0gXw3VYDpFc/WVvfLFxuYztDuENth9goTDPu+b8F6TXPAlzXrLfSGphuoy81Wt2YHFhUHQNx4+6D04UXbDad53EYewo9J49N3z4BX3cEO9ahvdW2snNcXfL71k3A2R9bj/c7hn2JVceK22Yw3Z2b5s5QKXWHv8jVJ4IllwK7XYiqFtUv/iSvKko4A8oaVOFsNrnfALLB8KNoHVkxZIDkS6tMm0aTLM4Unpagv1uD91+SKWXEosGQXQYbPupYjOS9a4lm2+yPZ5NPHmzNYiX4B+XoCaNL5vKZVEj8Cuy+R0Zb4MKvdrPkPbuSf6tL53oGogSV2EdEKY8v8qPQ6FRfSd3XoHxQYY8dbg4tsLUqmcSK2vfnTf1jDZ6ge3VxxcMbRV+s7vdUk4bRO5QNurOWL8iS2ZDhwKecw8Ri91N0Upkon4eCzpDTazgqmrOxie5y43/PkTrUPWiGyJpzKU/CC+lHnLuh0Ej1L7yl0jemON7nkw1earo5z1h6aSrq7idw5LbvdXD1Y9TZ8Dkqtqf2NsElKfqRInJmapa42jJ8Pqko5di5M8J70hjHJgeUDXDSNpXulVZCop3dKxh26zxShYNhdYK9SOugHGb3JL0Ii5a3yugM/YhxY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR11MB3992.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(5660300002)(83380400001)(6916009)(38350700002)(66556008)(86362001)(107886003)(66476007)(66946007)(4326008)(8676002)(316002)(36756003)(8936002)(38100700002)(44832011)(2906002)(52116002)(6506007)(6666004)(6512007)(26005)(2616005)(186003)(1076003)(508600001)(6486002)(21314003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+MWUFFztWLR3fN3MaEM9Cp3lAhgkQbeDwSnax/AgnpYMcM0Ll+2m6muB0HX7?= =?us-ascii?Q?rOfdvGFdbVlLpu9s3pYseUoLamh4N28e+3xQ43jJjoSqyAC0L81yHaJ+c1Ht?= =?us-ascii?Q?Ou6oQhzVCn1tmm1V9liLitrme8lle5wn9aAfTUTMDhRV20lZSeQ5cqbHIoRJ?= =?us-ascii?Q?CBC/Yyemb5F9RdRlhpZ89mg7xEZiYfVJCH3qsPq0AVrBafHDOBnxc3TKF9Sw?= =?us-ascii?Q?HQp6XSXw+nsQdswfeEEamcgV9dDDq6B1dARxhX+29RJaN5keqpUFod7lqIFU?= =?us-ascii?Q?4bGBPCKXzwUPBL+6z1Ka0mGZWDKHWDfYPnNi/ToBlhAfjgR807822gi7y0lZ?= =?us-ascii?Q?mZa6vmQ7fFpjDlPL9M6JNQFuJm+UVHOeENCT7/O0rNgq5/vp6kosc7J61gF1?= =?us-ascii?Q?4p9C+Qag9qX+pkgEhtIlwMP5Z9h8ZD7puVd4H4Qnd4JpSFB5kPJq0Nwjh6gm?= =?us-ascii?Q?WzzNuvbtXX+RykkY+zI+5zTyft0wRYI3QNOR1DGOiSuvl12BlYWduh9DxxyJ?= =?us-ascii?Q?zuh3onqAxe4m4PSUaNRrMNkU6p0+fobLPN4bu1A/SeA2ZvyYzQDt9ogKT0Wd?= =?us-ascii?Q?ABkLG8O+HOVfCP30I6pZWu4SORPwXZuqX6VVULlHC8KHK9Csd4ZTSIq82WCm?= =?us-ascii?Q?zfkYV00y7xOR/VHXigv2ACBZMSgog/7cfcA2QjsyRQkXKiqboA01q/+goUie?= =?us-ascii?Q?+dAI4S87FcZ+rPvXfPjxy9jaVDqlgfaOMqvOE4C4HRCVjxAWtSCNCE9pU2BD?= =?us-ascii?Q?gA91sae/8KISk19apzqY8+Udy5rzymK+7XXMDm0BzsDUPWFdB61BqG2c7kXG?= =?us-ascii?Q?NkeSLvDJOPFf+aZT15T+Itijx7rWUeOX5WXLpJD2EcTQBwB82odJYLh6qvmj?= =?us-ascii?Q?V7ShXuH5qtrF/qaMGdOpJysCHOByQXQl1k5q02c9HUOk44zWjMRLfUBZABs+?= =?us-ascii?Q?cQ0NpdHoYi4/n7BoQc2MY+x1o/t4jW89wEItKogfirRBLg6rrUSiDOhUDswa?= =?us-ascii?Q?I/2MDw+YgNU2EgMOfCgqsz4MA7/8QfR5gn3KduadHZiH6uSUISkmrqSRytB2?= =?us-ascii?Q?0zgG6q/rNmOHjDxQV15uin+IchYLZ749u4B/uchv7ES/qJpGZJmceRbFn/eb?= =?us-ascii?Q?7K4kBsGcS/7zEBgcxcuk1PwHKJEuywiHRsPqWM6HwSASu5OpjL2eN2FVbBfJ?= =?us-ascii?Q?ggFCcgQMxroddk3UlsJPwmvUuLiIxlso/x/dffMwTPvNcmpvGx9xiZtPO7Q0?= =?us-ascii?Q?+8n0KfHWp5CGgKiA3MDKVX515Bxft4n/+0vXxjxPH+ddOTljJBqQ0zDJ3SSP?= =?us-ascii?Q?xt6hbTKnNGhVMJCpZWCgmVlC+xSXlmPirdAZQbkRHcWyml8cGAZF5HGHNXEX?= =?us-ascii?Q?qTv7B7HKtf+fKnNqshDOCezph0cs7bYfIfcv3jXr+6pYsHpU85jWdNZl4dcZ?= =?us-ascii?Q?gaj0ZSMVtD6ZMe7NMtgOFqJl9XkDOrBR4bq6RB+KjInRcQEypv7rhIc7WQ+0?= =?us-ascii?Q?ugbpZK599KGqkkL2mvuhamBdHLOc38K2fhNAtQmfYsEOOywsDMhM3bbNFXka?= =?us-ascii?Q?6Zi20dKRsXLvkbzraJD79LeUWnn49/RAjqjz1iCgSz55/uSISsgW6ns6/qR5?= =?us-ascii?Q?9Jw2hdV8gGW8SHnJimWND6gyy7r+TU9KM67zUqyqJdsIcpTjXzzYwqhv+fA6?= =?us-ascii?Q?IDOUvA=3D=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cc71f04-01d7-4d0c-46eb-08da02d804d6 X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB3992.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 20:53:24.7439 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Qz6TbtuuTEWtBhhlvbK6iStjMeI6Koei7s8xP2LXIysiMJAbLrE/D8S+eEXLOH2mckEhTc4l2IZtQdZHT38ApvaA6lFTJ84MOkjbfQsxA6I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5641 X-Proofpoint-ORIG-GUID: A0K2fPJ7jVF9RjGQxg3Qqau1c3KUqEZb X-Proofpoint-GUID: A0K2fPJ7jVF9RjGQxg3Qqau1c3KUqEZb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-10_09,2022-03-09_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 impostorscore=0 mlxlogscore=346 malwarescore=0 suspectscore=0 phishscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1011 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203100105 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mailman-Approved-At: Fri, 11 Mar 2022 09:10:02 +0000 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: joe.slater@windriver.com, randy.macleod@windriver.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1646989814256100001 Content-Type: text/plain; charset="utf-8" remote_daemon.c and others need the generated header lxc_protocol.h, but do not have it as a dependency in meson.build. This means that builds will randomly (ok, very occasionally) fail. Restructure how the header is built so that remote_daemon can have it as a dependency. Signed-off-by: Joe Slater --- src/remote/meson.build | 48 ++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index 0a18826..31a30ee 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -1,27 +1,11 @@ -remote_driver_sources =3D [ - 'remote_driver.c', - 'remote_sockets.c', -] - -remote_driver_generated =3D [] +remote_xxx_generated =3D [] =20 foreach name : [ 'remote', 'qemu', 'lxc' ] - client_bodies_h =3D '@0@_client_bodies.h'.format(name) protocol_c =3D '@0@_protocol.c'.format(name) protocol_h =3D '@0@_protocol.h'.format(name) protocol_x =3D '@0@_protocol.x'.format(name) =20 - remote_driver_generated +=3D custom_target( - client_bodies_h, - input: protocol_x, - output: client_bodies_h, - command: [ - gendispatch_prog, '--mode=3Dclient', name, name.to_upper(), '@INPUT@= ', - ], - capture: true, - ) - - remote_driver_generated +=3D custom_target( + remote_xxx_generated +=3D custom_target( protocol_h, input: protocol_x, output: protocol_h, @@ -30,7 +14,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ], ) =20 - remote_driver_generated +=3D custom_target( + remote_xxx_generated +=3D custom_target( protocol_c, input: protocol_x, output: protocol_c, @@ -42,6 +26,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] rpc_probe_files +=3D files(protocol_x) endforeach =20 + +remote_driver_sources =3D [ + 'remote_driver.c', + 'remote_sockets.c', +] + +remote_driver_generated =3Dremote_xxx_generated + +foreach name : [ 'remote', 'qemu', 'lxc' ] + client_bodies_h =3D '@0@_client_bodies.h'.format(name) + protocol_x =3D '@0@_protocol.x'.format(name) + + remote_driver_generated +=3D custom_target( + client_bodies_h, + input: protocol_x, + output: client_bodies_h, + command: [ + gendispatch_prog, '--mode=3Dclient', name, name.to_upper(), '@INPUT@= ', + ], + capture: true, + ) + +endforeach + remote_daemon_sources =3D files( 'remote_daemon.c', 'remote_daemon_config.c', @@ -49,7 +57,7 @@ remote_daemon_sources =3D files( 'remote_daemon_stream.c', ) =20 -remote_daemon_generated =3D [] +remote_daemon_generated =3D remote_xxx_generated =20 virt_ssh_helper_sources =3D files( 'remote_sockets.c', --=20 2.32.0