From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736420; cv=none; d=zoho.com; s=zohoarc; b=IE4j2me9+5x+Gs/0zZmmHY/KL+XrBHeGagxGcK7vZYoocdl7BisZV6Gdjs5zsiNIG01leVSzDyLqbBZBxBs8UW/orlNX3KCaMvcDIzCaoNFoiXHB5SbhZQ5vrJV7vwCuGJBvaMLrM+eLYbWEZEYpuWZ0haeP6KPQsVC1LGmfrhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736420; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uKgr1ZdFmq8Bwz/61RKSNMz0e/xxtWhQk0rfhnC6F7w=; b=VZ5VHu84oInFQKXoDYaJ5lL7Ztx5tXMuNeJ3Ug1QK9GCug/zEk2Svx8VDp2gqAT9og7m8eQqiU4TAzDRP3yH3hSwlRwVqRFcy4pFjcdPp7G8vEWTQqUYIc9pGU8kY3n0sT0S8tZZtCsfoyGGbP9BkPjHwZhnMB77J90+xgbmmsE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 157173642063796.64926619507116; Tue, 22 Oct 2019 02:27:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-SWPLgHHQPf2QJsmyiUS4IQ-1; Tue, 22 Oct 2019 05:26:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7314980183E; Tue, 22 Oct 2019 09:26:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C3DB61F21; Tue, 22 Oct 2019 09:26:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F2867180B536; Tue, 22 Oct 2019 09:26:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L80tYn002357 for ; Mon, 21 Oct 2019 04:00:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 61C2B1001B11; Mon, 21 Oct 2019 08:00:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB57C1001B20 for ; Mon, 21 Oct 2019 08:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736419; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uKgr1ZdFmq8Bwz/61RKSNMz0e/xxtWhQk0rfhnC6F7w=; b=EnWNu+XD/Dk/BKv+pBsNBl+AgI+8XMxNyAVCtU6rCDDLkH6KiQoix3ULGFk1PETtWp64KV k/yGCx898vTIotxrWYLcw5sigJR1quNGG8DoA5/3u7lyUqzXV0TEYLAQpkuH0Gi5S9uhW7 XZOYipNlqUVYAS+7Eegddaw1FhgYtWg= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:26 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/25] 4: virt-driver-libxl: remove Fedora 28 check X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: SWPLgHHQPf2QJsmyiUS4IQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- m4/virt-driver-libxl.m4 | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index 2cd97cc68f..2f3565f1d5 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -36,23 +36,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ LIBXL_EXECBIN_DIR=3D$($PKG_CONFIG --variable libexec_bin xenlight) fi =20 - dnl In Fedora <=3D 28, the xenlight pkgconfig file is in the -runtime pa= ckage - dnl https://bugzilla.redhat.com/show_bug.cgi?id=3D1629643 - dnl Until Fedora 28 reaches EOL, fallback to lib probe if xenlight.pc is - dnl not found - if test "x$with_libxl" =3D "xno" ; then - with_libxl=3D"$old_with_libxl" - - save_CFLAGS=3D"$CFLAGS" - CFLAGS=3D"$CFLAGS $LIBXL_API_VERSION" - LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_cpupool_cpuadd_cpumap], = [libxl.h], [fail=3D"1"]) - CFLAGS=3D"$save_CFLAGS" - - if test $fail =3D 1; then - AC_MSG_ERROR([You must install the libxl Library from Xen >=3D 4.6 t= o compile libxenlight driver with -lxl]) - fi - fi - if test "$with_libxl" =3D "yes"; then LIBXL_CFLAGS=3D"$LIBXL_CFLAGS $LIBXL_API_VERSION" =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736391; cv=none; d=zoho.com; s=zohoarc; b=XV7CFkSIBlq1kJCHXoprH9S/d91eQRGne2OmhJ3dxnUjn+AIrGsEUnFDoGK8aXszjMGscaCN/Xej6BTcx6AVYVOKYeXDmiYIsg9A655r6SmLNrdxwxBYcoMBD99G2ofBBpWubhXqY4TmCcMBcuIQIe5rZD2680bN3Ol48sj2fHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736391; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i4N9QehUvywZpLTpkQe/CCTzQqdbmCtUroNPQVc11RU=; b=WVwIEBRZDF9SL6ZDYvD7DXceLbUN16jeTthRfmvLwVYlRJA4J4JCzEkord6TOpk1zaQb1Y5R6F0nJdZACKSObvr9nlGjrImuR3e3VAkSwBReUsDFdrHG/TSadQApAYwZ9nXc+sI8QcSjqZ0lPyIxrFbZ73lPusIVpOXyJEkqHm8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571736391019951.1006169662226; Tue, 22 Oct 2019 02:26:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-239-GlmUNPrkN9uxpR4kCnp_Sw-1; Tue, 22 Oct 2019 05:26:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E37FD801E52; Tue, 22 Oct 2019 09:26:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD1F360161; Tue, 22 Oct 2019 09:26:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 621B5180B536; Tue, 22 Oct 2019 09:26:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L80uHn002365 for ; Mon, 21 Oct 2019 04:00:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 300641001B23; Mon, 21 Oct 2019 08:00:56 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACF311001B20 for ; Mon, 21 Oct 2019 08:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736389; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=i4N9QehUvywZpLTpkQe/CCTzQqdbmCtUroNPQVc11RU=; b=NpSCxy5UM+XasuGsC9D3DwqIDEpT0XmFr+Ox5St5zge3m1lFIjOYYhu0yXgz9VpMDsIaNE STHBU+aBLQ9UqZFBWGnpOt2NnsH4pFcXC/S/vw8G8gRxSoUfVfShRIu0TvbCQJtgFRIu6/ 0jeW4iFqNeq6vBdNrhHimboq9LQ1lNM= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:27 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/25] m4: virt-libnl: drop libnl-1.0 support X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: GlmUNPrkN9uxpR4kCnp_Sw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All supported OSes have libnl-3.0 and netcf uses it so there is no need to keep libnl-1.0 compatibility code. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- m4/virt-libnl.m4 | 56 +++++++++---------------------------------- src/util/virnetlink.c | 13 +++------- src/util/virnetlink.h | 8 ------- 3 files changed, 14 insertions(+), 63 deletions(-) diff --git a/m4/virt-libnl.m4 b/m4/virt-libnl.m4 index c106d545ec..b3e0dc9b2c 100644 --- a/m4/virt-libnl.m4 +++ b/m4/virt-libnl.m4 @@ -18,56 +18,22 @@ dnl . dnl =20 AC_DEFUN([LIBVIRT_CHECK_LIBNL], [ - AC_REQUIRE([LIBVIRT_CHECK_NETCF]) AC_REQUIRE([LIBVIRT_CHECK_MACVTAP]) =20 - LIBNL_REQUIRED=3D"1.1" with_libnl=3Dno =20 if test "$with_linux" =3D "yes"; then - # When linking with netcf, we must ensure that we pick the same version - # of libnl that netcf picked. Prefer libnl-3 unless we can prove - # netcf linked against libnl-1, or unless the user set LIBNL_CFLAGS. - # (Setting LIBNL_CFLAGS is already used by PKG_CHECK_MODULES to - # override any probing, so if it set, you know which libnl is in use.) - libnl_ldd=3D - for dir in /usr/lib64 /usr/lib /usr/lib/*-linux-gnu*; do - if test -f $dir/libnetcf.so; then - libnl_ldd=3D`(ldd $dir/libnetcf.so) 2>&1` - break - fi - done - case $libnl_ldd:${LIBNL_CFLAGS+set} in - *libnl-3.so.*:) LIBNL_REQUIRED=3D3.0 ;; - esac - case $libnl_ldd:${LIBNL_CFLAGS+set} in - *libnl.so.1*:) ;; - *) - PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ - with_libnl=3Dyes - AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) - AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is ava= ilable]) - PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) - LIBNL_CFLAGS=3D"$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" - LIBNL_LIBS=3D"$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" - ], [:]) ;; - esac - if test "$with_libnl" =3D no; then - PKG_CHECK_MODULES([LIBNL], [libnl-1 >=3D $LIBNL_REQUIRED], [ - with_libnl=3Dyes - AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1], - [whether the netlink library is available]) - AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1], - [whether the netlink v1 library is available]) - ], [ - if test "$with_macvtap" =3D "yes"; then - if test "$LIBNL_REQUIRED" =3D "3.0";then - AC_MSG_ERROR([libnl3-devel >=3D $LIBNL_REQUIRED is required fo= r macvtap support]) - else - AC_MSG_ERROR([libnl-devel >=3D $LIBNL_REQUIRED is required for= macvtap support]) - fi - fi - ]) + PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ + with_libnl=3Dyes + AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is availab= le]) + PKG_CHECK_MODULES([LIBNL_ROUTE], [libnl-route-3.0]) + LIBNL_CFLAGS=3D"$LIBNL_CFLAGS $LIBNL_ROUTE_CFLAGS" + LIBNL_LIBS=3D"$LIBNL_LIBS $LIBNL_ROUTE_LIBS" + ], [:]) + fi + if test "$with_libnl" =3D no; then + if test "$with_macvtap" =3D "yes"; then + AC_MSG_ERROR([libnl3-devel >=3D $LIBNL_REQUIRED is required for ma= cvtap support]) fi fi AM_CONDITIONAL([HAVE_LIBNL], [test "$with_libnl" =3D "yes"]) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index ab41b57672..0d91503714 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -52,17 +52,10 @@ struct virNetlinkEventHandle { int deleted; }; =20 -# ifdef HAVE_LIBNL1 -# define virNetlinkAlloc nl_handle_alloc -# define virNetlinkSetBufferSize nl_set_buffer_size -# define virNetlinkFree nl_handle_destroy -typedef struct nl_handle virNetlinkHandle; -# else -# define virNetlinkAlloc nl_socket_alloc -# define virNetlinkSetBufferSize nl_socket_set_buffer_size -# define virNetlinkFree nl_socket_free +# define virNetlinkAlloc nl_socket_alloc +# define virNetlinkSetBufferSize nl_socket_set_buffer_size +# define virNetlinkFree nl_socket_free typedef struct nl_sock virNetlinkHandle; -# endif =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetlinkHandle, virNetlinkFree); =20 diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 030547e573..e888857601 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -24,15 +24,7 @@ =20 #if defined(__linux__) && defined(HAVE_LIBNL) =20 -/* Work around a bug where older libnl-1 headers expected older gcc - * semantics of 'extern inline' that conflict with C99 semantics. */ -# ifdef HAVE_LIBNL1 -# define inline -# endif # include -# ifdef HAVE_LIBNL1 -# undef inline -# endif =20 typedef struct nl_msg virNetlinkMsg; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetlinkMsg, nlmsg_free); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736460; cv=none; d=zoho.com; s=zohoarc; b=ORjftqT7NZewu11onej/ALcT7GX9pBfJJIrWFgEGoFrQMMNFLfOH/Vblk0/2HDe/eeCNHbmBd9+2MaMjXymp+Vm6R3cB96FimPHFSBKns9y0wmn5yCcijWhcUakQAn1TqY86smvll9fkxeFTxZgagDgQvg/B3xwVAeSoDxFJVqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736460; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dOQ2AGvcUAVCC7E8tGeBmj2S8bJmtg4g8RgX36Bxsrs=; b=AJm6SQhIm+Mge8SRvdoMQysqUsdSWTbLt/d1ja++WKM2zKap9fSGkiXR/k21Jw56C1usbNeYUksAof+Ctpow6eP5S1/M2IhnuaF/JPV4IqZrLf1LBEimPRUGhppIrlTdew6NKlJ0ZZ907TYlO6J59xxBvhlWCqG78+1wEs/Uy7A= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571736460623363.7709014157638; Tue, 22 Oct 2019 02:27:40 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-361-Wx33EofEPk-EOweBRsQf5w-1; Tue, 22 Oct 2019 05:27:35 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BEA9800D54; Tue, 22 Oct 2019 09:27:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E503F3DE2; Tue, 22 Oct 2019 09:27:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A71B13FB44; Tue, 22 Oct 2019 09:27:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L80x4U002385 for ; Mon, 21 Oct 2019 04:00:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 432131001B11; Mon, 21 Oct 2019 08:00:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF4881001938 for ; Mon, 21 Oct 2019 08:00:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736457; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dOQ2AGvcUAVCC7E8tGeBmj2S8bJmtg4g8RgX36Bxsrs=; b=QCw/hvUbmCi/LKfMSH4f+9uXJsZUTU2oFUGhf9v1qRk5OqNm2R0ZoHKBHXbPGts1w/VHlV xLEho3+9ctrDgO3AVCqOhuroVG+JI4hZjgucH43kI8Y2o5pKaDMpG78nXaH7zRIrpXBiCg /zI4gUz9XTjI+tH2az8ruc6jJg2NMpQ= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:28 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/25] m4: virt-netcf: bump minimal version to 0.1.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: Wx33EofEPk-EOweBRsQf5w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This version is available on all supported OSes and includes the transaction APIs. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- m4/virt-netcf.m4 | 18 ++---------------- src/interface/interface_backend_netcf.c | 4 ---- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4 index 588b5e7a91..ada6b5a7a9 100644 --- a/m4/virt-netcf.m4 +++ b/m4/virt-netcf.m4 @@ -18,25 +18,11 @@ dnl . dnl =20 AC_DEFUN([LIBVIRT_ARG_NETCF],[ - LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.4]) + LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.8]) ]) =20 AC_DEFUN([LIBVIRT_CHECK_NETCF],[ - LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4]) - - if test "$with_netcf" =3D "yes" ; then - old_CFLAGS=3D"$CFLAGS" - old_LIBS=3D"$LIBS" - CFLAGS=3D"$CFLAGS $NETCF_CFLAGS" - LIBS=3D"$LIBS $NETCF_LIBS" - AC_CHECK_FUNC([ncf_change_begin], [netcf_transactions=3D1], [netcf_tra= nsactions=3D0]) - if test "$netcf_transactions" =3D "1" ; then - AC_DEFINE_UNQUOTED([HAVE_NETCF_TRANSACTIONS], [1], - [we have sufficiently new version of netcf for transaction netwo= rk API]) - fi - CFLAGS=3D"$old_CFLAGS" - LIBS=3D"$old_LIBS" - fi + LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.8]) ]) =20 AC_DEFUN([LIBVIRT_RESULT_NETCF],[ diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index 00b5c00822..1db0190a79 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -1124,7 +1124,6 @@ static int netcfInterfaceIsActive(virInterfacePtr ifi= nfo) return ret; } =20 -#ifdef HAVE_NETCF_TRANSACTIONS static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flag= s) { int ret; @@ -1199,7 +1198,6 @@ static int netcfInterfaceChangeRollback(virConnectPtr= conn, unsigned int flags) virObjectUnlock(driver); return ret; } -#endif /* HAVE_NETCF_TRANSACTIONS */ =20 static virInterfaceDriver interfaceDriver =3D { .name =3D INTERFACE_DRIVER_NAME, @@ -1216,11 +1214,9 @@ static virInterfaceDriver interfaceDriver =3D { .interfaceCreate =3D netcfInterfaceCreate, /* 0.7.0 */ .interfaceDestroy =3D netcfInterfaceDestroy, /* 0.7.0 */ .interfaceIsActive =3D netcfInterfaceIsActive, /* 0.7.3 */ -#ifdef HAVE_NETCF_TRANSACTIONS .interfaceChangeBegin =3D netcfInterfaceChangeBegin, /* 0.9.2 */ .interfaceChangeCommit =3D netcfInterfaceChangeCommit, /* 0.9.2 */ .interfaceChangeRollback =3D netcfInterfaceChangeRollback, /* 0.9.2 */ -#endif /* HAVE_NETCF_TRANSACTIONS */ }; =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736500; cv=none; d=zoho.com; s=zohoarc; b=au6qhRYs+VHuIh5fufWz99Bl/PSjcWUNXqwqj2lmGDtdbAzK7+eQQv6/LpNLLz0Uof/uDSU0u7MIb+fhVvdxUPHhh/R9zc5lgu0QZwe+DZ8Wlb6u02xrd2wCPO9/Xz5wJTbrXeA9nbp6cVjdenYVXgtCK2UXMSmQgwIl5qZfzpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736500; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SSVs2Th9YWZSxWZGJ8/UksieTH7ldOJC8ktFh+EaJHg=; b=bKMvDEC/+sZK/MrkAuYOdE8UuOrqFk9T2D12pMunLJ6n9aCEcHME3/G64GIY2nclg+PgNkGuUGNIZVaEpEqPrhUTW2iFmPYBvWUZ/HA8oMpF+7317TxzETuRrkjml0vt/akBkVNnzPvgXoNnn8u60GiKagxeV/uONp28gGBhqrM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571736500444666.1664521929587; Tue, 22 Oct 2019 02:28:20 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-54PYkh5JOeC_aTBaE5xf3w-1; Tue, 22 Oct 2019 05:28:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11E6A801E66; Tue, 22 Oct 2019 09:28:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C03B85D6A5; Tue, 22 Oct 2019 09:28:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 76A8D180B536; Tue, 22 Oct 2019 09:28:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L810jk002392 for ; Mon, 21 Oct 2019 04:01:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 198531001B20; Mon, 21 Oct 2019 08:01:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 911B21001B11 for ; Mon, 21 Oct 2019 08:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736499; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SSVs2Th9YWZSxWZGJ8/UksieTH7ldOJC8ktFh+EaJHg=; b=UO3SahOL+z2sHWQ3qZJL/rr/0huSWZTwrXK5bOEt+bSOwXhmzyetoxqnUVv5mAYgPQZ9M5 qNu1adypypAx4mXYOfP7/AQZ9K3fbfzivizuDnpXGyVgC1FH+ReQ+eblWOJ2C/+xpHj0tp DsdJ28E9+WBUi+vAUOFVLRZifgG6mrQ= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:29 +0200 Message-Id: <68edf0582120fbae7d48de564e8c14a758f44f81.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/25] m4: virt-selinux: remove obsolete checks X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 54PYkh5JOeC_aTBaE5xf3w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All OSes that we support have libselinux >=3D 2.5 except for Ubuntu 16.04 where the version is 2.4. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- m4/virt-selinux.m4 | 20 ++------------------ src/qemu/qemu_domain.c | 4 ++-- src/security/security_selinux.c | 22 ++-------------------- tests/securityselinuxhelper.c | 19 +++++-------------- 4 files changed, 11 insertions(+), 54 deletions(-) diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 index fe274fafe9..64e6980844 100644 --- a/m4/virt-selinux.m4 +++ b/m4/virt-selinux.m4 @@ -27,20 +27,8 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ [fgetfilecon_raw], [selinux/selinux.h]) =20 if test "$with_selinux" =3D "yes"; then - # libselinux changed signatures between 2.2 and 2.3 - AC_CACHE_CHECK([for selinux setcon parameter type], [lv_cv_setcon_cons= t], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -int setcon(char *context); - ]])], - [lv_cv_setcon_const=3D''], - [lv_cv_setcon_const=3D'const'])]) - AC_DEFINE_UNQUOTED([VIR_SELINUX_CTX_CONST], [$lv_cv_setcon_const], - [Define to empty or 'const' depending on how SELinux qualifies its - security context parameters]) - # ...and again for 2.5 + # libselinux changed signatures for 2.5 + # TODO: Drop once we don't support Ubuntu 16.04 AC_CACHE_CHECK([for selinux selabel_open parameter type], [lv_cv_selabel_open_const], [AC_COMPILE_IFELSE( @@ -68,10 +56,6 @@ struct selabel_handle *selabel_open(unsigned, struct sel= inux_opt *, unsigned); fi AC_MSG_RESULT([$SELINUX_MOUNT]) AC_DEFINE_UNQUOTED([SELINUX_MOUNT], ["$SELINUX_MOUNT"], [SELinux mount= point]) - - dnl We prefer to use and selabel_open, but can fall - dnl back to matchpathcon for the sake of RHEL 5's version of libselinu= x. - AC_CHECK_HEADERS([selinux/label.h]) fi ]) =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a97bf65e7f..71478319a6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13262,7 +13262,7 @@ qemuDomainCreateDeviceRecursive(const char *device, } =20 if (tcon && - lsetfilecon_raw(devicePath, (VIR_SELINUX_CTX_CONST char *)tcon) < = 0) { + lsetfilecon_raw(devicePath, (const char *)tcon) < 0) { VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR if (errno !=3D EOPNOTSUPP && errno !=3D ENOTSUP) { VIR_WARNINGS_RESET @@ -14061,7 +14061,7 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid G_GNUC_= UNUSED, =20 # ifdef WITH_SELINUX if (data->tcon && - lsetfilecon_raw(data->file, (VIR_SELINUX_CTX_CONST char *)data->tc= on) < 0) { + lsetfilecon_raw(data->file, (const char *)data->tcon) < 0) { VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR if (errno !=3D EOPNOTSUPP && errno !=3D ENOTSUP) { VIR_WARNINGS_RESET diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 0812def922..386a8b84e6 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -23,9 +23,7 @@ #include #include #include -#if HAVE_SELINUX_LABEL_H -# include -#endif +#include =20 #include "security_driver.h" #include "security_selinux.h" @@ -62,9 +60,7 @@ struct _virSecuritySELinuxData { char *content_context; virHashTablePtr mcs; bool skipAllLabel; -#if HAVE_SELINUX_LABEL_H struct selabel_handle *label_handle; -#endif }; =20 /* Data structure to pass to various callbacks so we have everything we ne= ed */ @@ -642,14 +638,12 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr= mgr) =20 data->skipAllLabel =3D true; =20 -# if HAVE_SELINUX_LABEL_H data->label_handle =3D selabel_open(SELABEL_CTX_FILE, NULL, 0); if (!data->label_handle) { virReportSystemError(errno, "%s", _("cannot open SELinux label_handle")); return -1; } -# endif =20 if (!(selinux_conf =3D virConfReadFile(selinux_lxc_contexts_path(), 0)= )) goto error; @@ -690,10 +684,8 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr = mgr) return 0; =20 error: -# if HAVE_SELINUX_LABEL_H selabel_close(data->label_handle); data->label_handle =3D NULL; -# endif VIR_FREE(data->domain_context); VIR_FREE(data->file_context); VIR_FREE(data->content_context); @@ -719,14 +711,12 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPt= r mgr) =20 data->skipAllLabel =3D false; =20 -#if HAVE_SELINUX_LABEL_H data->label_handle =3D selabel_open(SELABEL_CTX_FILE, NULL, 0); if (!data->label_handle) { virReportSystemError(errno, "%s", _("cannot open SELinux label_handle")); return -1; } -#endif =20 if (virFileReadAll(selinux_virtual_domain_context_path(), MAX_CONTEXT,= &(data->domain_context)) < 0) { virReportSystemError(errno, @@ -777,10 +767,8 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr= mgr) return 0; =20 error: -#if HAVE_SELINUX_LABEL_H selabel_close(data->label_handle); data->label_handle =3D NULL; -#endif VIR_FREE(data->domain_context); VIR_FREE(data->alt_domain_context); VIR_FREE(data->file_context); @@ -1053,10 +1041,8 @@ virSecuritySELinuxDriverClose(virSecurityManagerPtr = mgr) if (!data) return 0; =20 -#if HAVE_SELINUX_LABEL_H if (data->label_handle) selabel_close(data->label_handle); -#endif =20 virHashFree(data->mcs); =20 @@ -1279,7 +1265,7 @@ virSecuritySELinuxSetFileconImpl(const char *path, =20 VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon); =20 - if (setfilecon_raw(path, (VIR_SELINUX_CTX_CONST char *)tcon) < 0) { + if (setfilecon_raw(path, (const char *)tcon) < 0) { int setfilecon_errno =3D errno; =20 if (getfilecon_raw(path, &econ) >=3D 0) { @@ -1465,13 +1451,9 @@ static int getContext(virSecurityManagerPtr mgr G_GNUC_UNUSED, const char *newpath, mode_t mode, security_context_t *fcon) { -#if HAVE_SELINUX_LABEL_H virSecuritySELinuxDataPtr data =3D virSecurityManagerGetPrivateData(mg= r); =20 return selabel_lookup_raw(data->label_handle, fcon, newpath, mode); -#else - return matchpathcon(newpath, mode, fcon); -#endif } =20 =20 diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 6391f67360..3aeb47dea8 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -27,9 +27,7 @@ # include #endif #include -#if HAVE_SELINUX_LABEL_H -# include -#endif +#include #include #include #include @@ -54,7 +52,6 @@ static const char *(*real_selinux_virtual_image_context_p= ath)(void); static const char *(*real_selinux_lxc_contexts_path)(void); #endif =20 -#if HAVE_SELINUX_LABEL_H static struct selabel_handle *(*real_selabel_open)(unsigned int backend, VIR_SELINUX_OPEN_CONST struct selinux_opt *opts, @@ -64,7 +61,6 @@ static int (*real_selabel_lookup_raw)(struct selabel_hand= le *handle, security_context_t *con, const char *key, int type); -#endif =20 static void init_syms(void) { @@ -82,11 +78,9 @@ static void init_syms(void) VIR_MOCK_REAL_INIT(selinux_lxc_contexts_path); #endif =20 -#if HAVE_SELINUX_LABEL_H VIR_MOCK_REAL_INIT(selabel_open); VIR_MOCK_REAL_INIT(selabel_close); VIR_MOCK_REAL_INIT(selabel_lookup_raw); -#endif } =20 =20 @@ -143,7 +137,7 @@ int getpidcon(pid_t pid, security_context_t *context) return getpidcon_raw(pid, context); } =20 -int setcon_raw(VIR_SELINUX_CTX_CONST char *context) +int setcon_raw(const char *context) { if (!is_selinux_enabled()) { errno =3D EINVAL; @@ -152,13 +146,13 @@ int setcon_raw(VIR_SELINUX_CTX_CONST char *context) return setenv("FAKE_SELINUX_CONTEXT", context, 1); } =20 -int setcon(VIR_SELINUX_CTX_CONST char *context) +int setcon(const char *context) { return setcon_raw(context); } =20 =20 -int setfilecon_raw(const char *path, VIR_SELINUX_CTX_CONST char *con) +int setfilecon_raw(const char *path, const char *con) { const char *constr =3D con; if (STRPREFIX(path, abs_builddir "/securityselinuxlabeldata/nfs/")) { @@ -169,7 +163,7 @@ int setfilecon_raw(const char *path, VIR_SELINUX_CTX_CO= NST char *con) constr, strlen(constr), 0); } =20 -int setfilecon(const char *path, VIR_SELINUX_CTX_CONST char *con) +int setfilecon(const char *path, const char *con) { return setfilecon_raw(path, con); } @@ -290,7 +284,6 @@ const char *selinux_lxc_contexts_path(void) } #endif =20 -#if HAVE_SELINUX_LABEL_H struct selabel_handle * selabel_open(unsigned int backend, VIR_SELINUX_OPEN_CONST struct selinux_opt *opts, @@ -333,5 +326,3 @@ int selabel_lookup_raw(struct selabel_handle *handle, errno =3D ENOENT; return -1; } - -#endif --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736431; cv=none; d=zoho.com; s=zohoarc; b=YhIM9d3JEbIpyZoaKGwE6yWC/6Eu239XmjRs0TrY8v9rxpMNiGcBBjvxnFMQtA8D12Y1uM3Fygs2NO9vVyty3idARytdc9YgvP7Tr6KkDmW3fXzSJLJcUPhBylgTEgreDHPQUUnk91UCRh0WCgiwmoCC+bA9BSJ/OyDTKqYxjZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736431; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0geDdAM9891pWneAYYrnddV805XQp9VV1Yr1P9WpYvo=; b=MAnkXB2okO+i5kN8PH1XiDplCnkPqG3oeMHios/JBfb+rDRndh60+Le72mRfYeh4zKW6jNlRSkXYy44swC1B8PpZBoapkxNagXALb+IUjiqyQgfrrnGwiE8W5TFnfD98874qrEfYZGejmHAFcn3G35ThIimT7kYFyRJyRqifSRE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736431451934.0651971953536; Tue, 22 Oct 2019 02:27:11 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-36-Fq-Piz80PhG_v1S5rx1Tvw-1; Tue, 22 Oct 2019 05:27:08 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2D54800D4E; Tue, 22 Oct 2019 09:27:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8FDBD413C; Tue, 22 Oct 2019 09:27:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4366E180B761; Tue, 22 Oct 2019 09:27:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L810Sm002401 for ; Mon, 21 Oct 2019 04:01:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id E0FEC1001B20; Mon, 21 Oct 2019 08:01:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6716B1001938 for ; Mon, 21 Oct 2019 08:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736430; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0geDdAM9891pWneAYYrnddV805XQp9VV1Yr1P9WpYvo=; b=csda3aDzER0WKm4LMRutJ6lV9goo1a6gbEIu0rx/E5rnDNVQq0xXtMXHj8LuHRRdxbkFYO yievZEhKBVivb6u7R3frGLsyPUqheJdwsBIyytpljBEP9WvP8o9v5GACSXVMzjouOpKYks oTsQ0VDWaQ0Q5YpFB60rIDtJ3ELMhac= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:30 +0200 Message-Id: <1b1fd9daea1e0188dcf056a2f40987931bc6ff47.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/25] locking: separate lock driver code into libvirt_driver_lock.la X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: Fq-Piz80PhG_v1S5rx1Tvw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Follow the same pattern as for other sub-directories where we create a static library that is linked into libvirt.os. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/locking/Makefile.inc.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index eccf7c3a4d..2b1c030041 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,6 +1,6 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCES +=3D \ +LOCK_DRIVER_SOURCES =3D \ locking/lock_manager.c \ locking/lock_manager.h \ locking/lock_driver.h \ @@ -47,6 +47,7 @@ EXTRA_DIST +=3D \ $(LOCK_DAEMON_GENERATED) \ $(LOCK_DAEMON_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES) \ + $(LOCK_DRIVER_SOURCES) \ locking/sanlock.conf \ locking/libvirt_sanlock.aug \ locking/test_libvirt_sanlock.aug.in \ @@ -86,6 +87,17 @@ VIRTLOCKD_UNIT_FILES_IN =3D \ SYSTEMD_UNIT_FILES +=3D $(notdir $(VIRTLOCKD_UNIT_FILES_IN:%.in=3D%)) SYSTEMD_UNIT_FILES_IN +=3D $(VIRTLOCKD_UNIT_FILES_IN) =20 +noinst_LTLIBRARIES +=3D libvirt_driver_lock.la + +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_lock.la +libvirt_driver_lock_la_SOURCES =3D \ + $(LOCK_DRIVER_SOURCES) \ + $(NULL) +libvirt_driver_lock_la_CFLAGS =3D \ + $(AM_CFLAGS) \ + -I$(srcdir)/conf \ + $(NULL) + lockdriverdir =3D $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES =3D =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736539; cv=none; d=zoho.com; s=zohoarc; b=FKiDg8ak+CbbYPt+iwc30MEAv9Zqfe4QwM4tYOnIpq/EuAAqGbdzJ3nuy+krH1BxnkMpmmTzVzrgilJR3pYTHI6TwKQjINAAsYqWMgfzLxvkAiRnNpsef2nMbCq/NJDbInUPcD1+8wwI5dhgG4tX2rz2QHytPHulQ2udtKW1sOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736539; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dD6IEPXIhxAUN/M+au03PfSqwqxopC3eqDRhiM/XUV8=; b=kuSAEJjhJT9Bvf4svpKPi35vlAwDUPFKC+GUGF6Z47NV5OMPCNH7NwHV8KRJzL6M0D7qL+B/MaqFj+ifpnvxjIcJLk3kBSLoue2Ig3tET1ss2Hi19r6TeMDjFw6zIu8bjJAF7g+1fgIuAk9wkO56SNAlAyIOH9orp8ocraZL9GQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571736539141969.9879982921602; Tue, 22 Oct 2019 02:28:59 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-285-_lq93uWrN2qf5fK9Wgjgmg-1; Tue, 22 Oct 2019 05:28:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14303801E5C; Tue, 22 Oct 2019 09:28:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE6E75D6B2; Tue, 22 Oct 2019 09:28:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6B941180085A; Tue, 22 Oct 2019 09:28:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L811rQ002409 for ; Mon, 21 Oct 2019 04:01:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id B701D1001B20; Mon, 21 Oct 2019 08:01:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AD7A1001B11 for ; Mon, 21 Oct 2019 08:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736538; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dD6IEPXIhxAUN/M+au03PfSqwqxopC3eqDRhiM/XUV8=; b=jNMnwnkluf7CjWSEz2QlogvgLEziXdPfmzNLq+av0XOt3CyDUt+pRe248qMGGMgNZmvGNA ZJ/L3hKCrSV4G1SRVFhyDUq8DMF7IjKQ8hxSFrApPCts2rsL8kshmOQBTLbboB6Zs5n+1C fJfvQ6Rr12KIYr/FlIEYEv+uptaxQv8= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:31 +0200 Message-Id: <86d22cfe26faab47e60c5ecedbe7f1d69e3dd74f.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/25] logging: separate log driver code into libvirt_driver_log.la X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: _lq93uWrN2qf5fK9Wgjgmg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Follow the same pattern as for other sub-directories where we create a static library that is linked into libvirt.os. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/logging/Makefile.inc.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 74e94636a6..7d10b646ea 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -9,7 +9,7 @@ LOG_DAEMON_GENERATED =3D \ logging/log_daemon_dispatch_stubs.h $(NULL) =20 -DRIVER_SOURCES +=3D \ +LOG_DRIVER_SOURCES =3D \ $(LOG_PROTOCOL_GENERATED) \ logging/log_manager.c \ logging/log_manager.h \ @@ -33,6 +33,7 @@ EXTRA_DIST +=3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(LOG_DAEMON_SOURCES) \ + $(LOG_DRIVER_SOURCES) \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ @@ -59,6 +60,17 @@ VIRTLOGD_UNIT_FILES_IN =3D \ SYSTEMD_UNIT_FILES +=3D $(notdir $(VIRTLOGD_UNIT_FILES_IN:%.in=3D%)) SYSTEMD_UNIT_FILES_IN +=3D $(VIRTLOGD_UNIT_FILES_IN) =20 +noinst_LTLIBRARIES +=3D libvirt_driver_log.la + +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_log.la +libvirt_driver_log_la_SOURCES =3D \ + $(LOG_DRIVER_SOURCES) \ + $(NULL) +libvirt_driver_log_la_CFLAGS =3D \ + $(AM_CFLAGS) \ + $(XDR_CFLAGS) \ + $(NULL) + if WITH_LIBVIRTD sbin_PROGRAMS +=3D virtlogd =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736482; cv=none; d=zoho.com; s=zohoarc; b=DsyUbX5OvXgU/UhyIif9f4S4jnPnR6uBhMke4N78MdW0tkljlHmtw9KBrR8NFmg9JHYb4mElkKGpBV7Y81BO5nXamla9DFwq1fCpxZCo1oDSids9Gj3VCzd440z/5XW/FsRj0Xlo91GO3DOsQaVtmqePcQEojds/8S4eX/SH2vI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736482; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IpdaPzQQUlG8fQ7M/FFhii7pJg9YY8YRMBZ8G9288KE=; b=LevIuEYoNN3xC1m6eqBow5ay6kjrGqxutXH5VAWblVBFf72Md32QgfxBJ6mx/vcl8+hyeHvBrgiKNEnGJ5x16uvKbrG/1RLrX5KlMkSP85W8R7h+D4LIJDH8bODOGqvWz7QTlzjzW7ZJFghLhvWM1HZjJGTgSeqoM45PE7RDs2Y= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 157173648282648.9499224291601; Tue, 22 Oct 2019 02:28:02 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-248-0xUio6vKP1uIcoXiK2CSRQ-1; Tue, 22 Oct 2019 05:27:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 226EE1800D6A; Tue, 22 Oct 2019 09:27:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D7B6860BBF; Tue, 22 Oct 2019 09:27:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AAB6618089DC; Tue, 22 Oct 2019 09:27:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L812rp002423 for ; Mon, 21 Oct 2019 04:01:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 93C2D10016EB; Mon, 21 Oct 2019 08:01:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 128CF1001B11 for ; Mon, 21 Oct 2019 08:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736481; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IpdaPzQQUlG8fQ7M/FFhii7pJg9YY8YRMBZ8G9288KE=; b=HIYFnMlFKAVJSqVgRmt6Sidi7fC7fz2ON8SaP+YeZO1fG82m60uU+0mPaUOdo0hwz/w4yA LbTmrt5T+dRRSN6Ue5cbDSTHxg5GQA1F8k7sY59qgOrjqfBQrwJN3ropjcN4YdyHbvCZ1I jipYsjy3e8q30YzWE/dRspvLwihq5AE= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/25] remote: unify rpc server dispatch generated files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 0xUio6vKP1uIcoXiK2CSRQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Our naming was not consistent. Use the protocol name as prefix for all generated files. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- build-aux/syntax-check.mk | 6 +++--- po/POTFILES | 2 +- src/remote/Makefile.inc.am | 12 ++++++------ src/remote/remote_daemon_dispatch.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 033eaf70c4..c88c1991f4 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -2163,14 +2163,14 @@ group-qemu-caps: # sc_po_check can fail if generated files are not built first sc_po_check: \ $(srcdir)/src/remote/remote_daemon_dispatch_stubs.h \ - $(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h \ + $(srcdir)/src/remote/qemu_daemon_dispatch_stubs.h \ $(srcdir)/src/remote/remote_client_bodies.h \ $(srcdir)/src/admin/admin_server_dispatch_stubs.h \ $(srcdir)/src/admin/admin_client.h $(srcdir)/src/remote/remote_daemon_dispatch_stubs.h: $(srcdir)/src/remote/= remote_protocol.x $(MAKE) -C src remote/remote_daemon_dispatch_stubs.h -$(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/src/re= mote/qemu_protocol.x - $(MAKE) -C src remote/remote_daemon_dispatch_qemu_stubs.h +$(srcdir)/src/remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/src/remote/qe= mu_protocol.x + $(MAKE) -C src remote/qemu_daemon_dispatch_stubs.h $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_p= rotocol.x $(MAKE) -C src remote/remote_client_bodies.h $(srcdir)/src/admin/admin_server_dispatch_stubs.h: $(srcdir)/src/admin/adm= in_protocol.x diff --git a/po/POTFILES b/po/POTFILES index 9385fc4e15..8a6df49eeb 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -146,12 +146,12 @@ src/qemu/qemu_monitor_json.c src/qemu/qemu_monitor_text.c src/qemu/qemu_process.c src/qemu/qemu_qapi.c +src/remote/qemu_daemon_dispatch_stubs.h src/remote/remote_client_bodies.h src/remote/remote_daemon.c src/remote/remote_daemon_config.c src/remote/remote_daemon_dispatch.c src/remote/remote_daemon_dispatch_stubs.h -src/remote/remote_daemon_dispatch_qemu_stubs.h src/remote/remote_daemon_stream.c src/remote/remote_driver.c src/rpc/virkeepalive.c diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 071d19d26a..acea567abe 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -20,8 +20,8 @@ REMOTE_DRIVER_SOURCES =3D \ =20 REMOTE_DAEMON_GENERATED =3D \ remote/remote_daemon_dispatch_stubs.h \ - remote/remote_daemon_dispatch_lxc_stubs.h \ - remote/remote_daemon_dispatch_qemu_stubs.h \ + remote/lxc_daemon_dispatch_stubs.h \ + remote/qemu_daemon_dispatch_stubs.h \ $(NULL) =20 REMOTE_DAEMON_SOURCES =3D \ @@ -438,17 +438,17 @@ remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/= gendispatch.pl \ --mode=3Dserver remote REMOTE $(REMOTE_PROTOCOL) \ > $(srcdir)/remote/remote_daemon_dispatch_stubs.h =20 -remote/remote_daemon_dispatch_lxc_stubs.h: $(srcdir)/rpc/gendispatch.pl \ +remote/lxc_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=3Dserver lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/remote/remote_daemon_dispatch_lxc_stubs.h + > $(srcdir)/remote/lxc_daemon_dispatch_stubs.h =20 -remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/rpc/gendispatch.pl \ +remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=3Dserver qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/remote/remote_daemon_dispatch_qemu_stubs.h + > $(srcdir)/remote/qemu_daemon_dispatch_stubs.h =20 libvirtd.8.in: remote/libvirtd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 56a46a13be..3d834e2718 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -131,8 +131,8 @@ remoteGetStorageConn(virNetServerClientPtr client); =20 =20 #include "remote_daemon_dispatch_stubs.h" -#include "remote_daemon_dispatch_qemu_stubs.h" -#include "remote_daemon_dispatch_lxc_stubs.h" +#include "qemu_daemon_dispatch_stubs.h" +#include "lxc_daemon_dispatch_stubs.h" =20 =20 /* Prototypes */ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736370; cv=none; d=zoho.com; s=zohoarc; b=MznelEAFegSQAfZtt9VM5MqN2hYDsV7xdoR+QAzjgKWf9FEIuILQ8SDAKlzBlPzyLNx5+FfC+WyhjBQfzmuMQS5XGFxPHu5b1fzvDOt//NJc26FJH2cxfO5JK+veIctVHoMz+JYNdjgfxrnWXxT2ftf3tOfiRwQNlg3pAM24dZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736370; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4JEWcf657uSWCEfEnSxvX4dZH5Z0bC9clOgLrZUp9ow=; b=VswybtwnTg8/0VPKsDBEfcm/GZcurIhMk1iTZHenpUdNOdyqj/9yFibKbYteObrNPuYLYBwnFmYYs70NPc3l4uvWRTha9Gvb6OeBPOSos8DasE+T+gIMtqsFoQdF/DlBcS01OTiuluO7C/564EdKkT3M/lT2bHwQFTjKjiUmP30= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736370809189.36996302992839; Tue, 22 Oct 2019 02:26:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-18-Wqg8d7OYN8yVVlBLC4Qz3Q-1; Tue, 22 Oct 2019 05:26:07 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 900121800E02; Tue, 22 Oct 2019 09:26:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 643E160856; Tue, 22 Oct 2019 09:26:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1057E180B76F; Tue, 22 Oct 2019 09:26:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L813Fc002434 for ; Mon, 21 Oct 2019 04:01:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6CD591001B11; Mon, 21 Oct 2019 08:01:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF65E10016EB for ; Mon, 21 Oct 2019 08:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736369; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4JEWcf657uSWCEfEnSxvX4dZH5Z0bC9clOgLrZUp9ow=; b=Lf+y+c9jHLn4aiIHTTNHT26po5WILVvgBNJkAqY4iy5WAWPO7nTMM4cCpQZR0BNtoyzTA9 VIQfwcVzhHisacz6ciTUN1Lo8KefJbDbWScUbyXaglSjcduIQSHz7AytNRkll//ABZIHC+ WIabp1KszugNPEQJDagz4OiWVZUzrHQ= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:33 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/25] build: move admin code into admin directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: Wqg8d7OYN8yVVlBLC4Qz3Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There is no need to have the libvirt-admin.so library definition in the src directory. In addition the library uses directly code from admin sub-directory so move the remaining bits there as well. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- docs/Makefile.am | 2 +- docs/apibuild.py | 3 +- m4/virt-win-symbols.m4 | 4 +- po/POTFILES | 2 +- src/Makefile.am | 81 +------------------- src/admin/Makefile.inc.am | 87 +++++++++++++++++++++- src/{ =3D> admin}/libvirt-admin.c | 0 src/{ =3D> admin}/libvirt-admin.conf | 0 src/{ =3D> admin}/libvirt_admin_private.syms | 0 src/{ =3D> admin}/libvirt_admin_public.syms | 0 10 files changed, 95 insertions(+), 84 deletions(-) rename src/{ =3D> admin}/libvirt-admin.c (100%) rename src/{ =3D> admin}/libvirt-admin.conf (100%) rename src/{ =3D> admin}/libvirt_admin_private.syms (100%) rename src/{ =3D> admin}/libvirt_admin_public.syms (100%) diff --git a/docs/Makefile.am b/docs/Makefile.am index 10476902a9..5b2896bbe5 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -315,7 +315,7 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ $(top_srcdir)/src/libvirt-stream.c \ $(top_srcdir)/src/libvirt-lxc.c \ $(top_srcdir)/src/libvirt-qemu.c \ - $(top_srcdir)/src/libvirt-admin.c \ + $(top_srcdir)/src/admin/libvirt-admin.c \ $(top_srcdir)/src/util/virerror.c \ $(top_srcdir)/src/util/virevent.c \ $(top_srcdir)/src/util/virtypedparam-public.c diff --git a/docs/apibuild.py b/docs/apibuild.py index 4f0d170975..e79ead0b53 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -67,7 +67,7 @@ lxc_included_files =3D { =20 admin_included_files =3D { "libvirt-admin.h": "header with admin specific API definitions", - "libvirt-admin.c": "Implementations for the admin specific APIs", + "admin/libvirt-admin.c": "Implementations for the admin specific APIs", } =20 ignored_words =3D { @@ -2549,6 +2549,7 @@ class app: if not quiet: print("Rebuilding API description for %s" % name) dirs =3D [srcdir + "/../src", + srcdir + "/../src/admin", srcdir + "/../src/util", srcdir + "/../include/libvirt"] if (builddir and diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4 index 3b2038e6bf..66dd3b7b1c 100644 --- a/m4/virt-win-symbols.m4 +++ b/m4/virt-win-symbols.m4 @@ -19,7 +19,7 @@ dnl =20 AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ LIBVIRT_SYMBOL_FILE=3Dlibvirt.syms - LIBVIRT_ADMIN_SYMBOL_FILE=3Dlibvirt_admin.syms + LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.syms LIBVIRT_LXC_SYMBOL_FILE=3D'$(srcdir)/libvirt_lxc.syms' LIBVIRT_QEMU_SYMBOL_FILE=3D'$(srcdir)/libvirt_qemu.syms' case "$host" in @@ -28,7 +28,7 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ # from libvirt.syms and passes libvirt.def instead of libvirt.syms t= o the # linker LIBVIRT_SYMBOL_FILE=3Dlibvirt.def - LIBVIRT_ADMIN_SYMBOL_FILE=3Dlibvirt_admin.def + LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.def LIBVIRT_LXC_SYMBOL_FILE=3Dlibvirt_lxc.def LIBVIRT_QEMU_SYMBOL_FILE=3Dlibvirt_qemu.def ;; diff --git a/po/POTFILES b/po/POTFILES index 8a6df49eeb..8e863dfbea 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -5,6 +5,7 @@ src/access/viraccessmanager.c src/admin/admin_server.c src/admin/admin_server_dispatch.c src/admin/admin_server_dispatch_stubs.h +src/admin/libvirt-admin.c src/bhyve/bhyve_capabilities.c src/bhyve/bhyve_command.c src/bhyve/bhyve_device.c @@ -68,7 +69,6 @@ src/hyperv/hyperv_wmi.c src/interface/interface_backend_netcf.c src/interface/interface_backend_udev.c src/internal.h -src/libvirt-admin.c src/libvirt-domain-checkpoint.c src/libvirt-domain-snapshot.c src/libvirt-domain.c diff --git a/src/Makefile.am b/src/Makefile.am index 937f5216da..56b1ed48cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,6 +65,7 @@ MAINTAINERCLEANFILES =3D nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D +lib_LTLIBRARIES =3D noinst_LTLIBRARIES =3D mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D @@ -145,12 +146,12 @@ SECDRIVER_LIBS +=3D $(APPARMOR_LIBS) endif WITH_SECDRIVER_APPARMOR =20 =20 -lib_LTLIBRARIES =3D libvirt.la libvirt-qemu.la libvirt-lxc.la +lib_LTLIBRARIES +=3D libvirt.la libvirt-qemu.la libvirt-lxc.la =20 moddir =3D $(libdir)/libvirt/connection-driver =20 confdir =3D $(sysconfdir)/libvirt -conf_DATA +=3D libvirt.conf libvirt-admin.conf +conf_DATA +=3D libvirt.conf =20 CLEANFILES +=3D $(nodist_conf_DATA) BUILT_SOURCES +=3D $(nodist_conf_DATA) @@ -276,19 +277,12 @@ if WITH_LINUX check-symfile: libvirt.syms libvirt.la $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \ .libs/libvirt.so -check-admin-symfile: libvirt_admin.syms libvirt-admin.la - $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt_admin.syms \ - .libs/libvirt-admin.so else ! WITH_LINUX check-symfile: -check-admin-symfile: endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ $(srcdir) $(SYM_FILES) -check-admin-symsorting: - $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ - $(srcdir) $(ADMIN_SYM_FILES) EXTRA_DIST +=3D check-symfile.pl check-symsorting.pl =20 # Keep this list synced with RPC_PROBE_FILES @@ -339,7 +333,6 @@ check-drivername: $(AM_V_GEN)$(PERL) $(srcdir)/check-drivername.pl \ $(srcdir)/driver.h \ $(srcdir)/libvirt_public.syms \ - $(srcdir)/libvirt_admin_public.syms \ $(srcdir)/libvirt_qemu.syms \ $(srcdir)/libvirt_lxc.syms =20 @@ -366,7 +359,7 @@ EXTRA_DIST +=3D check-driverimpls.pl check-aclrules.pl = check-aclperms.pl =20 check-local: check-protocol check-symfile check-symsorting \ check-drivername check-driverimpls check-aclrules \ - check-aclperms check-admin-symfile check-admin-symsorting + check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 =20 @@ -393,7 +386,6 @@ SYM_FILES +=3D $(USED_SYM_FILES) USED_SYM_FILES +=3D $(srcdir)/libvirt_private.syms GENERATED_SYM_FILES +=3D \ libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \ - libvirt_admin.syms libvirt_admin.def \ $(NULL) =20 =20 @@ -480,9 +472,7 @@ EXTRA_DIST +=3D \ libvirt_public.syms \ libvirt_lxc.syms \ libvirt_qemu.syms \ - libvirt_admin_public.syms \ $(SYM_FILES) \ - $(ADMIN_SYM_FILES) \ $(NULL) =20 BUILT_SOURCES +=3D $(GENERATED_SYM_FILES) @@ -509,69 +499,6 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \ chmod a-w $@-tmp && \ mv $@-tmp $@ =20 -libvirt_admin.syms: libvirt_admin_public.syms $(ADMIN_SYM_FILES) \ - $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-tmp $@ ; \ - printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \ - cat $(srcdir)/libvirt_admin_public.syms >>$@-tmp && \ - printf '\n\n# Private symbols\n\n' >>$@-tmp && \ - printf 'LIBVIRT_ADMIN_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \ - printf 'global:\n\n' >>$@-tmp && \ - cat $(ADMIN_SYM_FILES) >>$@-tmp && \ - printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \ - chmod a-w $@-tmp && \ - mv $@-tmp libvirt_admin.syms - - -lib_LTLIBRARIES +=3D libvirt-admin.la -libvirt_admin_la_SOURCES =3D \ - libvirt-admin.c \ - $(ADMIN_PROTOCOL_GENERATED) \ - $(DATATYPES_SOURCES) - -libvirt_admin_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(LIBVIRT_NODELETE) \ - $(AM_LDFLAGS) \ - $(NULL) - -libvirt_admin_la_LIBADD =3D \ - libvirt.la \ - $(CYGWIN_EXTRA_LIBADD) - -libvirt_admin_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - -I$(srcdir)/remote \ - -I$(srcdir)/rpc \ - -I$(srcdir)/admin - -libvirt_admin_la_CFLAGS +=3D \ - $(XDR_CFLAGS) \ - $(CAPNG_CFLAGS) \ - $(YAJL_CFLAGS) \ - $(SSH2_CFLAGS) \ - $(SASL_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(LIBSSH_CFLAGS) - -libvirt_admin_la_LIBADD +=3D \ - $(CAPNG_LIBS) \ - $(YAJL_LIBS) \ - $(DEVMAPPER_LIBS) \ - $(LIBXML_LIBS) \ - $(GLIB_LIBS) \ - $(SSH2_LIBS) \ - $(SASL_LIBS) \ - $(GNUTLS_LIBS) \ - $(LIBSSH_LIBS) - -ADMIN_SYM_FILES =3D $(srcdir)/libvirt_admin_private.syms - -if WITH_DTRACE_PROBES -libvirt_admin_la_LIBADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES =3D libvirt_la_LDFLAGS =3D \ diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 4cc588a47c..4fd7878e5c 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -40,10 +40,80 @@ libvirt_driver_admin_la_CFLAGS +=3D \ $(NULL) endif WITH_SASL =20 -# admin/admin_remote.c is being included in libvirt-admin.c, so we +GENERATED_SYM_FILES +=3D admin/libvirt_admin.syms admin/libvirt_admin.def + +ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms + +# admin/admin_remote.c is being included in admin/libvirt-admin.c, so we # need to include it in the dist -EXTRA_DIST +=3D admin/admin_remote.c +EXTRA_DIST +=3D \ + admin/admin_remote.c \ + admin/libvirt_admin_public.syms \ + $(ADMIN_SYM_FILES) \ + $(NULL) =20 +conf_DATA +=3D admin/libvirt-admin.conf + +lib_LTLIBRARIES +=3D libvirt-admin.la + +libvirt_admin_la_SOURCES =3D \ + admin/libvirt-admin.c \ + $(ADMIN_PROTOCOL_GENERATED) \ + $(DATATYPES_SOURCES) + +libvirt_admin_la_LDFLAGS =3D \ + $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \ + -version-info $(LIBVIRT_VERSION_INFO) \ + $(LIBVIRT_NODELETE) \ + $(AM_LDFLAGS) \ + $(NULL) + +libvirt_admin_la_LIBADD =3D \ + libvirt.la \ + $(CYGWIN_EXTRA_LIBADD) \ + $(CAPNG_LIBS) \ + $(YAJL_LIBS) \ + $(DEVMAPPER_LIBS) \ + $(LIBXML_LIBS) \ + $(GLIB_LIBS) \ + $(SSH2_LIBS) \ + $(SASL_LIBS) \ + $(GNUTLS_LIBS) \ + $(LIBSSH_LIBS) + +if WITH_DTRACE_PROBES +libvirt_admin_la_LIBADD +=3D libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirt_admin_la_CFLAGS =3D \ + $(AM_CFLAGS) \ + -I$(srcdir)/remote \ + -I$(srcdir)/rpc \ + $(XDR_CFLAGS) \ + $(CAPNG_CFLAGS) \ + $(YAJL_CFLAGS) \ + $(SSH2_CFLAGS) \ + $(SASL_CFLAGS) \ + $(GNUTLS_CFLAGS) \ + $(LIBSSH_CFLAGS) + +if WITH_LINUX +check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la + $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl admin/libvirt_admin.syms \ + .libs/libvirt-admin.so +else ! WITH_LINUX +check-admin-symfile: +endif ! WITH_LINUX + +check-admin-symsorting: + $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ + $(srcdir) $(ADMIN_SYM_FILES) + +check-admin-drivername: + $(AM_V_GEN)$(PERL) $(srcdir)/check-drivername.pl \ + $(srcdir)/admin/libvirt_admin_public.syms + +check-admin: check-admin-symfile check-admin-symsorting check-admin-driver= name =20 admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ $(ADMIN_PROTOCOL) Makefile.am @@ -56,3 +126,16 @@ admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gend= ispatch.pl \ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ admin ADMIN $(ADMIN_PROTOCOL) \ > $(srcdir)/admin/admin_server_dispatch_stubs.h + +admin/libvirt_admin.syms: admin/libvirt_admin_public.syms $(ADMIN_SYM_FILE= S) \ + $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-tmp $@ ; \ + printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \ + cat $(srcdir)/admin/libvirt_admin_public.syms >>$@-tmp && \ + printf '\n\n# Private symbols\n\n' >>$@-tmp && \ + printf 'LIBVIRT_ADMIN_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \ + printf 'global:\n\n' >>$@-tmp && \ + cat $(ADMIN_SYM_FILES) >>$@-tmp && \ + printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \ + chmod a-w $@-tmp && \ + mv $@-tmp admin/libvirt_admin.syms diff --git a/src/libvirt-admin.c b/src/admin/libvirt-admin.c similarity index 100% rename from src/libvirt-admin.c rename to src/admin/libvirt-admin.c diff --git a/src/libvirt-admin.conf b/src/admin/libvirt-admin.conf similarity index 100% rename from src/libvirt-admin.conf rename to src/admin/libvirt-admin.conf diff --git a/src/libvirt_admin_private.syms b/src/admin/libvirt_admin_priva= te.syms similarity index 100% rename from src/libvirt_admin_private.syms rename to src/admin/libvirt_admin_private.syms diff --git a/src/libvirt_admin_public.syms b/src/admin/libvirt_admin_public= .syms similarity index 100% rename from src/libvirt_admin_public.syms rename to src/admin/libvirt_admin_public.syms --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736512; cv=none; d=zoho.com; s=zohoarc; b=BGQfMkd/EqKnmYKtiZGKne2+Bq7ybjUU7E6Z+VZwgKeVtd+I7siIIP/tOuajqGHCNUk5/bt+AEmwN3l2knw9s8T6CsPw7moZ6GK3+a2yE5ho9rQHana9NCTngBiFa8jX8s+NXUcAamFiEV1ADhc98umyn2m9LFm8LTmj87+OczI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736512; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vEmCcILPqyzwz5vu53aIDG93fjaemkLA28Id7tIJPuU=; b=LkZZWb/ablcjaqoqxDVxpg8H2s/oWuZ/MS4MprhWHKL/hgoTE+sg8ggdlugs+hdf2dph1QhQmXlTQO6pvKR3ZuEm8O5fANTmIjA9JRlGXHgHHB07oAyLo186n7yafdgPCsz5Iw3e9vC0xLplm6iRY6GhkrINI+QbIuFx5AHr/ug= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736512646744.9954893551718; Tue, 22 Oct 2019 02:28:32 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-336-igba8HeCNtWdA4KQNJOHKA-1; Tue, 22 Oct 2019 05:28:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78C255E4; Tue, 22 Oct 2019 09:28:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4D2295D6B0; Tue, 22 Oct 2019 09:28:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0E9153FB41; Tue, 22 Oct 2019 09:28:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L814Dn002441 for ; Mon, 21 Oct 2019 04:01:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3D12B1001B20; Mon, 21 Oct 2019 08:01:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7E521001B11 for ; Mon, 21 Oct 2019 08:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736511; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vEmCcILPqyzwz5vu53aIDG93fjaemkLA28Id7tIJPuU=; b=NNgLSNTsMnzJNO1ua0aVY+1BJOrBFVZUtY5GNTpo/BomVnAVqVp5FCMVlij+YBaTH6OsHE kstAN0/uZrjphonJFtV2UKAX3a0KlZuPYaXHKOb67KHbyYSfYjEjk4MMHB+UGwPHs0eVBv vWYbb6I5wzFMI1vGcCK4h0VMZb/ECTs= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:34 +0200 Message-Id: <4f6ae9cf6681099c2ca078ffb5a26f46d8f1bc16.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/25] src: move nodist_libvirt_driver_remote_la_SOURCES into remote Makefile X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: igba8HeCNtWdA4KQNJOHKA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit <124f06534c65618b1eeeee07bb26182ab8e30119> moved remote related build rules into separate makefile but forgot to move this part as well. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/Makefile.am | 3 --- src/remote/Makefile.inc.am | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 56b1ed48cb..34dfeeb9f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -529,9 +529,6 @@ if WITH_DTRACE_PROBES libvirt_la_BUILT_LIBADD +=3D libvirt_probes.lo libvirt_la_DEPENDENCIES +=3D libvirt_probes.lo libvirt_probes.o nodist_libvirt_la_SOURCES =3D libvirt_probes.h -if WITH_REMOTE -nodist_libvirt_driver_remote_la_SOURCES =3D libvirt_probes.h -endif WITH_REMOTE DTRACE2SYSTEMTAP_FLAGS =3D --with-modules =20 BUILT_SOURCES +=3D libvirt_probes.h libvirt_probes.stp libvirt_functions.s= tp diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index acea567abe..5c5f5f4d2c 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -179,6 +179,10 @@ libvirt_driver_remote_la_CFLAGS =3D \ libvirt_driver_remote_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_driver_remote_la_SOURCES =3D $(REMOTE_DRIVER_SOURCES) =20 +if WITH_DTRACE_PROBES +nodist_libvirt_driver_remote_la_SOURCES =3D libvirt_probes.h +endif WITH_DTRACE_PROBES + if WITH_SASL libvirt_driver_remote_la_CFLAGS +=3D \ $(SASL_CFLAGS) \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736607; cv=none; d=zoho.com; s=zohoarc; b=W8zAiDxxWawwDkfp55H8XU5s0k3RtTwVRI7lWeoYFpwXjs+naAu0t7QYH/S8W/wRwieHg597v2dHD4vtuODroMBPdnKm4ejnVlf5q7ljq/DPBuehMumRwtYQIjyhQpXgW1CaTrS3SjRfDJp/23432OIzGZsn92hfvpYzqSVsANE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736607; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UtWB+X0lMK8jqjehqnDHu6SV0TNpHqmwEg1amU/TVGc=; b=jYjSsxlzPyGV6rZaA0NOFLvh+88qm4F1JFZU4WM6KrFdWgWT0n0Sij2B4/lgRrzit89ZpoBkHWy9jNDplSv3BlcyQ9N7VeehWmfpFkSV5BWoWFBiCoxVPDrGobMhh63l5Ym5YtUcbhSv1EOSXbczLPePo0FmHgZKspuQDPZO8Hc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571736607741851.5084105132112; Tue, 22 Oct 2019 02:30:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-150-498m1Y85Ocy3v3AAm3ukVQ-1; Tue, 22 Oct 2019 05:29:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A27701800D6A; Tue, 22 Oct 2019 09:29:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 783141001B33; Tue, 22 Oct 2019 09:29:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 365C63FB44; Tue, 22 Oct 2019 09:29:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L8150W002450 for ; Mon, 21 Oct 2019 04:01:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 19C621001938; Mon, 21 Oct 2019 08:01:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DCD01001B11 for ; Mon, 21 Oct 2019 08:01:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736606; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UtWB+X0lMK8jqjehqnDHu6SV0TNpHqmwEg1amU/TVGc=; b=Cw8PJMxRAKrEaIb/uJdbQ4xUj5K2Qk0ZrL4EETeSUZvx5u2pSKI9mQcEgjpdXWRxDSol4Q 4+MEMBalb7L9l91lPjUDVpuhqdDeFMjCHLNKpUg8lvhKX6xh3T/nEe9wxDdYDTg7xpD9Dy w/YihdQrCEPoiYf1KmX5p9Pb0TTEAD4= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:35 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/25] docs: apibuild: remove old code paths X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 498m1Y85Ocy3v3AAm3ukVQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There is no need to keep old compatibility code around as it it will never be used in our current source tree. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- docs/apibuild.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index e79ead0b53..d3d0be2d83 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2543,25 +2543,15 @@ class app: builder =3D None srcdir =3D os.path.abspath((os.environ["srcdir"])) builddir =3D os.path.abspath((os.environ["builddir"])) - if srcdir =3D=3D builddir: - builddir =3D None if glob.glob(srcdir + "/../src/libvirt.c") !=3D []: if not quiet: print("Rebuilding API description for %s" % name) dirs =3D [srcdir + "/../src", srcdir + "/../src/admin", srcdir + "/../src/util", - srcdir + "/../include/libvirt"] - if (builddir and - not os.path.exists(srcdir + "/../include/libvirt/libvirt-c= ommon.h")): - dirs.append(builddir + "/../include/libvirt") + srcdir + "/../include/libvirt", + builddir + "/../include/libvirt"] builder =3D docBuilder(name, srcdir, dirs, []) - elif glob.glob("src/libvirt.c") !=3D []: - if not quiet: - print("Rebuilding API description for %s" % name) - builder =3D docBuilder(name, srcdir, - ["src", "src/util", "include/libvirt"], - []) else: self.warning("rebuild() failed, unable to guess the module") return None --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736593; cv=none; d=zoho.com; s=zohoarc; b=dQwwfJsYSxsMBdbOlZNRL+uypLKxyHQOeoiTjzSjD8+3yLTAGEoUJRQyqxw+ZWlEkIq+VIZ2q70NvQaz7plnX4Y8wkHtbFJJUCsx1o4wLFO79leNl/V8mW5DxqdXcTE6wNQEyeqzEyN9KzWPYRZ5k2x4neWgagp+ju3gKfIIJiU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736593; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JqhzoX9n+FEIh3NYVhaEsu+d9sm7oguiKrtVGYuYFzw=; b=QOK3w8ydLGPgImOm7nKEjEp4yFKzw0CVtjktd6Zxc0yFB2IVrsal+zHrLgO11UIT/10Qgr2qFkTNSliBTk195YIowxe9N7NPtEaL3NOIRaCW/H2ND17QfrC/IR0h+gnQ6iVJXsR03Rj2hrhKNpKpeKpY/x++O8fVqi22vb0n8CQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736593588404.45129853699143; Tue, 22 Oct 2019 02:29:53 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-mJO7lyU5OT2LXKze74SpYA-1; Tue, 22 Oct 2019 05:29:50 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 998D3801E52; Tue, 22 Oct 2019 09:29:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74E345D6B0; Tue, 22 Oct 2019 09:29:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 34EE51803517; Tue, 22 Oct 2019 09:29:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L815mZ002459 for ; Mon, 21 Oct 2019 04:01:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id E32101001B20; Mon, 21 Oct 2019 08:01:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64E501001B11 for ; Mon, 21 Oct 2019 08:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736592; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JqhzoX9n+FEIh3NYVhaEsu+d9sm7oguiKrtVGYuYFzw=; b=BcTrdKZ8RBpHISEIIXmKI0sffYbRhcoxFz/XYSnUPtdIZHBB5//Ri3h2D96afStCjqxAu1 5Pd4P+ee71WIVIVWmo+2rswo39G2abNfTEmoFyfWV6J3jR+J/zW0fsrHaRB8YAfNbv5NPQ eNXITEfAtjjABzi//Di1Uda4m+Ohkfc= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:36 +0200 Message-Id: <10bb7f4dfa102d89291fb79f8db6ba0f62732755.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/25] docs: generate files into build dir and stop distributing them X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: mJO7lyU5OT2LXKze74SpYA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Historically we did not support VPATH builds and everything was generated into source directory. The introduction of VPATH builds did not changed the way how our documentation is handled. This patch changes the rules to generate everything into build directory and stops distributing generated files in order to have properly separated VPATH builds. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- docs/Makefile.am | 113 ++++++++++++++++++++++------------------------ docs/apibuild.py | 2 +- docs/hvsupport.pl | 37 +++++++-------- 3 files changed, 74 insertions(+), 78 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 5b2896bbe5..0311bbedd8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -116,15 +116,15 @@ kbase_html_in =3D \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/kbase/*.html.in)) kbase_html =3D $(kbase_html_in:%.html.in=3D%.html) =20 -# Since we ship pre-built html in the tarball, we must also -# ship the sources, even when those sources are themselves -# generated. # Generate hvsupport.html and news.html first, since they take one extra s= tep. -dot_html_in =3D \ +dot_html_generated_in =3D \ hvsupport.html.in \ - news.html.in \ + news.html.in +dot_html_in =3D \ $(notdir $(wildcard $(srcdir)/*.html.in)) -dot_html =3D $(dot_html_in:%.html.in=3D%.html) +dot_html =3D \ + $(dot_html_generated_in:%.html.in=3D%.html) \ + $(dot_html_in:%.html.in=3D%.html) =20 xml =3D \ libvirt-api.xml \ @@ -166,27 +166,32 @@ EXTRA_DIST=3D \ apibuild.py genaclperms.pl \ site.xsl subsite.xsl newapi.xsl page.xsl \ wrapstring.xsl \ - $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ - $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \ + $(dot_html_in) $(gif) $(apipng) \ + $(fig) $(png) $(css) \ $(javascript) $(logofiles) \ - $(internals_html_in) $(internals_html) $(fonts) \ - $(kbase_html_in) $(kbase_html) \ + $(internals_html_in) $(fonts) \ + $(kbase_html_in) \ aclperms.htmlinc \ hvsupport.pl \ $(schema_DATA) =20 acl_generated =3D aclperms.htmlinc =20 -$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ +aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ $(srcdir)/genaclperms.pl Makefile.am $(AM_V_GEN)$(PERL) $(srcdir)/genaclperms.pl $< > $@ =20 -MAINTAINERCLEANFILES =3D \ - $(addprefix $(srcdir)/,$(dot_html)) \ - $(addprefix $(srcdir)/,$(apihtml)) \ - $(addprefix $(srcdir)/,$(internals_html)) \ - $(addprefix $(srcdir)/,$(kbase_html)) \ - $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc +CLEANFILES =3D \ + $(dot_html) \ + $(apihtml) \ + $(internals_html) \ + $(kbase_html) \ + $(xml) \ + $(qemu_xml) \ + $(lxc_xml) \ + $(admin_xml) \ + $(dot_html_generated_in) \ + aclperms.htmlinc =20 timestamp=3D"$(shell if test -n "$$SOURCE_DATE_EPOCH"; \ then \ @@ -197,21 +202,21 @@ timestamp=3D"$(shell if test -n "$$SOURCE_DATE_EPOCH"= ; \ =20 all-am: web =20 -api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml -qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml -lxc_api: $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml -admin_api: $(srcdir)/libvirt-admin-api.xml $(srcdir)/libvirt-admin-refs.xml +api: libvirt-api.xml libvirt-refs.xml +qemu_api: libvirt-qemu-api.xml libvirt-qemu-refs.xml +lxc_api: libvirt-lxc-api.xml libvirt-lxc-refs.xml +admin_api: libvirt-admin-api.xml libvirt-admin-refs.xml =20 web: $(dot_html) $(internals_html) $(kbase_html) \ html/index.html =20 -hvsupport.html: $(srcdir)/hvsupport.html.in +hvsupport.html: hvsupport.html.in =20 -$(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ +hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ $(top_srcdir)/src/libvirt_public.syms \ $(top_srcdir)/src/libvirt_qemu.syms $(top_srcdir)/src/libvirt_lxc.syms \ $(top_srcdir)/src/driver.h - $(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(top_srcdir)/src > $@ \ + $(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(top_srcdir) $(top_builddir) >= $@ \ || { rm $@ && exit 1; } =20 news.html.in: \ @@ -226,8 +231,6 @@ EXTRA_DIST +=3D \ $(srcdir)/news.xml \ $(srcdir)/news.rng \ $(srcdir)/news-html.xsl -MAINTAINERCLEANFILES +=3D \ - $(srcdir)/news.html.in =20 %.png: %.fig convert -rotate 90 $< $@ @@ -249,36 +252,36 @@ MAINTAINERCLEANFILES +=3D \ || { rm $@ && exit 1; } =20 %.html: %.html.tmp - $(AM_V_GEN)$(XMLLINT) --nonet --format $< > $(srcdir)/$@ \ - || { rm $(srcdir)/$@ && exit 1; } + $(AM_V_GEN)$(XMLLINT) --nonet --format $< > $@ \ + || { rm $@ && exit 1; } =20 $(apihtml_generated): html/index.html =20 html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) - $(AM_V_GEN)$(XSLTPROC) --nonet -o $(srcdir)/ \ + $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ --stringparam builddir '$(abs_top_builddir)' \ --stringparam timestamp $(timestamp) \ - $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml && \ - $(XMLLINT) --nonet --noout $(srcdir)/html/*.html + $(srcdir)/newapi.xsl libvirt-api.xml && \ + $(XMLLINT) --nonet --noout html/*.html =20 python_generated_files =3D \ - $(srcdir)/html/libvirt-libvirt-lxc.html \ - $(srcdir)/html/libvirt-libvirt-qemu.html \ - $(srcdir)/html/libvirt-libvirt-admin.html \ - $(srcdir)/html/libvirt-virterror.html \ - $(srcdir)/libvirt-api.xml \ - $(srcdir)/libvirt-refs.xml \ - $(srcdir)/libvirt-lxc-api.xml \ - $(srcdir)/libvirt-lxc-refs.xml \ - $(srcdir)/libvirt-qemu-api.xml \ - $(srcdir)/libvirt-qemu-refs.xml \ - $(srcdir)/libvirt-admin-api.xml \ - $(srcdir)/libvirt-admin-refs.xml \ + html/libvirt-libvirt-lxc.html \ + html/libvirt-libvirt-qemu.html \ + html/libvirt-libvirt-admin.html \ + html/libvirt-virterror.html \ + libvirt-api.xml \ + libvirt-refs.xml \ + libvirt-lxc-api.xml \ + libvirt-lxc-refs.xml \ + libvirt-qemu-api.xml \ + libvirt-qemu-refs.xml \ + libvirt-admin-api.xml \ + libvirt-admin-refs.xml \ $(NULL) =20 APIBUILD=3D$(srcdir)/apibuild.py -APIBUILD_STAMP=3D$(APIBUILD).stamp -EXTRA_DIST +=3D $(APIBUILD_STAMP) +APIBUILD_STAMP=3Dapibuild.py.stamp +CLEANFILES +=3D $(APIBUILD_STAMP) =20 $(python_generated_files): $(APIBUILD_STAMP) =20 @@ -327,22 +330,14 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ check-local: all dist-local: all =20 -clean-local: - rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html html/*.html - -maintainer-clean-local: clean-local - rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml - rm -rf $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml - rm -rf $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml - rm -rf $(srcdir)/libvirt-admin-api.xml $(srcdir)/libvirt-admin-refs.xml - rm -rf $(APIBUILD_STAMP) - rebuild: api qemu_api lxc_api admin_api all =20 install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - for f in $(css) $(dot_html) $(gif) $(png); do \ + for f in $(css) $(gif) $(png); do \ $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR); done + for f in $(dot_html); do \ + $(INSTALL) -m 0644 $$f $(DESTDIR)$(HTML_DIR); done $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/js for f in $(javascript); do \ $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/js/; done @@ -351,15 +346,15 @@ install-data-local: $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/logos; done $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html for h in $(apihtml); do \ - $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done + $(INSTALL) -m 0644 $$h $(DESTDIR)$(HTML_DIR)/html; done for p in $(apipng); do \ $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/internals for f in $(internals_html); do \ - $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/internals; done + $(INSTALL) -m 0644 $$f $(DESTDIR)$(HTML_DIR)/internals; done $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/kbase for f in $(kbase_html); do \ - $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/kbase; done + $(INSTALL) -m 0644 $$f $(DESTDIR)$(HTML_DIR)/kbase; done $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/fonts for f in $(fonts); do \ $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/fonts; \ diff --git a/docs/apibuild.py b/docs/apibuild.py index d3d0be2d83..af8595083c 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2551,7 +2551,7 @@ class app: srcdir + "/../src/util", srcdir + "/../include/libvirt", builddir + "/../include/libvirt"] - builder =3D docBuilder(name, srcdir, dirs, []) + builder =3D docBuilder(name, builddir, dirs, []) else: self.warning("rebuild() failed, unable to guess the module") return None diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 494b8a27ec..0977098eac 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -5,23 +5,24 @@ use warnings; =20 use File::Find; =20 -die "syntax: $0 SRCDIR\n" unless int(@ARGV) =3D=3D 1; +die "syntax: $0 SRCDIR BUILDDIR\n" unless int(@ARGV) =3D=3D 2; =20 my $srcdir =3D shift @ARGV; +my $builddir =3D shift @ARGV; =20 -my $symslibvirt =3D "$srcdir/libvirt_public.syms"; -my $symsqemu =3D "$srcdir/libvirt_qemu.syms"; -my $symslxc =3D "$srcdir/libvirt_lxc.syms"; +my $symslibvirt =3D "$srcdir/src/libvirt_public.syms"; +my $symsqemu =3D "$srcdir/src/libvirt_qemu.syms"; +my $symslxc =3D "$srcdir/src/libvirt_lxc.syms"; my @drivertable =3D ( - "$srcdir/driver-hypervisor.h", - "$srcdir/driver-interface.h", - "$srcdir/driver-network.h", - "$srcdir/driver-nodedev.h", - "$srcdir/driver-nwfilter.h", - "$srcdir/driver-secret.h", - "$srcdir/driver-state.h", - "$srcdir/driver-storage.h", - "$srcdir/driver-stream.h", + "$srcdir/src/driver-hypervisor.h", + "$srcdir/src/driver-interface.h", + "$srcdir/src/driver-network.h", + "$srcdir/src/driver-nodedev.h", + "$srcdir/src/driver-nwfilter.h", + "$srcdir/src/driver-secret.h", + "$srcdir/src/driver-state.h", + "$srcdir/src/driver-storage.h", + "$srcdir/src/driver-stream.h", ); =20 my %groupheaders =3D ( @@ -38,10 +39,10 @@ my %groupheaders =3D ( my @srcs; find({ wanted =3D> sub { - if (m!$srcdir/.*/\w+_(driver|common|tmpl|monitor|hal|udev)\.c$!) { + if (m!$srcdir/src/.*/\w+_(driver|common|tmpl|monitor|hal|udev)\.c$= !) { push @srcs, $_ if $_ !~ /vbox_driver\.c/; } - }, no_chdir =3D> 1}, $srcdir); + }, no_chdir =3D> 1}, "$srcdir/src"); =20 # Map API=C2=A0functions to the header and documentation files they're in # so that we can generate proper hyperlinks to their documentation. @@ -120,13 +121,13 @@ sub parseSymsFile { =20 my %apis; # Get the list of all public APIs and their corresponding version -parseSymsFile(\%apis, "LIBVIRT", $symslibvirt, "$srcdir/../docs/libvirt-ap= i.xml"); +parseSymsFile(\%apis, "LIBVIRT", $symslibvirt, "$builddir/docs/libvirt-api= .xml"); =20 # And the same for the QEMU specific APIs -parseSymsFile(\%apis, "LIBVIRT_QEMU", $symsqemu, "$srcdir/../docs/libvirt-= qemu-api.xml"); +parseSymsFile(\%apis, "LIBVIRT_QEMU", $symsqemu, "$builddir/docs/libvirt-q= emu-api.xml"); =20 # And the same for the LXC specific APIs -parseSymsFile(\%apis, "LIBVIRT_LXC", $symslxc, "$srcdir/../docs/libvirt-lx= c-api.xml"); +parseSymsFile(\%apis, "LIBVIRT_LXC", $symslxc, "$builddir/docs/libvirt-lxc= -api.xml"); =20 =20 # Some special things which aren't public APIs, --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736634; cv=none; d=zoho.com; s=zohoarc; b=NBGhOJ6ODJDFQBxWidwwbRsslZnzQC1jl29FNoc7yRtmdZGGkPjIERrBn0A0jQCp8w+406LqNTNDq47jyA9Hm7Dyd/WnvtJpr24xRv50WKFzs+lSf2Zym0QH3E5qO3Mvn57Pf1SGBXZVwAhZobzb4mbP9c5WycsauK4ye/Pld9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736634; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YEcgxPUMI+EYMR4dhnU1EiyrI8ky6l+lHDCmpG8aWoY=; b=Ayq6GrnwF1vqAjzraxSI9IxVSWynujTsrITKMIUb6G8F+IIcB0bcOZ8pSEOAXiTTP0i8soVj4FLyAqbmvmtw0Jw5clxxbK76GpluL3xF0oHyBubfjm8wbi7ZK8OdRSrcvP24nMPDy9ZKv9pFf4E+Z9imwkw52gft2vECCb+1rZ8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571736634710841.3121458991633; Tue, 22 Oct 2019 02:30:34 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-76-aqJ1AGBtOcaancrcopq-1A-1; Tue, 22 Oct 2019 05:30:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 935631800D79; Tue, 22 Oct 2019 09:30:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 694D45D717; Tue, 22 Oct 2019 09:30:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0EBAF4E58C; Tue, 22 Oct 2019 09:30:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L816G3002468 for ; Mon, 21 Oct 2019 04:01:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id B5FC51001B11; Mon, 21 Oct 2019 08:01:06 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BC571001B28 for ; Mon, 21 Oct 2019 08:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736633; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=YEcgxPUMI+EYMR4dhnU1EiyrI8ky6l+lHDCmpG8aWoY=; b=CORd8CCY5brhLTY59UVONArD03hY3RchJ+isF2aopAMCmGAhaspGKBOJJgZ1MX729chFoL EP1FLd/K76Nbg6Wv6kl0J7QcsvDfnChNS6IStz5Po0rKdNV/xTQDSOv7YTLhs+dN+1TwQ8 j+9kctLGZliYS65xkfd0B5RmHF16/PE= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:37 +0200 Message-Id: <6f205cedeab5e899f309fda846711f52ad7f10bb.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/25] po: generate files into build dir X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: aqJ1AGBtOcaancrcopq-1A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Historically we did not support VPATH builds and everything was generated into source directory. The introduction of VPATH builds did not changed the way how our translation files are handled. This patch changes the rules to generate everything into build directory and stops distributing generated files in order to have properly separated VPATH builds. Signed-off-by: Pavel Hrdina --- po/Makefile.am | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/po/Makefile.am b/po/Makefile.am index b0e2c15d44..8ddb1432f0 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -16,17 +16,16 @@ LANGS :=3D \ =20 =20 POTFILE_DEPS :=3D $(shell $(SED) 's,^,$(top_srcdir)/,' $(srcdir)/POTFILES) -POTFILE :=3D $(srcdir)/$(DOMAIN).pot -POFILES :=3D $(LANGS:%=3D$(srcdir)/%.po) -GMOFILES :=3D $(LANGS:%=3D$(srcdir)/%.gmo) +POTFILE :=3D $(DOMAIN).pot +POMINIFILES :=3D $(LANGS:%=3D%.mini.po) +POFILES :=3D $(LANGS:%=3D%.po) +GMOFILES :=3D $(LANGS:%=3D%.gmo) =20 -MAINTAINERCLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) +CLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) =20 EXTRA_DIST =3D \ POTFILES \ - $(POTFILE) \ - $(POFILES) \ - $(GMOFILES) + $(POMINIFILES) =20 if HAVE_GNU_GETTEXT_TOOLS =20 @@ -63,10 +62,18 @@ update-mini-po: $(POTFILE) done =20 push-pot: $(POTFILE) - zanata push --push-type=3Dsource + zanata-cli push \ + --project-config $(srcdir)/zanata.xml \ + --push-type=3Dsource \ + --trans-dir $(builddir) \ + --src-dir $(srcdir) =20 pull-po: $(POTFILE) - zanata pull --create-skeletons + zanata-cli pull \ + --project-config $(srcdir)/zanata.xml \ + --create-skeletons \ + --trans-dir $(builddir) \ + --src-dir $(srcdir) $(MAKE) update-mini-po $(MAKE) update-gmo =20 @@ -76,19 +83,17 @@ $(POTFILE): POTFILES $(POTFILE_DEPS) $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $@ rm -f $@-t =20 -$(srcdir)/%.po: $(srcdir)/%.mini.po $(POTFILE) +%.po: %.mini.po $(POTFILE) $(MSGMERGE) --no-fuzzy-matching $< $(POTFILE) | \ $(SED) $(SED_PO_FIXUP_ARGS) > $@ =20 -$(srcdir)/%.gmo: $(srcdir)/%.po +%.gmo: %.po rm -f $@ $@-t $(MSGFMT) -c -o $@-t $< mv $@-t $@ =20 .PRECIOUS: $(POTFILE) $(POFILES) =20 -endif HAVE_GNU_GETTEXT_TOOLS - if ENABLE_NLS =20 # Cannot use 'localedir' since this conflicts with autoconf. @@ -99,7 +104,7 @@ install-data-hook: $(GMOFILES) for lang in $(LANGS); do \ d=3D$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \ mkdir -p $$d; \ - install -m 0644 $(srcdir)/$$lang.gmo $$d/$(DOMAIN).mo; \ + install -m 0644 $$lang.gmo $$d/$(DOMAIN).mo; \ done =20 uninstall-hook: @@ -109,3 +114,5 @@ uninstall-hook: done =20 endif ENABLE_NLS + +endif HAVE_GNU_GETTEXT_TOOLS --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736413; cv=none; d=zoho.com; s=zohoarc; b=XXu6HKxgep+mzoeGDpSMnQBaa9M84ThXDeADw+rGJc/4gT2BuKRmayeCE/JYTsjXg00DU/DegQxXL5Vmjdk3BoRlsneM0mspP7qGbuJGS0yMp3E2nG+h4LXSSVMZIfGPDlX8BWSguiqtIdRqADYahS+SDZtBoeuNZIp9NXVq+zo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736413; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rQBpu+ZOkerUVlNnyM1PNKD5q+hhzLDx48FjZz3DU3Q=; b=UoEvgAX8rjI1TC3nGeSP+54ReCFiscjgek1cJh7HFRr47NDyxHufbMOgrBGoHH3eLipaDz7u6Nk1kBPsDspgbQCV315greDeC2SblwO0484jL1ueRvlbDf4rLS1ytMxOoSm7kNMf6nHb1iaUJ2D7KKaW0zN//3ZtyD9/cVP1gcM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571736413672945.8642856258354; Tue, 22 Oct 2019 02:26:53 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-94-1kmOWPUXPyKfoWF4KJp5Vg-1; Tue, 22 Oct 2019 05:26:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6EE1280183E; Tue, 22 Oct 2019 09:26:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 45D176012C; Tue, 22 Oct 2019 09:26:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 011A33FB41; Tue, 22 Oct 2019 09:26:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L818u1002484 for ; Mon, 21 Oct 2019 04:01:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 12E2F1001B20; Mon, 21 Oct 2019 08:01:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 628631001B11 for ; Mon, 21 Oct 2019 08:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736412; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rQBpu+ZOkerUVlNnyM1PNKD5q+hhzLDx48FjZz3DU3Q=; b=enWxMkhGzozflYZLSEpV56ut5PxlBEUEwIige7TlQAVDu/lTxoBKuinLtkMBtCxLgZokBT o9Fe8dBVcK/ecfUO7M9+yvOENrNipNsK/tXIJQ+T3HrYFuKWfVH9V1em9aay2bZw0sTlY/ qSqlajSQObouDkKrcp4Ix6zeWZBvXe0= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:38 +0200 Message-Id: <55bdd0359674683b31286cdf693b6847bc46d10e.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 13/25] po: rewrite the way how we generate files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 1kmOWPUXPyKfoWF4KJp5Vg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There was no need to handle files for translation from build directory but that will change with following patches where we will stop generating source files into source directory. In order to have them included for translation we have to prefix each file with SRCDIR or BUILDDIR. Signed-off-by: Pavel Hrdina --- po/Makefile.am | 14 ++- po/POTFILES | 320 ------------------------------------------------- po/POTFILES.in | 320 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 329 insertions(+), 325 deletions(-) delete mode 100644 po/POTFILES create mode 100644 po/POTFILES.in diff --git a/po/Makefile.am b/po/Makefile.am index 8ddb1432f0..82798eeb03 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -15,16 +15,21 @@ LANGS :=3D \ uk ur vi wba yo zh_CN zh_HK zh_TW zu =20 =20 -POTFILE_DEPS :=3D $(shell $(SED) 's,^,$(top_srcdir)/,' $(srcdir)/POTFILES) +POTFILES_IN =3D $(srcdir)/POTFILES.in +POTFILES: $(POTFILES_IN) + $(AM_V_GEN) cat $(POTFILES_IN) | \ + $(SED) 's|@SRCDIR@|$(top_srcdir)|' | \ + $(SED) 's|@BUILDDIR@|$(top_builddir)|' > $@ +POTFILE_DEPS =3D $(shell cat POTFILES) POTFILE :=3D $(DOMAIN).pot POMINIFILES :=3D $(LANGS:%=3D%.mini.po) POFILES :=3D $(LANGS:%=3D%.po) GMOFILES :=3D $(LANGS:%=3D%.gmo) =20 -CLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) +CLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) POTFILES =20 EXTRA_DIST =3D \ - POTFILES \ + $(POTFILES_IN) \ $(POMINIFILES) =20 if HAVE_GNU_GETTEXT_TOOLS @@ -38,7 +43,6 @@ XGETTEXT_ARGS =3D \ --package-name=3D"$(PACKAGE_NAME)" \ --package-version=3D"$(PACKAGE_VERSION)" \ --msgid-bugs-address=3D"$(MSGID_BUGS_ADDRESS)" \ - --directory=3D$(top_srcdir) \ $(NULL) =20 SED_PO_FIXUP_ARGS =3D \ @@ -79,7 +83,7 @@ pull-po: $(POTFILE) =20 $(POTFILE): POTFILES $(POTFILE_DEPS) $(XGETTEXT) -o $@-t $(XGETTEXT_ARGS) \ - --files-from=3D$(abs_srcdir)/POTFILES + --files-from=3D$(abs_builddir)/POTFILES $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $@ rm -f $@-t =20 diff --git a/po/POTFILES b/po/POTFILES deleted file mode 100644 index 8e863dfbea..0000000000 --- a/po/POTFILES +++ /dev/null @@ -1,320 +0,0 @@ -gnulib/lib/gai_strerror.c -gnulib/lib/regcomp.c -src/access/viraccessdriverpolkit.c -src/access/viraccessmanager.c -src/admin/admin_server.c -src/admin/admin_server_dispatch.c -src/admin/admin_server_dispatch_stubs.h -src/admin/libvirt-admin.c -src/bhyve/bhyve_capabilities.c -src/bhyve/bhyve_command.c -src/bhyve/bhyve_device.c -src/bhyve/bhyve_domain.c -src/bhyve/bhyve_driver.c -src/bhyve/bhyve_monitor.c -src/bhyve/bhyve_parse_command.c -src/bhyve/bhyve_process.c -src/conf/capabilities.c -src/conf/checkpoint_conf.c -src/conf/cpu_conf.c -src/conf/device_conf.c -src/conf/domain_addr.c -src/conf/domain_capabilities.c -src/conf/domain_conf.c -src/conf/domain_event.c -src/conf/interface_conf.c -src/conf/netdev_bandwidth_conf.c -src/conf/netdev_vlan_conf.c -src/conf/netdev_vport_profile_conf.c -src/conf/network_conf.c -src/conf/networkcommon_conf.c -src/conf/node_device_conf.c -src/conf/numa_conf.c -src/conf/nwfilter_conf.c -src/conf/nwfilter_params.c -src/conf/object_event.c -src/conf/secret_conf.c -src/conf/snapshot_conf.c -src/conf/storage_adapter_conf.c -src/conf/storage_conf.c -src/conf/virchrdev.c -src/conf/virdomainobjlist.c -src/conf/virnetworkobj.c -src/conf/virnodedeviceobj.c -src/conf/virnwfilterobj.c -src/conf/virsavecookie.c -src/conf/virsecretobj.c -src/conf/virstorageobj.c -src/cpu/cpu.c -src/cpu/cpu_arm.c -src/cpu/cpu_map.c -src/cpu/cpu_ppc64.c -src/cpu/cpu_s390.c -src/cpu/cpu_x86.c -src/datatypes.c -src/driver.c -src/esx/esx_driver.c -src/esx/esx_network_driver.c -src/esx/esx_storage_backend_iscsi.c -src/esx/esx_storage_backend_vmfs.c -src/esx/esx_storage_driver.c -src/esx/esx_stream.c -src/esx/esx_util.c -src/esx/esx_vi.c -src/esx/esx_vi_methods.c -src/esx/esx_vi_types.c -src/hyperv/hyperv_driver.c -src/hyperv/hyperv_util.c -src/hyperv/hyperv_wmi.c -src/interface/interface_backend_netcf.c -src/interface/interface_backend_udev.c -src/internal.h -src/libvirt-domain-checkpoint.c -src/libvirt-domain-snapshot.c -src/libvirt-domain.c -src/libvirt-host.c -src/libvirt-lxc.c -src/libvirt-network.c -src/libvirt-nodedev.c -src/libvirt-nwfilter.c -src/libvirt-qemu.c -src/libvirt-secret.c -src/libvirt-storage.c -src/libvirt-stream.c -src/libvirt.c -src/libxl/libxl_capabilities.c -src/libxl/libxl_conf.c -src/libxl/libxl_domain.c -src/libxl/libxl_driver.c -src/libxl/libxl_migration.c -src/libxl/xen_common.c -src/libxl/xen_xl.c -src/libxl/xen_xm.c -src/locking/lock_daemon.c -src/locking/lock_daemon_dispatch.c -src/locking/lock_driver_lockd.c -src/locking/lock_driver_sanlock.c -src/locking/lock_manager.c -src/locking/sanlock_helper.c -src/logging/log_daemon.c -src/logging/log_daemon_dispatch.c -src/logging/log_handler.c -src/logging/log_manager.c -src/lxc/lxc_cgroup.c -src/lxc/lxc_conf.c -src/lxc/lxc_container.c -src/lxc/lxc_controller.c -src/lxc/lxc_domain.c -src/lxc/lxc_driver.c -src/lxc/lxc_fuse.c -src/lxc/lxc_hostdev.c -src/lxc/lxc_native.c -src/lxc/lxc_process.c -src/network/bridge_driver.c -src/network/bridge_driver_linux.c -src/network/leaseshelper.c -src/node_device/node_device_driver.c -src/node_device/node_device_hal.c -src/node_device/node_device_udev.c -src/nwfilter/nwfilter_dhcpsnoop.c -src/nwfilter/nwfilter_driver.c -src/nwfilter/nwfilter_ebiptables_driver.c -src/nwfilter/nwfilter_gentech_driver.c -src/nwfilter/nwfilter_learnipaddr.c -src/openvz/openvz_conf.c -src/openvz/openvz_driver.c -src/openvz/openvz_util.c -src/phyp/phyp_driver.c -src/qemu/qemu_agent.c -src/qemu/qemu_alias.c -src/qemu/qemu_block.c -src/qemu/qemu_capabilities.c -src/qemu/qemu_cgroup.c -src/qemu/qemu_command.c -src/qemu/qemu_conf.c -src/qemu/qemu_domain.c -src/qemu/qemu_domain_address.c -src/qemu/qemu_driver.c -src/qemu/qemu_hostdev.c -src/qemu/qemu_hotplug.c -src/qemu/qemu_interface.c -src/qemu/qemu_migration.c -src/qemu/qemu_migration_cookie.c -src/qemu/qemu_migration_params.c -src/qemu/qemu_monitor.c -src/qemu/qemu_monitor_json.c -src/qemu/qemu_monitor_text.c -src/qemu/qemu_process.c -src/qemu/qemu_qapi.c -src/remote/qemu_daemon_dispatch_stubs.h -src/remote/remote_client_bodies.h -src/remote/remote_daemon.c -src/remote/remote_daemon_config.c -src/remote/remote_daemon_dispatch.c -src/remote/remote_daemon_dispatch_stubs.h -src/remote/remote_daemon_stream.c -src/remote/remote_driver.c -src/rpc/virkeepalive.c -src/rpc/virnetclient.c -src/rpc/virnetclientprogram.c -src/rpc/virnetclientstream.c -src/rpc/virnetdaemon.c -src/rpc/virnetlibsshsession.c -src/rpc/virnetmessage.c -src/rpc/virnetsaslcontext.c -src/rpc/virnetserver.c -src/rpc/virnetserverclient.c -src/rpc/virnetserverprogram.c -src/rpc/virnetserverservice.c -src/rpc/virnetsocket.c -src/rpc/virnetsshsession.c -src/rpc/virnettlscontext.c -src/secret/secret_driver.c -src/security/security_apparmor.c -src/security/security_dac.c -src/security/security_driver.c -src/security/security_manager.c -src/security/security_selinux.c -src/security/virt-aa-helper.c -src/storage/parthelper.c -src/storage/storage_backend.c -src/storage/storage_backend_disk.c -src/storage/storage_backend_fs.c -src/storage/storage_backend_gluster.c -src/storage/storage_backend_iscsi.c -src/storage/storage_backend_logical.c -src/storage/storage_backend_mpath.c -src/storage/storage_backend_rbd.c -src/storage/storage_backend_scsi.c -src/storage/storage_backend_sheepdog.c -src/storage/storage_backend_vstorage.c -src/storage/storage_backend_zfs.c -src/storage/storage_driver.c -src/storage/storage_util.c -src/test/test_driver.c -src/util/iohelper.c -src/util/viralloc.c -src/util/virarptable.c -src/util/viraudit.c -src/util/virauth.c -src/util/virauthconfig.c -src/util/virbitmap.c -src/util/virbuffer.c -src/util/vircgroup.c -src/util/virclosecallbacks.c -src/util/vircommand.c -src/util/virconf.c -src/util/vircrypto.c -src/util/virdbus.c -src/util/virdnsmasq.c -src/util/virerror.c -src/util/virerror.h -src/util/vireventpoll.c -src/util/virfcp.c -src/util/virfdstream.c -src/util/virfile.c -src/util/virfilecache.c -src/util/virfirewall.c -src/util/virfirmware.c -src/util/virhash.c -src/util/virhook.c -src/util/virhostcpu.c -src/util/virhostdev.c -src/util/virhostmem.c -src/util/viridentity.c -src/util/virinitctl.c -src/util/viriptables.c -src/util/viriscsi.c -src/util/virjson.c -src/util/virkeyfile.c -src/util/virlease.c -src/util/virlockspace.c -src/util/virlog.c -src/util/virmacmap.c -src/util/virmdev.c -src/util/virnetdev.c -src/util/virnetdevbandwidth.c -src/util/virnetdevbridge.c -src/util/virnetdevip.c -src/util/virnetdevmacvlan.c -src/util/virnetdevmidonet.c -src/util/virnetdevopenvswitch.c -src/util/virnetdevtap.c -src/util/virnetdevveth.c -src/util/virnetdevvportprofile.c -src/util/virnetlink.c -src/util/virnodesuspend.c -src/util/virnuma.c -src/util/virobject.c -src/util/virpci.c -src/util/virperf.c -src/util/virpidfile.c -src/util/virpolkit.c -src/util/virportallocator.c -src/util/virprocess.c -src/util/virqemu.c -src/util/virrandom.c -src/util/virresctrl.c -src/util/virrotatingfile.c -src/util/virscsi.c -src/util/virscsihost.c -src/util/virscsivhost.c -src/util/virsecret.c -src/util/virsocketaddr.c -src/util/virstorageencryption.c -src/util/virstoragefile.c -src/util/virstoragefilebackend.c -src/util/virstring.c -src/util/virsysinfo.c -src/util/virthreadjob.c -src/util/virthreadpool.c -src/util/virtime.c -src/util/virtpm.c -src/util/virtypedparam.c -src/util/viruri.c -src/util/virusb.c -src/util/virutil.c -src/util/virvhba.c -src/util/virxml.c -src/vbox/vbox_MSCOMGlue.c -src/vbox/vbox_XPCOMCGlue.c -src/vbox/vbox_common.c -src/vbox/vbox_driver.c -src/vbox/vbox_network.c -src/vbox/vbox_snapshot_conf.c -src/vbox/vbox_storage.c -src/vbox/vbox_tmpl.c -src/vmware/vmware_conf.c -src/vmware/vmware_driver.c -src/vmx/vmx.c -src/vz/vz_driver.c -src/vz/vz_sdk.c -src/vz/vz_utils.c -src/vz/vz_utils.h -tests/virpolkittest.c -tools/libvirt-guests.sh.in -tools/virsh-checkpoint.c -tools/virsh-console.c -tools/virsh-domain-monitor.c -tools/virsh-domain.c -tools/virsh-edit.c -tools/virsh-host.c -tools/virsh-interface.c -tools/virsh-network.c -tools/virsh-nodedev.c -tools/virsh-nwfilter.c -tools/virsh-pool.c -tools/virsh-secret.c -tools/virsh-snapshot.c -tools/virsh-util.c -tools/virsh-volume.c -tools/virsh.c -tools/virt-admin.c -tools/virt-host-validate-bhyve.c -tools/virt-host-validate-common.c -tools/virt-host-validate-lxc.c -tools/virt-host-validate-qemu.c -tools/virt-host-validate.c -tools/virt-login-shell.c -tools/vsh.c -tools/vsh.h diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000000..8d423566a7 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,320 @@ +@SRCDIR@/gnulib/lib/gai_strerror.c +@SRCDIR@/gnulib/lib/regcomp.c +@SRCDIR@/src/access/viraccessdriverpolkit.c +@SRCDIR@/src/access/viraccessmanager.c +@SRCDIR@/src/admin/admin_server.c +@SRCDIR@/src/admin/admin_server_dispatch.c +@SRCDIR@/src/admin/admin_server_dispatch_stubs.h +@SRCDIR@/src/admin/libvirt-admin.c +@SRCDIR@/src/bhyve/bhyve_capabilities.c +@SRCDIR@/src/bhyve/bhyve_command.c +@SRCDIR@/src/bhyve/bhyve_device.c +@SRCDIR@/src/bhyve/bhyve_domain.c +@SRCDIR@/src/bhyve/bhyve_driver.c +@SRCDIR@/src/bhyve/bhyve_monitor.c +@SRCDIR@/src/bhyve/bhyve_parse_command.c +@SRCDIR@/src/bhyve/bhyve_process.c +@SRCDIR@/src/conf/capabilities.c +@SRCDIR@/src/conf/checkpoint_conf.c +@SRCDIR@/src/conf/cpu_conf.c +@SRCDIR@/src/conf/device_conf.c +@SRCDIR@/src/conf/domain_addr.c +@SRCDIR@/src/conf/domain_capabilities.c +@SRCDIR@/src/conf/domain_conf.c +@SRCDIR@/src/conf/domain_event.c +@SRCDIR@/src/conf/interface_conf.c +@SRCDIR@/src/conf/netdev_bandwidth_conf.c +@SRCDIR@/src/conf/netdev_vlan_conf.c +@SRCDIR@/src/conf/netdev_vport_profile_conf.c +@SRCDIR@/src/conf/network_conf.c +@SRCDIR@/src/conf/networkcommon_conf.c +@SRCDIR@/src/conf/node_device_conf.c +@SRCDIR@/src/conf/numa_conf.c +@SRCDIR@/src/conf/nwfilter_conf.c +@SRCDIR@/src/conf/nwfilter_params.c +@SRCDIR@/src/conf/object_event.c +@SRCDIR@/src/conf/secret_conf.c +@SRCDIR@/src/conf/snapshot_conf.c +@SRCDIR@/src/conf/storage_adapter_conf.c +@SRCDIR@/src/conf/storage_conf.c +@SRCDIR@/src/conf/virchrdev.c +@SRCDIR@/src/conf/virdomainobjlist.c +@SRCDIR@/src/conf/virnetworkobj.c +@SRCDIR@/src/conf/virnodedeviceobj.c +@SRCDIR@/src/conf/virnwfilterobj.c +@SRCDIR@/src/conf/virsavecookie.c +@SRCDIR@/src/conf/virsecretobj.c +@SRCDIR@/src/conf/virstorageobj.c +@SRCDIR@/src/cpu/cpu.c +@SRCDIR@/src/cpu/cpu_arm.c +@SRCDIR@/src/cpu/cpu_map.c +@SRCDIR@/src/cpu/cpu_ppc64.c +@SRCDIR@/src/cpu/cpu_s390.c +@SRCDIR@/src/cpu/cpu_x86.c +@SRCDIR@/src/datatypes.c +@SRCDIR@/src/driver.c +@SRCDIR@/src/esx/esx_driver.c +@SRCDIR@/src/esx/esx_network_driver.c +@SRCDIR@/src/esx/esx_storage_backend_iscsi.c +@SRCDIR@/src/esx/esx_storage_backend_vmfs.c +@SRCDIR@/src/esx/esx_storage_driver.c +@SRCDIR@/src/esx/esx_stream.c +@SRCDIR@/src/esx/esx_util.c +@SRCDIR@/src/esx/esx_vi.c +@SRCDIR@/src/esx/esx_vi_methods.c +@SRCDIR@/src/esx/esx_vi_types.c +@SRCDIR@/src/hyperv/hyperv_driver.c +@SRCDIR@/src/hyperv/hyperv_util.c +@SRCDIR@/src/hyperv/hyperv_wmi.c +@SRCDIR@/src/interface/interface_backend_netcf.c +@SRCDIR@/src/interface/interface_backend_udev.c +@SRCDIR@/src/internal.h +@SRCDIR@/src/libvirt-domain-checkpoint.c +@SRCDIR@/src/libvirt-domain-snapshot.c +@SRCDIR@/src/libvirt-domain.c +@SRCDIR@/src/libvirt-host.c +@SRCDIR@/src/libvirt-lxc.c +@SRCDIR@/src/libvirt-network.c +@SRCDIR@/src/libvirt-nodedev.c +@SRCDIR@/src/libvirt-nwfilter.c +@SRCDIR@/src/libvirt-qemu.c +@SRCDIR@/src/libvirt-secret.c +@SRCDIR@/src/libvirt-storage.c +@SRCDIR@/src/libvirt-stream.c +@SRCDIR@/src/libvirt.c +@SRCDIR@/src/libxl/libxl_capabilities.c +@SRCDIR@/src/libxl/libxl_conf.c +@SRCDIR@/src/libxl/libxl_domain.c +@SRCDIR@/src/libxl/libxl_driver.c +@SRCDIR@/src/libxl/libxl_migration.c +@SRCDIR@/src/libxl/xen_common.c +@SRCDIR@/src/libxl/xen_xl.c +@SRCDIR@/src/libxl/xen_xm.c +@SRCDIR@/src/locking/lock_daemon.c +@SRCDIR@/src/locking/lock_daemon_dispatch.c +@SRCDIR@/src/locking/lock_driver_lockd.c +@SRCDIR@/src/locking/lock_driver_sanlock.c +@SRCDIR@/src/locking/lock_manager.c +@SRCDIR@/src/locking/sanlock_helper.c +@SRCDIR@/src/logging/log_daemon.c +@SRCDIR@/src/logging/log_daemon_dispatch.c +@SRCDIR@/src/logging/log_handler.c +@SRCDIR@/src/logging/log_manager.c +@SRCDIR@/src/lxc/lxc_cgroup.c +@SRCDIR@/src/lxc/lxc_conf.c +@SRCDIR@/src/lxc/lxc_container.c +@SRCDIR@/src/lxc/lxc_controller.c +@SRCDIR@/src/lxc/lxc_domain.c +@SRCDIR@/src/lxc/lxc_driver.c +@SRCDIR@/src/lxc/lxc_fuse.c +@SRCDIR@/src/lxc/lxc_hostdev.c +@SRCDIR@/src/lxc/lxc_native.c +@SRCDIR@/src/lxc/lxc_process.c +@SRCDIR@/src/network/bridge_driver.c +@SRCDIR@/src/network/bridge_driver_linux.c +@SRCDIR@/src/network/leaseshelper.c +@SRCDIR@/src/node_device/node_device_driver.c +@SRCDIR@/src/node_device/node_device_hal.c +@SRCDIR@/src/node_device/node_device_udev.c +@SRCDIR@/src/nwfilter/nwfilter_dhcpsnoop.c +@SRCDIR@/src/nwfilter/nwfilter_driver.c +@SRCDIR@/src/nwfilter/nwfilter_ebiptables_driver.c +@SRCDIR@/src/nwfilter/nwfilter_gentech_driver.c +@SRCDIR@/src/nwfilter/nwfilter_learnipaddr.c +@SRCDIR@/src/openvz/openvz_conf.c +@SRCDIR@/src/openvz/openvz_driver.c +@SRCDIR@/src/openvz/openvz_util.c +@SRCDIR@/src/phyp/phyp_driver.c +@SRCDIR@/src/qemu/qemu_agent.c +@SRCDIR@/src/qemu/qemu_alias.c +@SRCDIR@/src/qemu/qemu_block.c +@SRCDIR@/src/qemu/qemu_capabilities.c +@SRCDIR@/src/qemu/qemu_cgroup.c +@SRCDIR@/src/qemu/qemu_command.c +@SRCDIR@/src/qemu/qemu_conf.c +@SRCDIR@/src/qemu/qemu_domain.c +@SRCDIR@/src/qemu/qemu_domain_address.c +@SRCDIR@/src/qemu/qemu_driver.c +@SRCDIR@/src/qemu/qemu_hostdev.c +@SRCDIR@/src/qemu/qemu_hotplug.c +@SRCDIR@/src/qemu/qemu_interface.c +@SRCDIR@/src/qemu/qemu_migration.c +@SRCDIR@/src/qemu/qemu_migration_cookie.c +@SRCDIR@/src/qemu/qemu_migration_params.c +@SRCDIR@/src/qemu/qemu_monitor.c +@SRCDIR@/src/qemu/qemu_monitor_json.c +@SRCDIR@/src/qemu/qemu_monitor_text.c +@SRCDIR@/src/qemu/qemu_process.c +@SRCDIR@/src/qemu/qemu_qapi.c +@SRCDIR@/src/remote/qemu_daemon_dispatch_stubs.h +@SRCDIR@/src/remote/remote_client_bodies.h +@SRCDIR@/src/remote/remote_daemon.c +@SRCDIR@/src/remote/remote_daemon_config.c +@SRCDIR@/src/remote/remote_daemon_dispatch.c +@SRCDIR@/src/remote/remote_daemon_dispatch_stubs.h +@SRCDIR@/src/remote/remote_daemon_stream.c +@SRCDIR@/src/remote/remote_driver.c +@SRCDIR@/src/rpc/virkeepalive.c +@SRCDIR@/src/rpc/virnetclient.c +@SRCDIR@/src/rpc/virnetclientprogram.c +@SRCDIR@/src/rpc/virnetclientstream.c +@SRCDIR@/src/rpc/virnetdaemon.c +@SRCDIR@/src/rpc/virnetlibsshsession.c +@SRCDIR@/src/rpc/virnetmessage.c +@SRCDIR@/src/rpc/virnetsaslcontext.c +@SRCDIR@/src/rpc/virnetserver.c +@SRCDIR@/src/rpc/virnetserverclient.c +@SRCDIR@/src/rpc/virnetserverprogram.c +@SRCDIR@/src/rpc/virnetserverservice.c +@SRCDIR@/src/rpc/virnetsocket.c +@SRCDIR@/src/rpc/virnetsshsession.c +@SRCDIR@/src/rpc/virnettlscontext.c +@SRCDIR@/src/secret/secret_driver.c +@SRCDIR@/src/security/security_apparmor.c +@SRCDIR@/src/security/security_dac.c +@SRCDIR@/src/security/security_driver.c +@SRCDIR@/src/security/security_manager.c +@SRCDIR@/src/security/security_selinux.c +@SRCDIR@/src/security/virt-aa-helper.c +@SRCDIR@/src/storage/parthelper.c +@SRCDIR@/src/storage/storage_backend.c +@SRCDIR@/src/storage/storage_backend_disk.c +@SRCDIR@/src/storage/storage_backend_fs.c +@SRCDIR@/src/storage/storage_backend_gluster.c +@SRCDIR@/src/storage/storage_backend_iscsi.c +@SRCDIR@/src/storage/storage_backend_logical.c +@SRCDIR@/src/storage/storage_backend_mpath.c +@SRCDIR@/src/storage/storage_backend_rbd.c +@SRCDIR@/src/storage/storage_backend_scsi.c +@SRCDIR@/src/storage/storage_backend_sheepdog.c +@SRCDIR@/src/storage/storage_backend_vstorage.c +@SRCDIR@/src/storage/storage_backend_zfs.c +@SRCDIR@/src/storage/storage_driver.c +@SRCDIR@/src/storage/storage_util.c +@SRCDIR@/src/test/test_driver.c +@SRCDIR@/src/util/iohelper.c +@SRCDIR@/src/util/viralloc.c +@SRCDIR@/src/util/virarptable.c +@SRCDIR@/src/util/viraudit.c +@SRCDIR@/src/util/virauth.c +@SRCDIR@/src/util/virauthconfig.c +@SRCDIR@/src/util/virbitmap.c +@SRCDIR@/src/util/virbuffer.c +@SRCDIR@/src/util/vircgroup.c +@SRCDIR@/src/util/virclosecallbacks.c +@SRCDIR@/src/util/vircommand.c +@SRCDIR@/src/util/virconf.c +@SRCDIR@/src/util/vircrypto.c +@SRCDIR@/src/util/virdbus.c +@SRCDIR@/src/util/virdnsmasq.c +@SRCDIR@/src/util/virerror.c +@SRCDIR@/src/util/virerror.h +@SRCDIR@/src/util/vireventpoll.c +@SRCDIR@/src/util/virfcp.c +@SRCDIR@/src/util/virfdstream.c +@SRCDIR@/src/util/virfile.c +@SRCDIR@/src/util/virfilecache.c +@SRCDIR@/src/util/virfirewall.c +@SRCDIR@/src/util/virfirmware.c +@SRCDIR@/src/util/virhash.c +@SRCDIR@/src/util/virhook.c +@SRCDIR@/src/util/virhostcpu.c +@SRCDIR@/src/util/virhostdev.c +@SRCDIR@/src/util/virhostmem.c +@SRCDIR@/src/util/viridentity.c +@SRCDIR@/src/util/virinitctl.c +@SRCDIR@/src/util/viriptables.c +@SRCDIR@/src/util/viriscsi.c +@SRCDIR@/src/util/virjson.c +@SRCDIR@/src/util/virkeyfile.c +@SRCDIR@/src/util/virlease.c +@SRCDIR@/src/util/virlockspace.c +@SRCDIR@/src/util/virlog.c +@SRCDIR@/src/util/virmacmap.c +@SRCDIR@/src/util/virmdev.c +@SRCDIR@/src/util/virnetdev.c +@SRCDIR@/src/util/virnetdevbandwidth.c +@SRCDIR@/src/util/virnetdevbridge.c +@SRCDIR@/src/util/virnetdevip.c +@SRCDIR@/src/util/virnetdevmacvlan.c +@SRCDIR@/src/util/virnetdevmidonet.c +@SRCDIR@/src/util/virnetdevopenvswitch.c +@SRCDIR@/src/util/virnetdevtap.c +@SRCDIR@/src/util/virnetdevveth.c +@SRCDIR@/src/util/virnetdevvportprofile.c +@SRCDIR@/src/util/virnetlink.c +@SRCDIR@/src/util/virnodesuspend.c +@SRCDIR@/src/util/virnuma.c +@SRCDIR@/src/util/virobject.c +@SRCDIR@/src/util/virpci.c +@SRCDIR@/src/util/virperf.c +@SRCDIR@/src/util/virpidfile.c +@SRCDIR@/src/util/virpolkit.c +@SRCDIR@/src/util/virportallocator.c +@SRCDIR@/src/util/virprocess.c +@SRCDIR@/src/util/virqemu.c +@SRCDIR@/src/util/virrandom.c +@SRCDIR@/src/util/virresctrl.c +@SRCDIR@/src/util/virrotatingfile.c +@SRCDIR@/src/util/virscsi.c +@SRCDIR@/src/util/virscsihost.c +@SRCDIR@/src/util/virscsivhost.c +@SRCDIR@/src/util/virsecret.c +@SRCDIR@/src/util/virsocketaddr.c +@SRCDIR@/src/util/virstorageencryption.c +@SRCDIR@/src/util/virstoragefile.c +@SRCDIR@/src/util/virstoragefilebackend.c +@SRCDIR@/src/util/virstring.c +@SRCDIR@/src/util/virsysinfo.c +@SRCDIR@/src/util/virthreadjob.c +@SRCDIR@/src/util/virthreadpool.c +@SRCDIR@/src/util/virtime.c +@SRCDIR@/src/util/virtpm.c +@SRCDIR@/src/util/virtypedparam.c +@SRCDIR@/src/util/viruri.c +@SRCDIR@/src/util/virusb.c +@SRCDIR@/src/util/virutil.c +@SRCDIR@/src/util/virvhba.c +@SRCDIR@/src/util/virxml.c +@SRCDIR@/src/vbox/vbox_MSCOMGlue.c +@SRCDIR@/src/vbox/vbox_XPCOMCGlue.c +@SRCDIR@/src/vbox/vbox_common.c +@SRCDIR@/src/vbox/vbox_driver.c +@SRCDIR@/src/vbox/vbox_network.c +@SRCDIR@/src/vbox/vbox_snapshot_conf.c +@SRCDIR@/src/vbox/vbox_storage.c +@SRCDIR@/src/vbox/vbox_tmpl.c +@SRCDIR@/src/vmware/vmware_conf.c +@SRCDIR@/src/vmware/vmware_driver.c +@SRCDIR@/src/vmx/vmx.c +@SRCDIR@/src/vz/vz_driver.c +@SRCDIR@/src/vz/vz_sdk.c +@SRCDIR@/src/vz/vz_utils.c +@SRCDIR@/src/vz/vz_utils.h +@SRCDIR@/tests/virpolkittest.c +@SRCDIR@/tools/libvirt-guests.sh.in +@SRCDIR@/tools/virsh-checkpoint.c +@SRCDIR@/tools/virsh-console.c +@SRCDIR@/tools/virsh-domain-monitor.c +@SRCDIR@/tools/virsh-domain.c +@SRCDIR@/tools/virsh-edit.c +@SRCDIR@/tools/virsh-host.c +@SRCDIR@/tools/virsh-interface.c +@SRCDIR@/tools/virsh-network.c +@SRCDIR@/tools/virsh-nodedev.c +@SRCDIR@/tools/virsh-nwfilter.c +@SRCDIR@/tools/virsh-pool.c +@SRCDIR@/tools/virsh-secret.c +@SRCDIR@/tools/virsh-snapshot.c +@SRCDIR@/tools/virsh-util.c +@SRCDIR@/tools/virsh-volume.c +@SRCDIR@/tools/virsh.c +@SRCDIR@/tools/virt-admin.c +@SRCDIR@/tools/virt-host-validate-bhyve.c +@SRCDIR@/tools/virt-host-validate-common.c +@SRCDIR@/tools/virt-host-validate-lxc.c +@SRCDIR@/tools/virt-host-validate-qemu.c +@SRCDIR@/tools/virt-host-validate.c +@SRCDIR@/tools/virt-login-shell.c +@SRCDIR@/tools/vsh.c +@SRCDIR@/tools/vsh.h --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736579; cv=none; d=zoho.com; s=zohoarc; b=ENSO4ulBsdIsqKPtDedGSBXGvOlhxRnRvQW/G3is/eKea2uKn+qJ79Y4FQSw1HUA2krS2M92Qg69h5LnN3D9NCgM1yzvpc+JzuYOiLjcLluNK32BdngEnD89C2E+IgR2VjeRMerjG4YNVfc+XsrGT+wKZbjAZX0DJv8t0QoteEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736579; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CVhNRtqvZxUBUsu/KNAURUvIup/ocLFR6a+vONS3I8g=; b=TOoGrBiGxsP2gelI5++l4uO3Zple7FMoU3CbQflhNuSGSbyG1D85M5r4lJ3vm6CBIGVAcF0+QpDu57SonMXVen3Pya0xWQaeYUVrKocJxJ9DqlLlWPBAOiNeSHCVOpQp28YHpQXTVNg6mnWCzXFu7WWBHx8M4LtRDoYzxCQMFSU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736579896346.2290850687324; Tue, 22 Oct 2019 02:29:39 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-284-g4FMKxngNKCaPcI44fgTRQ-1; Tue, 22 Oct 2019 05:29:36 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8D315E4; Tue, 22 Oct 2019 09:29:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A990160126; Tue, 22 Oct 2019 09:29:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 651164E58B; Tue, 22 Oct 2019 09:29:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L818QM002492 for ; Mon, 21 Oct 2019 04:01:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id DABEC1001938; Mon, 21 Oct 2019 08:01:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6131F1001B11 for ; Mon, 21 Oct 2019 08:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736577; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CVhNRtqvZxUBUsu/KNAURUvIup/ocLFR6a+vONS3I8g=; b=OqA1XzKGJrIz7sxc9601cXIsxVQMTR2L92fJnHnFYoniERTN2bxkvWky9z5TVIIZZwaAfF fvWyYPhM8sLjpFvilynp6g2UseIXugVT5nkjqRfiAMj01XxHqnnNOtUQldkxAMBjWKRV8K 5gwgH+5SbwhZ2LzliZqwisRPVGnSHBQ= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:39 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/25] src: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: g4FMKxngNKCaPcI44fgTRQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This affects more than src/Makefile.am as the rule to generate source files for protocols is generic for all sub-directories. Affected files are: src/admin/admin_protocol.{h,c} src/locking/lock_protocol.{h,c} src/logging/log_protocol.{h,c} src/lxc/lxc_monitor_protocol.{h,c} src/remote/{lxc,qemu,remote}_protocol.{h,c} src/rpc/{virkeepalive,virnet}protocol.{h,c} Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/Makefile.am | 4 ++-- src/admin/Makefile.inc.am | 3 +++ src/locking/Makefile.inc.am | 6 ++++++ src/logging/Makefile.inc.am | 4 ++++ src/lxc/Makefile.inc.am | 4 ++++ src/remote/Makefile.inc.am | 4 ++++ src/rpc/Makefile.inc.am | 3 +++ tests/Makefile.am | 1 + 8 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 34dfeeb9f9..435812e733 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -392,11 +392,11 @@ GENERATED_SYM_FILES +=3D \ =20 %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ - $< $(srcdir)/$(subst $(srcdir)/,,$@) + $< $(subst $(srcdir)/,,$@) =20 %protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ - $< $(srcdir)/$(subst $(srcdir)/,,$@) + $< $(subst $(srcdir)/,,$@) =20 check-local: check-augeas =20 diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 4fd7878e5c..bea0967aaf 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -30,6 +30,7 @@ libvirt_driver_admin_la_CFLAGS =3D \ $(XDR_CFLAGS) \ -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/admin \ + -I$(top_builddir)/src/rpc \ $(NULL) libvirt_driver_admin_la_LIBADD =3D ../gnulib/lib/libgnu.la libvirt_driver_admin_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) @@ -87,8 +88,10 @@ endif WITH_DTRACE_PROBES =20 libvirt_admin_la_CFLAGS =3D \ $(AM_CFLAGS) \ + -I$(builddir)/admin \ -I$(srcdir)/remote \ -I$(srcdir)/rpc \ + -I$(builddir)/rpc \ $(XDR_CFLAGS) \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 2b1c030041..ba7a9ea2ea 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -109,6 +109,9 @@ lockd_la_SOURCES =3D \ $(NULL) lockd_la_CFLAGS =3D \ -I$(srcdir)/conf \ + -I$(srcdir)/locking \ + -I$(builddir)/locking \ + -I$(builddir)/rpc \ $(XDR_CFLAGS) \ $(AM_CFLAGS) \ $(NULL) @@ -146,6 +149,9 @@ virtlockd_SOURCES =3D \ $(LOCK_DAEMON_GENERATED) \ $(NULL) virtlockd_CFLAGS =3D \ + -I$(srcdir)/locking \ + -I$(builddir)/locking \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(XDR_CFLAGS) \ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 7d10b646ea..bb7ea7338d 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -67,6 +67,8 @@ libvirt_driver_log_la_SOURCES =3D \ $(LOG_DRIVER_SOURCES) \ $(NULL) libvirt_driver_log_la_CFLAGS =3D \ + -I$(builddir)/logging \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) @@ -82,6 +84,8 @@ virtlogd_SOURCES =3D \ $(LOG_DAEMON_GENERATED) \ $(NULL) virtlogd_CFLAGS =3D \ + -I$(builddir)/logging \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(XDR_CFLAGS) \ diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index b6db70af7d..78f14bf37a 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -95,6 +95,8 @@ libvirt_driver_lxc_impl_la_CFLAGS =3D \ $(XDR_CFLAGS) \ -I$(srcdir)/access \ -I$(srcdir)/conf \ + -I$(builddir)/lxc \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_lxc_impl_la_LIBADD =3D \ @@ -199,6 +201,8 @@ endif WITH_DTRACE_PROBES libvirt_lxc_LDADD +=3D $(SECDRIVER_LIBS) libvirt_lxc_CFLAGS =3D \ -I$(srcdir)/conf \ + -I$(builddir)/lxc \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(CAPNG_CFLAGS) \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 5c5f5f4d2c..6b0ae586d1 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -50,6 +50,8 @@ REMOTE_DAEMON_CFLAGS =3D \ -I$(srcdir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/rpc \ + -I$(builddir)/rpc \ + -I$(builddir)/remote \ $(NULL) =20 REMOTE_DAEMON_LD_FLAGS =3D \ @@ -174,6 +176,8 @@ libvirt_driver_remote_la_CFLAGS =3D \ $(XDR_CFLAGS) \ -I$(srcdir)/conf \ -I$(srcdir)/rpc \ + -I$(builddir)/rpc \ + -I$(builddir)/remote \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_remote_la_LDFLAGS =3D $(AM_LDFLAGS) diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index b8ca53c69a..4aa38db1ab 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -79,6 +79,7 @@ EXTRA_DIST +=3D \ endif ! WITH_LIBSSH =20 libvirt_net_rpc_la_CFLAGS =3D \ + -I$(builddir)/rpc \ $(GNUTLS_CFLAGS) \ $(SASL_CFLAGS) \ $(SSH2_CFLAGS) \ @@ -109,6 +110,7 @@ libvirt_net_rpc_server_la_SOURCES =3D \ rpc/virnetserver.c \ $(NULL) libvirt_net_rpc_server_la_CFLAGS =3D \ + -I$(builddir)/rpc \ $(DBUS_CFLAGS) \ $(XDR_CFLAGS) \ $(SASL_CFLAGS) \ @@ -129,6 +131,7 @@ libvirt_net_rpc_client_la_SOURCES =3D \ rpc/virnetclient.c \ $(NULL) libvirt_net_rpc_client_la_CFLAGS =3D \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index a9acd88670..9ae456c268 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,6 +25,7 @@ AM_CPPFLAGS =3D \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/conf \ + -I$(top_builddir)/src/rpc \ $(NULL) =20 WARN_CFLAGS +=3D $(RELAXED_FRAME_LIMIT_CFLAGS) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736456; cv=none; d=zoho.com; s=zohoarc; b=Bin0oAXn3hh1ThfRigUJHVnqeQy8gF8zTdnZtPeasbtP9xmzdgpUX6x1Jh8m8hQpZYKEzqcD4GREqmYM2o+3eO46cxER6X10sVXN6hiyvR3XksuInqICpdUJ64Lf7l/+vXrmB4nHAe5amzoTEbRJFhExcsKjoy42qB15+R1nctE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736456; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dOvui28Ulao5j8Ix0NzpbiH8kvUhrOCgO9kR41ZYm9c=; b=F0BgOa0D2BPyZ0JPmPHVgHG5QcveyjHUNCwsgApjdUpNEPGVhVdSN718sk7IJhUfWCn9qy1sQv1wVhOyEmDdJaKagFSXnS+Z0gKDaX6P+NQn8v2kpGuaRSSXdbvWs7Qisolunu20yl9cuB6tQJzPFC27CY8xgWCdzy3saOfh60k= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571736456516964.5171557340823; Tue, 22 Oct 2019 02:27:36 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-woETcFrLPHOyLmy6QRVPaw-1; Tue, 22 Oct 2019 05:27:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BB7B107AD34; Tue, 22 Oct 2019 09:27:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C9F765C557; Tue, 22 Oct 2019 09:27:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8656E180085A; Tue, 22 Oct 2019 09:27:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L819pt002501 for ; Mon, 21 Oct 2019 04:01:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id B3A1A1001B11; Mon, 21 Oct 2019 08:01:09 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 381731001938 for ; Mon, 21 Oct 2019 08:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736455; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dOvui28Ulao5j8Ix0NzpbiH8kvUhrOCgO9kR41ZYm9c=; b=NBvZlk3bwe2Vk3spWd+eGk7dieaw32UjQOy12EBkYW+3mk4WiZ3+HLJZae8pxUxEwEIgsE oloLwtElA6AkFxtDDcVBYR1uaPQUJvJ3azJ05wUQTmtoGrOmWUXEi7nujSaAEdodA5oS2g aIpoblf00kp0HEYkBd0xW/uqJ8AnyXo= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:40 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/25] src: access: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: woETcFrLPHOyLmy6QRVPaw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/access/Makefile.inc.am | 14 +++++++------- src/admin/Makefile.inc.am | 1 + src/interface/Makefile.inc.am | 1 + src/libxl/Makefile.inc.am | 1 + src/lxc/Makefile.inc.am | 1 + src/network/Makefile.inc.am | 1 + src/node_device/Makefile.inc.am | 1 + src/nwfilter/Makefile.inc.am | 1 + src/qemu/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 1 + src/secret/Makefile.inc.am | 1 + src/storage/Makefile.inc.am | 1 + 12 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index ea27adbe0b..2d871ec8aa 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -38,7 +38,7 @@ ACCESS_DRIVER_POLKIT_SOURCES =3D \ access/viraccessdriverpolkit.c \ $(NULL) =20 -ACCESS_DRIVER_POLKIT_POLICY =3D $(srcdir)/access/org.libvirt.api.policy +ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.policy =20 GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) =20 @@ -122,31 +122,31 @@ access/viraccessapicheck.h: $(srcdir)/rpc/gendispatch= .pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/access/viraccessapicheck.h + > access/viraccessapicheck.h access/viraccessapicheck.c: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ remote REMOTE $(REMOTE_PROTOCOL) access/viraccessapicheck.h \ - > $(srcdir)/access/viraccessapicheck.c + > access/viraccessapicheck.c =20 access/viraccessapicheckqemu.h: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/access/viraccessapicheckqemu.h + > access/viraccessapicheckqemu.h access/viraccessapicheckqemu.c: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ qemu QEMU $(QEMU_PROTOCOL) access/viraccessapicheckqemu.h \ - > $(srcdir)/access/viraccessapicheckqemu.c + > access/viraccessapicheckqemu.c =20 access/viraccessapichecklxc.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/access/viraccessapichecklxc.h + > access/viraccessapichecklxc.h access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ lxc LXC $(LXC_PROTOCOL) access/viraccessapichecklxc.h \ - > $(srcdir)/access/viraccessapichecklxc.c + > access/viraccessapichecklxc.c diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index bea0967aaf..94cbed9972 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -89,6 +89,7 @@ endif WITH_DTRACE_PROBES libvirt_admin_la_CFLAGS =3D \ $(AM_CFLAGS) \ -I$(builddir)/admin \ + -I$(builddir)/access \ -I$(srcdir)/remote \ -I$(srcdir)/rpc \ -I$(builddir)/rpc \ diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 780b2277ba..30ea98ad15 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -21,6 +21,7 @@ if WITH_INTERFACE mod_LTLIBRARIES +=3D libvirt_driver_interface.la libvirt_driver_interface_la_CFLAGS =3D \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index ef8e9613f5..5d9cf14f7f 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -44,6 +44,7 @@ libvirt_driver_libxl_impl_la_CFLAGS =3D \ $(LIBXL_CFLAGS) \ $(LIBXML_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 78f14bf37a..f22a53e58d 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -94,6 +94,7 @@ libvirt_driver_lxc_impl_la_CFLAGS =3D \ $(FUSE_CFLAGS) \ $(XDR_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(builddir)/lxc \ -I$(builddir)/rpc \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index b58b5ea645..2f7932ae60 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -44,6 +44,7 @@ libvirt_driver_network_impl_la_CFLAGS =3D \ $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 9b58636a0c..1dfa0a5274 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -39,6 +39,7 @@ libvirt_driver_nodedev_la_SOURCES =3D $(NODE_DEVICE_DRIVE= R_SOURCES) =20 libvirt_driver_nodedev_la_CFLAGS =3D \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index e24e8aa2a0..ca05cba934 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -37,6 +37,7 @@ libvirt_driver_nwfilter_impl_la_CFLAGS =3D \ $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 2074a5f54f..69e290c428 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -95,6 +95,7 @@ libvirt_driver_qemu_impl_la_CFLAGS =3D \ $(SELINUX_CFLAGS) \ $(XDR_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 6b0ae586d1..7361d02cf4 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -48,6 +48,7 @@ REMOTE_DAEMON_CFLAGS =3D \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/rpc \ -I$(builddir)/rpc \ diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index fd7c90a137..94f293d418 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -28,6 +28,7 @@ if WITH_SECRETS mod_LTLIBRARIES +=3D libvirt_driver_secret.la libvirt_driver_secret_la_CFLAGS =3D \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 08a9f4e86c..ec35ab7665 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -119,6 +119,7 @@ storagefile_LTLIBRARIES =3D libvirt_driver_storage_impl_la_SOURCES =3D libvirt_driver_storage_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736497; cv=none; d=zoho.com; s=zohoarc; b=I/Zs1nKctTif+cvjbiBBAqwwncp0ODGT3fvXqFG71NvxqCK4n1U0dbDxIuQ22RYemG1kkLQgs+JXTLylMJuduZKpGlPQpB292cjt/ecr5T6mhIdY8YhC+dppWmNwr5QdkXSC1HfcXdi9cb/SRri6Mt5J8yljpEaHoJd1kzf+F48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736497; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CIFodofqiuvzTuEe1vg9k7jaP/Iw8IYMb0oyUkOxJ7Y=; b=TVVzMtISeFxOB2/WmwbyFlkQS1ePgjKI1FlEsQi8XVOREcgC/c34tdzEuh27mi+SlPBtp65vuqh6eMMnzLD7utA8KYpz+74+v3Vf1SMUvzp8ko3Aglm7yH9ePfUtrS0ZIlcNu4NAFdDQwRDNkprn2tQERktFFRNOkJg0YpZIqCA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736497241804.0561073634484; Tue, 22 Oct 2019 02:28:17 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-332-c70GQPrrM6q1d_NTle3EsQ-1; Tue, 22 Oct 2019 05:28:14 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 02534107AD31; Tue, 22 Oct 2019 09:28:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A89519C4F; Tue, 22 Oct 2019 09:28:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2428F3FB41; Tue, 22 Oct 2019 09:28:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81CJ7002524 for ; Mon, 21 Oct 2019 04:01:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id C03B91001B20; Mon, 21 Oct 2019 08:01:12 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42AF01001B11 for ; Mon, 21 Oct 2019 08:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736496; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CIFodofqiuvzTuEe1vg9k7jaP/Iw8IYMb0oyUkOxJ7Y=; b=AiHoq7/Q2VqotmPNBh0zdkSVx5SApyzaLfG+75ZW8HeGECjkgkinrD/fc1aikFjZUQnJzl bi54+gs3WtRDhBYHHN4lAPXiqjeEbZY+ZvRBXa5ZgXfQvoQLtVXaYN0fC4lmR8DLhFEGjb F9ejnCqtCx0vSy+ULT+FyOTIjh+iZZs= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:41 +0200 Message-Id: <2e2dd69c1fdbed3baa131f2a88adf836ca6d9613.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/25] src: admin: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: c70GQPrrM6q1d_NTle3EsQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/admin/Makefile.inc.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 94cbed9972..448f7e1203 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -28,8 +28,9 @@ libvirt_driver_admin_la_SOURCES =3D \ libvirt_driver_admin_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ - -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/admin \ + -I$(top_builddir)/src/admin \ + -I$(top_srcdir)/src/util \ -I$(top_builddir)/src/rpc \ $(NULL) libvirt_driver_admin_la_LIBADD =3D ../gnulib/lib/libgnu.la @@ -123,13 +124,13 @@ admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ $(ADMIN_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ admin ADMIN $(ADMIN_PROTOCOL) \ - > $(srcdir)/admin/admin_client.h + > admin/admin_client.h =20 admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(ADMIN_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ admin ADMIN $(ADMIN_PROTOCOL) \ - > $(srcdir)/admin/admin_server_dispatch_stubs.h + > admin/admin_server_dispatch_stubs.h =20 admin/libvirt_admin.syms: admin/libvirt_admin_public.syms $(ADMIN_SYM_FILE= S) \ $(top_builddir)/config.status --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736669; cv=none; d=zoho.com; s=zohoarc; b=ag9iksJ1jNPSQeY02AwbTrgwpczuY0FDC53OhkTHIeF8nzLz9qx89hvPRda4TWD5giYfuZR9SUSVgccCXa5A4Bu7voyV+cK13JZkLrLFLBg9nok/I8G3P/Xq6phEK52NPmGPG6ZXDJC3pvjYFJZWshb4mxn5IMbBcNPjTnbWME4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736669; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5EBVpzi2Mtv7sOsWOuf+kZDP8ILn1TsAlJextxyOXek=; b=fE8E9QJZSqOE46c6Ffp68cevPoyCl0wzLIrbde2YjRZ1Et6brzkqYIcJ2oVGAji/cwX4j41qXtEmVqY/L2prDgMFN4qWWi0ldk0D5YRaZThdxMa8EDtG2nkNlrsaaBrpFXnSZva5+bXP2djyc4q7qIaSWswxIf9Iiv+K+0/XBsw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571736669585899.2594407696026; Tue, 22 Oct 2019 02:31:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-177--fHU43C4PJ-T-Z9qOQp98w-1; Tue, 22 Oct 2019 05:30:16 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0279A1800D6A; Tue, 22 Oct 2019 09:30:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDCA61001B33; Tue, 22 Oct 2019 09:30:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 49131180085A; Tue, 22 Oct 2019 09:30:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81D8g002535 for ; Mon, 21 Oct 2019 04:01:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 97FC41001B11; Mon, 21 Oct 2019 08:01:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BAF11001938 for ; Mon, 21 Oct 2019 08:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736668; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5EBVpzi2Mtv7sOsWOuf+kZDP8ILn1TsAlJextxyOXek=; b=aCqBr880fPoQmqnbyYAclWxTkGfmBgDsCMy9pFmg/cb+/zKZRd4q05RO8kMJJj+7siovcO i42U46k75zLpRp4uJemQpLO1U08y1hJrbadEwku4xjlf0BEL0VtiF8XOYN1uF7LtWEpLgA mQ0Wl7slqW4E1b0fBBJmpuy0NzNgTBg= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:42 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 17/25] src: esx: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: -fHU43C4PJ-T-Z9qOQp98w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/esx/Makefile.inc.am | 5 +++-- src/esx/esx_vi_generator.py | 11 ++++------- tests/Makefile.am | 3 +++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 3dab05d71c..7ba9fd1758 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -63,8 +63,8 @@ $(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) =20 $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ $(srcdir)/esx/esx_vi_generator.py - $(AM_V_GEN)srcdir=3D$(srcdir) $(RUNUTF8) $(PYTHON) \ - $(srcdir)/esx/esx_vi_generator.py && touch $@ + $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ + $(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@ =20 MAINTAINERCLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) =20 @@ -81,6 +81,7 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_driver_esx.la libvirt_driver_esx_la_CFLAGS =3D \ $(CURL_CFLAGS) \ -I$(srcdir)/conf \ + -I$(builddir)/esx \ -I$(srcdir)/vmx \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 28d440a6df..c77de6e60c 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1379,14 +1379,11 @@ additional_object_features =3D { =20 removed_object_features =3D {} =20 +if len(sys.argv) !=3D 3: + report_error("usage: %s srcdir builddir" % sys.argv[0]) =20 - -if "srcdir" in os.environ: - input_filename =3D os.path.join(os.environ["srcdir"], "esx/esx_vi_gene= rator.input") - output_dirname =3D os.path.join(os.environ["srcdir"], "esx") -else: - input_filename =3D os.path.join(os.getcwd(), "esx_vi_generator.input") - output_dirname =3D os.getcwd() +input_filename =3D os.path.join(sys.argv[1], "esx/esx_vi_generator.input") +output_dirname =3D os.path.join(sys.argv[2], "esx") =20 =20 =20 diff --git a/tests/Makefile.am b/tests/Makefile.am index 9ae456c268..d549e38e18 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -756,6 +756,9 @@ esxutilstest_SOURCES =3D \ esxutilstest.c \ testutils.c testutils.h esxutilstest_LDADD =3D $(LDADDS) +esxutilstest_CFLAGS =3D \ + -I$(top_builddir)/src/esx \ + $(AM_CFLAGS) else ! WITH_ESX EXTRA_DIST +=3D esxutilstest.c endif ! WITH_ESX --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736671; cv=none; d=zoho.com; s=zohoarc; b=RH1oDmeDvD7kgn3Ih1n3f87PInboAPBVzeVmUEhFZ0FZ+QX7f6MrcrWO3DkraZqlGWjBFC/s0BtHbv6LUWrYf6FpderFet3VFZu7jmrx0qdm3g+g9zizdJHSOkXWhp052xDBh7Nqr5cfta4z4An5rnvG0otz2rmU4vFWZfL+uoM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736671; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aomgMcMV6/YTmTOFUx3IpJ6DjG3+6XLRaMuOkhq44Rc=; b=n8DTV9L1mY9V7LkLgY3yfUW8BQ+UHmGgbXjyICX/gNP84ZGPF7PoE2F0TsHDp75tKnjh92df183vuD0VcpTDKcUz/lxHkZqoDUS6oV0yYdwiR99PM92Gm7zQWUukTEuO+fmfIxTaBn2nLgIiujvLCY/W2hMCYOgjzFtUDx1ae1c= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571736671879708.4440058257215; Tue, 22 Oct 2019 02:31:11 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-239-j5gARmDnPmiy6Ajs_KO1Sg-1; Tue, 22 Oct 2019 05:31:08 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C6581005509; Tue, 22 Oct 2019 09:31:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F6686012D; Tue, 22 Oct 2019 09:31:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BD36A4EE68; Tue, 22 Oct 2019 09:31:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81EMW002543 for ; Mon, 21 Oct 2019 04:01:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6BEEB1001B11; Mon, 21 Oct 2019 08:01:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6B0C10016EB for ; Mon, 21 Oct 2019 08:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736670; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=aomgMcMV6/YTmTOFUx3IpJ6DjG3+6XLRaMuOkhq44Rc=; b=PZk8Y9jw0dhfHk9jEocMND8IqwJm/INnfV4cCjH5fJepWuXl5azTFaO1AG5l+vqLzXep/q H7ew/nAAYHGPd3cJxpgEYf2bXyf56qtNNTYOqp7BrQimkf3tBJ7o2CT6BAtFYwzDhJ8u6E 8ZAgGm3iqh2uwHE3tJIMDwpBi1vJkv0= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:43 +0200 Message-Id: <276644e805b2b7e203c0b78a8249b1f51e06b290.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 18/25] src: hyperv: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: j5gARmDnPmiy6Ajs_KO1Sg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/hyperv/Makefile.inc.am | 5 +++-- src/hyperv/hyperv_wmi_generator.py | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 6728b39c90..79e94d09bb 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -41,8 +41,8 @@ $(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) =20 $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py - $(AM_V_GEN)srcdir=3D$(srcdir) $(RUNUTF8) $(PYTHON) \ - $(srcdir)/hyperv/hyperv_wmi_generator.py \ + $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ + $(srcdir)/hyperv/hyperv_wmi_generator.py $(srcdir) $(builddir) \ && touch $@ =20 MAINTAINERCLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_ST= AMP) @@ -53,6 +53,7 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_driver_hyperv.la libvirt_driver_hyperv_la_CFLAGS =3D \ $(OPENWSMAN_CFLAGS) \ -I$(srcdir)/conf \ + -I$(builddir)/hyperv \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_hyperv_la_LDFLAGS =3D $(AM_LDFLAGS) diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_gen= erator.py index a9ece0ff00..c3cd39cc76 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -454,12 +454,11 @@ def parse_class(block): =20 =20 def main(): - if "srcdir" in os.environ: - input_filename =3D os.path.join(os.environ["srcdir"], "hyperv/hype= rv_wmi_generator.input") - output_dirname =3D os.path.join(os.environ["srcdir"], "hyperv") - else: - input_filename =3D os.path.join(os.getcwd(), "hyperv_wmi_generator= .input") - output_dirname =3D os.getcwd() + if len(sys.argv) !=3D 3: + report_error("usage: %s srcdir builddir" % sys.argv[0]) + + input_filename =3D os.path.join(sys.argv[1], "hyperv", "hyperv_wmi_gen= erator.input") + output_dirname =3D os.path.join(sys.argv[2], "hyperv") =20 classes_typedef =3D open_and_print(os.path.join(output_dirname, "hyper= v_wmi_classes.generated.typedef")) classes_header =3D open_and_print(os.path.join(output_dirname, "hyperv= _wmi_classes.generated.h")) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736711; cv=none; d=zoho.com; s=zohoarc; b=ASnvt7AssgHF4ILdHDySIu1agnR2fFIL4cJuOpkkXfzRtcH7R5IOBFVv5S32BERRmQ7P9ckdWJVFTgI9OUFLPQU4eVtK7bwGIti3K2AyZAhhvIpkSi9cjmM3khG+eg2AaNUvyb3f8l50KI3392WkkaJGkB61X1u+ugAZVAIN0yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736711; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u8p21qr0JjHtnN8+DcQvq/u1RN+Jpjch2jFk24Ka97A=; b=VFheS4MWJYTb7z5V0IecE5rFfbdnT1ICLTbhHE+8CrOXKdi4vNc+v0c91aMtUeVpE8DmgMeaCDeYYceVxRBbnR47KqQz47EnyzRAChJH5NXaL5x+OMBX1SMIuZo3oN7m82L7miKNkq8a1UEkKVfAW9hP/J8nY657BysKCONay3w= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571736711128727.7056351096799; Tue, 22 Oct 2019 02:31:51 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-155-z3nSRXPqM5SNNyN1pxet3Q-1; Tue, 22 Oct 2019 05:31:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2975080183E; Tue, 22 Oct 2019 09:31:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 02DFF5C1D4; Tue, 22 Oct 2019 09:31:43 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B680A180B536; Tue, 22 Oct 2019 09:31:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81FJp002548 for ; Mon, 21 Oct 2019 04:01:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3F0071001938; Mon, 21 Oct 2019 08:01:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA5171001B11 for ; Mon, 21 Oct 2019 08:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736710; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=u8p21qr0JjHtnN8+DcQvq/u1RN+Jpjch2jFk24Ka97A=; b=JB/e8KPaeyVLOU/3bTB83leV46KYD+1wEa1N/xAwCtozOTX/z/QyPSXEZ7I7dnVTkYvQ8k oCJBCaH2BVgW39SnMSIBi7eiWhLlrvj/Xm20auOewbHneKbN3erdJaPpc2ZQ25cBYPNlzi HG3r5JdSVdrbtJEk/sW45PCmPsywRTA= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:44 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 19/25] src: locking: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: z3nSRXPqM5SNNyN1pxet3Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/locking/Makefile.inc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index ba7a9ea2ea..2bfb662016 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -280,7 +280,7 @@ locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ $(srcdir)/rpc/gendispatch.pl Makefile.am $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \ - $(LOCK_PROTOCOL) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h + $(LOCK_PROTOCOL) > locking/lock_daemon_dispatch_stubs.h =20 =20 virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.sta= tus --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736660; cv=none; d=zoho.com; s=zohoarc; b=RS3Gwa7y1s/02PlYuT+gVAyJoKyQCYZ3LG9/IjrAwfCOUIy6npaHrf03v+pAuXpVkA64iGFSM3lg6KWghDY7d+cW010LCjJcMoVAXYpW9T0JBksucA+EPSiZc2v3TWbzQTgqIe6pVeDiuTWDxk7FQQG1sL0g44JxKJKZclXd+2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736660; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NsUuelMBSuEvXplMghvzEV6fnvGkdBPI2WbR7V7HlbU=; b=InXMag9pPx2M3vT6y9ihJP7S2QhsCUwvrzI0oqVveDWVKMMAVhpbr9FOuQe47fUdamBkbF1fn7cq3Ux/Xug0WaVe8gkyy6kj8Humpav6ikamm41WK1U8xvl8YvlLC+PHBP+gg+dmnFMqybGoJiaaLBHk4nIE5wxGi5756Rtl03I= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571736660616742.2351341190717; Tue, 22 Oct 2019 02:31:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-4-88qPrROuW0omQ7_7aGfw-1; Tue, 22 Oct 2019 05:30:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53A681800E01; Tue, 22 Oct 2019 09:30:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 302F45ED21; Tue, 22 Oct 2019 09:30:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C1CBF4EDA5; Tue, 22 Oct 2019 09:30:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81GPX002554 for ; Mon, 21 Oct 2019 04:01:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1839E1001B20; Mon, 21 Oct 2019 08:01:16 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FBDB1001938 for ; Mon, 21 Oct 2019 08:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736659; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NsUuelMBSuEvXplMghvzEV6fnvGkdBPI2WbR7V7HlbU=; b=MBgTrp+ko9myj5b2SBKOSQEKMv4GijO+auuQ8WibNHfxiDUsGRoVm2Uz5Amt1KqnJtkJ6D k0s2c6ewnXGOzoJEAuzzRvGeKAhdvQZGewfGDMBO/b/TKiyOunIS2XFMAlGp6N9owlJ/5T H5qc5CgjpG1D66Humo64xkXZMccd1kc= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:45 +0200 Message-Id: <477a6c931ac085097d07355fc689033d3bc89d1c.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 20/25] src: logging: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 4-88qPrROuW0omQ7_7aGfw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/logging/Makefile.inc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index bb7ea7338d..dbaac2bb0d 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -127,7 +127,7 @@ logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \ $(srcdir)/rpc/gendispatch.pl Makefile.am $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \ - $(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h + $(LOG_PROTOCOL) > logging/log_daemon_dispatch_stubs.h =20 virtlogd.8.in: logging/virtlogd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736701; cv=none; d=zoho.com; s=zohoarc; b=Vo/Zk58IU9WGZKTkuzP9QmOPFONeGxhmqmtj/cOWOioP2OCfKm//InByanvNY5hOixbRRzokgrzVBAP1NxKRJCTWf0D52n0luHPE6CIvzz7OQmxr026Wr0Wcc3k93VHvzc9c1+KO6Ja/ZBB56F9S1y9lmu6KgqCEZMpMQu5UMfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736701; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rJlRUn7CMnlugQiqsOH+hX3Q+SB1eD/q5NcqGnzmUvo=; b=WI3UkwsinhUzhO0rycbUb1ynpiNTRJPMhcTYSpqpO1Jd17ESmAfs05qUpYoBOE1jqjlBNoVexIrlvwBbNZO5EOWe2CSK8An3wNpxcTl7EpecSgJDjEfRIVx/SLouvlJIKsuym5osxKBL82xokf34GCcMuS3GTIADRjf5mxyUktU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736701707395.995984063426; Tue, 22 Oct 2019 02:31:41 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-300--me-4sdmMdKl0wT5Rfbcgg-1; Tue, 22 Oct 2019 05:31:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18CFF2B7; Tue, 22 Oct 2019 09:31:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB2E55D6A5; Tue, 22 Oct 2019 09:31:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ADF30180B536; Tue, 22 Oct 2019 09:31:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81GBr002564 for ; Mon, 21 Oct 2019 04:01:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id E6E461001B11; Mon, 21 Oct 2019 08:01:16 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B94E10016EB for ; Mon, 21 Oct 2019 08:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736700; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rJlRUn7CMnlugQiqsOH+hX3Q+SB1eD/q5NcqGnzmUvo=; b=RDGKXBlZm8VYTBXtBDqoaiAJJ1JNJ0icR3VLKjvRg9E8AcHzz+UbOPH5yNclEgqw/h3/U4 dRCpYLHu4hEoPSzQ8UHH1gOQpk7ao7kNdGgr5MaZ6QINXy4f711KlJPnF5lTl/wc4TUO0c PubcHPtDeudjdVyZC74RxlUcIC6nmpo= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:46 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 21/25] src: lxc: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: -me-4sdmMdKl0wT5Rfbcgg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/lxc/Makefile.inc.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index f22a53e58d..cb55dfd1c6 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -252,13 +252,13 @@ lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch= .pl \ $(LXC_MONITOR_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - $(srcdir)/lxc/lxc_monitor_dispatch.h + lxc/lxc_monitor_dispatch.h =20 lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - $(srcdir)/lxc/lxc_controller_dispatch.h + lxc/lxc_controller_dispatch.h =20 .PHONY: \ install-data-lxc \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736728; cv=none; d=zoho.com; s=zohoarc; b=jKZDwzLgqGYTDgyrBf2eQs0Oi5hRkN3AZ9SJyYqkH7hR1WAZ/LORarnF8r0X8PRQWrjmO1KzQPkYx8uZzALA2OYLH3mT4sljgvTeyE5xbfAtv708i/nN8gH8/YB88z553hsoYzU8XMpA12XFXA4CuhSVmfAUFTdDCzZMgLYmPqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736728; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gkWsYkd/Wl0hK22wKFCO/jAyqB03Yus3m0hKFe6gM9A=; b=E6xXA0UMe9L7TIl207F0DoQpbm7ot39o7Eyqz3x5tq6ubNCt90M77lro8GAfyy2F8QsNnuByz+tQdDFwsYn3w+7xyz9BIAelUfn5xA4K5bcXwMcI/flwakCBsEg6I7GsN/Wi6Oc1PAgIU4ib3uVAnSgbstEPxQ4wwapRkJ44jUg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736728945837.1952216184908; Tue, 22 Oct 2019 02:32:08 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-106-THs14Z2XNoO6CjLFWrE5CA-1; Tue, 22 Oct 2019 05:32:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 45B3C5E9; Tue, 22 Oct 2019 09:32:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F33219C4F; Tue, 22 Oct 2019 09:32:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CD7BA1803518; Tue, 22 Oct 2019 09:32:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81HWY002575 for ; Mon, 21 Oct 2019 04:01:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5A341001B20; Mon, 21 Oct 2019 08:01:17 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4207B1001B11 for ; Mon, 21 Oct 2019 08:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736727; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=gkWsYkd/Wl0hK22wKFCO/jAyqB03Yus3m0hKFe6gM9A=; b=E2OJ8hn6lQnJrOAr2u3wPjDtpPgpeiRPuwKZDDTfBqYjSncH/zXo5Vki5EEiCpTaeLbUjV RcV6kNOXLGnh7/wtFCkMa5prz0dBisA71a7EyvpwnznxCQpGVHCEtQtbkqc+yDvC7v9ju8 HVZTMk+Rt92hYcdaMTab3jWTyNaNdjQ= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:47 +0200 Message-Id: <91faac807782cff8f391bbd95efe619af03f899d.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 22/25] src: remote: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: THs14Z2XNoO6CjLFWrE5CA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/remote/Makefile.inc.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 7361d02cf4..242eb3ed2d 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -427,37 +427,37 @@ remote/remote_client_bodies.h: $(srcdir)/rpc/gendispa= tch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/remote/remote_client_bodies.h + > remote/remote_client_bodies.h =20 remote/lxc_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/remote/lxc_client_bodies.h + > remote/lxc_client_bodies.h =20 remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/remote/qemu_client_bodies.h + > remote/qemu_client_bodies.h =20 remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=3Dserver remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/remote/remote_daemon_dispatch_stubs.h + > remote/remote_daemon_dispatch_stubs.h =20 remote/lxc_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=3Dserver lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/remote/lxc_daemon_dispatch_stubs.h + > remote/lxc_daemon_dispatch_stubs.h =20 remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=3Dserver qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/remote/qemu_daemon_dispatch_stubs.h + > remote/qemu_daemon_dispatch_stubs.h =20 libvirtd.8.in: remote/libvirtd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736784; cv=none; d=zoho.com; s=zohoarc; b=KWfSNbiAeChhHjWGTekpOyBHsD6QGjtlxoQv2fiWCBNgcKZS1LlVwEJ4LCOxqWF4LTYBhmy8Qo4+Vu4RO1WxZ8rw149fllWP4ZxsDRxOvL1lExB9ZFK1B8ukXtgPZak7QH+gBU3C0NDrNQK9QlmmXYcKhrE5OQjiAShLfYJ+s8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736784; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n/uiPBVkRD/k9qMjkZQuUxVtZL+pnOsLGqKGeWe3w50=; b=KuA8gKeCHv/r+e1b7aIoA3nwIRJh3fmFHdt/MRD7RiSyWN//baBZZ2Es6eVMCuXrY+DUNs2/Z+/G5xINshdbc3aluQaD6zPAjBUhYDR+q9Z6UeKE8JvmuBVyiaLz0zF68araClNCwiIP9sC/ZiIJxhb/u5S2RCA3L2RMs/lh+UM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 157173678421838.20374306468045; Tue, 22 Oct 2019 02:33:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-13-K-xI8c_bPQWq4C-xcTHuqg-1; Tue, 22 Oct 2019 05:32:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DA121005526; Tue, 22 Oct 2019 09:32:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B63160C63; Tue, 22 Oct 2019 09:32:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D76E24EE69; Tue, 22 Oct 2019 09:32:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81Ix6002586 for ; Mon, 21 Oct 2019 04:01:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9A2CB1001B20; Mon, 21 Oct 2019 08:01:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 218131001B11 for ; Mon, 21 Oct 2019 08:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736783; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=n/uiPBVkRD/k9qMjkZQuUxVtZL+pnOsLGqKGeWe3w50=; b=ICKKkqMr2pGMqUWqYAGLc3G3JVhLhjU2CcC+vVKiwONM/1eGVBaGCnlFHokCES4cXjinOQ ciUWDhoAtvGjPlRw0HUpNSke2nVGnBoEddQ1HIgvZPnC/Px+l6GTMDfFkotLa7ovkNA/nq TEIn864bqJDfk2lOUfRwvM+cym01gUA= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:48 +0200 Message-Id: <6f1f5c70fb8120d9b809875b5ba5fdc3a701185d.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 23/25] include: stop distributing generated source files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: K-xI8c_bPQWq4C-xcTHuqg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- include/libvirt/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am index 65a1b23599..d7114c3462 100644 --- a/include/libvirt/Makefile.am +++ b/include/libvirt/Makefile.am @@ -20,7 +20,7 @@ virincdir =3D $(includedir)/libvirt =20 allheaders =3D $(wildcard $(srcdir)/*.h) virinc_HEADERS =3D $(filter-out $(srcdir)/libvirt-common.h, $(allheaders)) -virinc_HEADERS +=3D libvirt-common.h +nodist_virinc_HEADERS =3D libvirt-common.h =20 EXTRA_DIST =3D libvirt-common.h.in =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736787; cv=none; d=zoho.com; s=zohoarc; b=Ixlh8ymhMBe7+NTdiWGdDuktmHk72n6zQ1lQQjd+h/4qAu8j2EX0AN45R1cPqXBKWUZGyMqpIUtvNogKSpQgWJ/HeCQ/D6exyVEMpytnijKsT3kqqB5cKUeOAMLVYzcOPLZQRyrGbyfPshBNeZR3j/wIhhbL//IrqjLxLWVGse8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736787; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rvxkWuNMcn3voHrBOu9wQ9NbBGUbUh7HUWXVeBOHaug=; b=mz1irNvHGyxoXrlqFLkzdHJa2nU4Mzo0kuqvkZ0B1KuLd2B4e1+huDMGxAQzOSYb+N3EP0MBmnW3igYJEUAvhuzE1bwkwGqAO6vlv0Eeprq8cu6OR6yW4dhXYS8JVLXi/zS/G4SSeDvixZwcRX8QxlytcFtTvEeFyQCHOj4+LCk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571736787362807.2884467424734; Tue, 22 Oct 2019 02:33:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-176-QnIkMMv8NluJNn1FXDUzYQ-1; Tue, 22 Oct 2019 05:32:14 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 232035F3; Tue, 22 Oct 2019 09:32:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEC635C3FD; Tue, 22 Oct 2019 09:32:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A94764EE6F; Tue, 22 Oct 2019 09:32:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81JaP002600 for ; Mon, 21 Oct 2019 04:01:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 719871001B11; Mon, 21 Oct 2019 08:01:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8E2210016EB for ; Mon, 21 Oct 2019 08:01:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736786; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rvxkWuNMcn3voHrBOu9wQ9NbBGUbUh7HUWXVeBOHaug=; b=Z49yQOGcrDrmT9RMHW4HfcZ64vDRIfVZiInvCDNE3xzvrYpJgK0VDsBvqRBUntJluaEXDA gIKTdPRDLc/PEQi5FqElrtS/Df8rAaRWAmEBj2mv/06mIkAYvbZeMFwXMIZcGiyIDGafOZ myxMo7yWM1wI/xkCVPgvwC4Ylzf1hO8= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:49 +0200 Message-Id: <7b9ddbcf19125ebec6825750fed478cc59ad2fa6.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 24/25] src: stop distributing generated source files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: QnIkMMv8NluJNn1FXDUzYQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- po/POTFILES.in | 8 ++++---- src/Makefile.am | 6 +++--- src/access/Makefile.inc.am | 3 ++- src/admin/Makefile.inc.am | 13 +++++++------ src/bhyve/Makefile.inc.am | 1 + src/esx/Makefile.inc.am | 4 +--- src/hyperv/Makefile.inc.am | 4 +--- src/interface/Makefile.inc.am | 1 + src/libxl/Makefile.inc.am | 1 + src/locking/Makefile.inc.am | 8 +++++--- src/logging/Makefile.inc.am | 12 +++++++----- src/lxc/Makefile.inc.am | 27 ++++++++++++++++++--------- src/network/Makefile.inc.am | 1 + src/node_device/Makefile.inc.am | 1 + src/nwfilter/Makefile.inc.am | 1 + src/qemu/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 20 ++++++++++++-------- src/rpc/Makefile.inc.am | 5 ++++- src/secret/Makefile.inc.am | 1 + src/storage/Makefile.inc.am | 1 + src/util/Makefile.inc.am | 6 ++++-- src/vbox/Makefile.inc.am | 1 + src/vz/Makefile.inc.am | 1 + 23 files changed, 79 insertions(+), 48 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 8d423566a7..15f062a273 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,7 +4,7 @@ @SRCDIR@/src/access/viraccessmanager.c @SRCDIR@/src/admin/admin_server.c @SRCDIR@/src/admin/admin_server_dispatch.c -@SRCDIR@/src/admin/admin_server_dispatch_stubs.h +@BUILDDIR@/src/admin/admin_server_dispatch_stubs.h @SRCDIR@/src/admin/libvirt-admin.c @SRCDIR@/src/bhyve/bhyve_capabilities.c @SRCDIR@/src/bhyve/bhyve_command.c @@ -146,12 +146,12 @@ @SRCDIR@/src/qemu/qemu_monitor_text.c @SRCDIR@/src/qemu/qemu_process.c @SRCDIR@/src/qemu/qemu_qapi.c -@SRCDIR@/src/remote/qemu_daemon_dispatch_stubs.h -@SRCDIR@/src/remote/remote_client_bodies.h +@BUILDDIR@/src/remote/qemu_daemon_dispatch_stubs.h +@BUILDDIR@/src/remote/remote_client_bodies.h @SRCDIR@/src/remote/remote_daemon.c @SRCDIR@/src/remote/remote_daemon_config.c @SRCDIR@/src/remote/remote_daemon_dispatch.c -@SRCDIR@/src/remote/remote_daemon_dispatch_stubs.h +@BUILDDIR@/src/remote/remote_daemon_dispatch_stubs.h @SRCDIR@/src/remote/remote_daemon_stream.c @SRCDIR@/src/remote/remote_driver.c @SRCDIR@/src/rpc/virkeepalive.c diff --git a/src/Makefile.am b/src/Makefile.am index 435812e733..046831e075 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -653,13 +653,13 @@ endif WITH_LIBVIRTD < $< > $@-t && \ mv $@-t $@ =20 -CLEANFILES +=3D $(man8_MANS) -MAINTAINERCLEANFILES +=3D $(MANINFILES) +CLEANFILES +=3D \ + $(man8_MANS) \ + $(MANINFILES) =20 EXTRA_DIST +=3D \ $(SYSTEMD_UNIT_FILES_IN) \ $(PODFILES) \ - $(MANINFILES) \ $(NULL) =20 =20 diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index 2d871ec8aa..fd0a5d8098 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -43,13 +43,14 @@ ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.= policy GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) =20 EXTRA_DIST +=3D \ - $(ACCESS_DRIVER_POLKIT_POLICY) \ access/genpolkit.pl \ $(NULL) =20 =20 libvirt_driver_access_la_SOURCES =3D \ $(ACCESS_DRIVER_SOURCES) \ + $(NULL) +nodist_libvirt_driver_access_la_SOURCES =3D \ $(ACCESS_DRIVER_GENERATED) \ $(NULL) noinst_LTLIBRARIES +=3D libvirt_driver_access.la diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 448f7e1203..3feb23aa20 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -9,22 +9,21 @@ ADMIN_PROTOCOL_GENERATED =3D \ admin/admin_server_dispatch_stubs.h \ $(NULL) =20 -EXTRA_DIST +=3D $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED) +EXTRA_DIST +=3D $(ADMIN_PROTOCOL) BUILT_SOURCES +=3D $(ADMIN_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) +CLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) =20 admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h =20 noinst_LTLIBRARIES +=3D libvirt_driver_admin.la libvirt_driver_admin_la_SOURCES =3D \ - admin/admin_protocol.c \ - admin/admin_protocol.h \ admin/admin_server.c \ admin/admin_server.h \ admin/admin_server_dispatch.c \ admin/admin_server_dispatch.h \ - admin/admin_server_dispatch_stubs.h \ $(NULL) +nodist_libvirt_driver_admin_la_SOURCES =3D \ + $(ADMIN_PROTOCOL_GENERATED) libvirt_driver_admin_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ @@ -60,9 +59,11 @@ lib_LTLIBRARIES +=3D libvirt-admin.la =20 libvirt_admin_la_SOURCES =3D \ admin/libvirt-admin.c \ - $(ADMIN_PROTOCOL_GENERATED) \ $(DATATYPES_SOURCES) =20 +nodist_libvirt_admin_la_SOURCES =3D \ + $(ADMIN_PROTOCOL_GENERATED) + libvirt_admin_la_LDFLAGS =3D \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 96ae2f5044..de9fbe9239 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -56,6 +56,7 @@ augeastest_DATA +=3D bhyve/test_virtbhyved.aug CLEANFILES +=3D bhyve/virtbhyved.aug =20 virtbhyved_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtbhyved_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtbhyved_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtbhyved\"" \ diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 7ba9fd1758..6b10755b7e 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -44,7 +44,6 @@ ESX_DRIVER_EXTRA_DIST =3D \ esx/README \ esx/esx_vi_generator.input \ esx/esx_vi_generator.py \ - $(ESX_DRIVER_GENERATED) \ $(NULL) =20 ESX_GENERATED_STAMP =3D .esx_vi_generator.stamp @@ -54,7 +53,6 @@ DRIVER_SOURCE_FILES +=3D $(ESX_DRIVER_SOURCES) EXTRA_DIST +=3D \ $(ESX_DRIVER_SOURCES) \ $(ESX_DRIVER_EXTRA_DIST) \ - $(ESX_GENERATED_STAMP) \ $(NULL) =20 BUILT_SOURCES +=3D $(ESX_DRIVER_GENERATED) @@ -66,7 +64,7 @@ $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.in= put \ $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ $(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@ =20 -MAINTAINERCLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) +CLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) =20 if WITH_ESX USED_SYM_FILES +=3D $(srcdir)/libvirt_esx.syms diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 79e94d09bb..b71602c971 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -24,8 +24,6 @@ HYPERV_GENERATED_STAMP =3D .hyperv_wmi_generator.stamp HYPERV_DRIVER_EXTRA_DIST =3D \ hyperv/hyperv_wmi_generator.input \ hyperv/hyperv_wmi_generator.py \ - $(HYPERV_DRIVER_GENERATED) \ - $(HYPERV_GENERATED_STAMP) \ $(NULL) =20 DRIVER_SOURCE_FILES +=3D $(HYPERV_DRIVER_SOURCES) @@ -45,7 +43,7 @@ $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_ge= nerator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py $(srcdir) $(builddir) \ && touch $@ =20 -MAINTAINERCLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_ST= AMP) +CLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) =20 if WITH_HYPERV noinst_LTLIBRARIES +=3D libvirt_driver_hyperv.la diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 30ea98ad15..5f22b90cb4 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -52,6 +52,7 @@ augeastest_DATA +=3D interface/test_virtinterfaced.aug CLEANFILES +=3D interface/virtinterfaced.aug =20 virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtinterfaced_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtinterfaced\"" \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 5d9cf14f7f..8686e78a5d 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -64,6 +64,7 @@ augeastest_DATA +=3D libxl/test_virtxend.aug CLEANFILES +=3D libxl/virtxend.aug =20 virtxend_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtxend_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtxend_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtxend\"" \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 2bfb662016..5c2361a581 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -43,8 +43,6 @@ LOCK_DAEMON_SOURCES =3D \ =20 EXTRA_DIST +=3D \ $(LOCK_PROTOCOL) \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ $(LOCK_DAEMON_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES) \ $(LOCK_DRIVER_SOURCES) \ @@ -64,7 +62,7 @@ BUILT_SOURCES +=3D \ $(LOCK_DAEMON_GENERATED) \ $(NULL) =20 -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(LOCK_PROTOCOL_GENERATED) \ $(LOCK_DAEMON_GENERATED) \ $(NULL) @@ -105,6 +103,8 @@ if WITH_LIBVIRTD lockdriver_LTLIBRARIES +=3D lockd.la lockd_la_SOURCES =3D \ $(LOCK_DRIVER_LOCKD_SOURCES) \ + $(NULL) +nodist_lockd_la_SOURCES =3D \ $(LOCK_PROTOCOL_GENERATED) \ $(NULL) lockd_la_CFLAGS =3D \ @@ -145,6 +145,8 @@ sbin_PROGRAMS +=3D virtlockd =20 virtlockd_SOURCES =3D \ $(LOCK_DAEMON_SOURCES) \ + $(NULL) +nodist_virtlockd_SOURCES =3D \ $(LOCK_PROTOCOL_GENERATED) \ $(LOCK_DAEMON_GENERATED) \ $(NULL) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index dbaac2bb0d..fba54239d5 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -10,7 +10,6 @@ LOG_DAEMON_GENERATED =3D \ $(NULL) =20 LOG_DRIVER_SOURCES =3D \ - $(LOG_PROTOCOL_GENERATED) \ logging/log_manager.c \ logging/log_manager.h \ $(NULL) @@ -30,10 +29,8 @@ LOG_PROTOCOL =3D $(srcdir)/logging/log_protocol.x =20 EXTRA_DIST +=3D \ $(LOG_PROTOCOL) \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ $(LOG_DAEMON_SOURCES) \ - $(LOG_DRIVER_SOURCES) \ + $(LOG_DRIVER) \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ @@ -42,7 +39,7 @@ BUILT_SOURCES +=3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) @@ -66,6 +63,9 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_driver_log.la libvirt_driver_log_la_SOURCES =3D \ $(LOG_DRIVER_SOURCES) \ $(NULL) +nodist_libvirt_driver_log_la_SOURCES =3D \ + $(LOG_PROTOCOL_GENERATED) \ + $(NULL) libvirt_driver_log_la_CFLAGS =3D \ -I$(builddir)/logging \ -I$(builddir)/rpc \ @@ -80,6 +80,8 @@ man8_MANS +=3D virtlogd.8 =20 virtlogd_SOURCES =3D \ $(LOG_DAEMON_SOURCES) \ + $(NULL) +nodist_virtlogd_SOURCES =3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index cb55dfd1c6..d3a7cbf93b 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -22,8 +22,6 @@ LXC_GENERATED =3D \ LXC_MONITOR_PROTOCOL =3D $(srcdir)/lxc/lxc_monitor_protocol.x =20 LXC_DRIVER_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ lxc/lxc_container.c \ @@ -47,8 +45,6 @@ LXC_DRIVER_SOURCES =3D \ $(NULL) =20 LXC_CONTROLLER_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ lxc/lxc_container.c \ @@ -62,13 +58,17 @@ LXC_CONTROLLER_SOURCES =3D \ lxc/lxc_controller.c \ $(NULL) =20 - -DRIVER_SOURCE_FILES +=3D $(LXC_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES +=3D $(LXC_DRIVER_SOURCES) +DRIVER_SOURCE_FILES +=3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_DRIVER_SOURCES) EXTRA_DIST +=3D \ $(LXC_DRIVER_SOURCES) \ $(LXC_MONITOR_PROTOCOL) \ - $(LXC_GENERATED) \ $(LXC_CONTROLLER_SOURCES) \ $(NULL) =20 @@ -112,7 +112,11 @@ libvirt_driver_lxc_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) libvirt_driver_lxc_impl_la_LIBADD +=3D $(BLKID_LIBS) endif WITH_BLKID libvirt_driver_lxc_impl_la_LIBADD +=3D $(SECDRIVER_LIBS) -libvirt_driver_lxc_impl_la_SOURCES =3D $(LXC_DRIVER_SOURCES) +libvirt_driver_lxc_impl_la_SOURCES =3D \ + $(LXC_DRIVER_SOURCES) +nodist_libvirt_driver_lxc_impl_la_SOURCES =3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) =20 =20 sbin_PROGRAMS +=3D virtlxcd @@ -123,6 +127,7 @@ augeastest_DATA +=3D lxc/test_virtlxcd.aug CLEANFILES +=3D lxc/virtlxcd.aug =20 virtlxcd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodst_virtlxcd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtlxcd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtlxcd\"" \ @@ -183,6 +188,10 @@ libvirt_lxc_SOURCES =3D \ $(LXC_CONTROLLER_SOURCES) \ $(DATATYPES_SOURCES) \ $(NULL) +nodist_libvirt_lxc_SOURCES =3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_CONTROLLER_GENERATED) \ + $(NULL) libvirt_lxc_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 2f7932ae60..58dd90c23b 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -59,6 +59,7 @@ augeastest_DATA +=3D network/test_virtnetworkd.aug CLEANFILES +=3D network/virtnetworkd.aug =20 virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtnetworkd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnetworkd\"" \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 1dfa0a5274..2a8c437e7b 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -77,6 +77,7 @@ augeastest_DATA +=3D node_device/test_virtnodedevd.aug CLEANFILES +=3D node_device/virtnodedevd.aug =20 virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtnodedevd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnodedevd\"" \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index ca05cba934..c320b75f78 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -60,6 +60,7 @@ augeastest_DATA +=3D nwfilter/test_virtnwfilterd.aug CLEANFILES +=3D nwfilter/virtnwfilterd.aug =20 virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtnwfilterd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnwfilterd\"" \ diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 69e290c428..3f3476b2b4 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -134,6 +134,7 @@ augeastest_DATA +=3D qemu/test_virtqemud.aug CLEANFILES +=3D qemu/virtqemud.aug =20 virtqemud_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtqemud_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtqemud_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtqemud\"" \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 242eb3ed2d..f5de92be23 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -15,7 +15,6 @@ REMOTE_DRIVER_GENERATED =3D \ REMOTE_DRIVER_SOURCES =3D \ remote/remote_driver.c \ remote/remote_driver.h \ - $(REMOTE_DRIVER_GENERATED) \ $(NULL) =20 REMOTE_DAEMON_GENERATED =3D \ @@ -33,7 +32,6 @@ REMOTE_DAEMON_SOURCES =3D \ remote/remote_daemon_dispatch.h \ remote/remote_daemon_stream.c \ remote/remote_daemon_stream.h \ - $(REMOTE_DAEMON_GENERATED) \ $(NULL) =20 REMOTE_DAEMON_CFLAGS =3D \ @@ -140,7 +138,9 @@ REMOTE_DRIVER_PROTOCOL =3D \ $(LXC_PROTOCOL) \ $(NULL) =20 -DRIVER_SOURCE_FILES +=3D $(REMOTE_DRIVER_SOURCES) +DRIVER_SOURCE_FILES +=3D \ + $(REMOTE_DRIVER_GENERATED) \ + $(REMOTE_DRIVER_SOURCES) =20 EXTRA_DIST +=3D \ $(REMOTE_DRIVER_PROTOCOL) \ @@ -161,11 +161,9 @@ BUILT_SOURCES +=3D \ $(REMOTE_DRIVER_GENERATED) \ $(REMOTE_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(REMOTE_DRIVER_GENERATED) \ $(REMOTE_DAEMON_GENERATED) \ - $(NULL) -CLEANFILES +=3D \ remote/libvirtd.conf \ remote/virtproxyd.conf \ $(NULL) @@ -182,10 +180,13 @@ libvirt_driver_remote_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_remote_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_remote_la_SOURCES =3D $(REMOTE_DRIVER_SOURCES) +libvirt_driver_remote_la_SOURCES =3D \ + $(REMOTE_DRIVER_SOURCES) +nodist_libvirt_driver_remote_la_SOURCES =3D \ + $(REMOTE_DRIVER_GENERATED) =20 if WITH_DTRACE_PROBES -nodist_libvirt_driver_remote_la_SOURCES =3D libvirt_probes.h +nodist_libvirt_driver_remote_la_SOURCES +=3D libvirt_probes.h endif WITH_DTRACE_PROBES =20 if WITH_SASL @@ -230,6 +231,8 @@ man8_MANS +=3D libvirtd.8 =20 libvirtd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) =20 +nodist_libvirtd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) + libvirtd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX=3D"\"libvirt\"" \ @@ -243,6 +246,7 @@ libvirtd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) libvirtd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 virtproxyd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtproxyd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtproxyd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX=3D"\"libvirt\"" \ diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index 4aa38db1ab..a5bde92c9f 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -16,7 +16,7 @@ VIR_NET_RPC_GENERATED =3D \ $(NULL) =20 BUILT_SOURCES +=3D $(VIR_NET_RPC_GENERATED) -MAINTAINERCLEANFILES +=3D $(VIR_NET_RPC_GENERATED) +CLEANFILES +=3D $(VIR_NET_RPC_GENERATED) =20 noinst_LTLIBRARIES +=3D \ libvirt-net-rpc.la \ @@ -39,6 +39,9 @@ libvirt_net_rpc_la_SOURCES =3D \ rpc/virnetsocket.c \ rpc/virkeepalive.h \ rpc/virkeepalive.c \ + $(NULL) + +nodist_libvirt_net_rpc_la_SOURCES =3D \ $(VIR_NET_RPC_GENERATED) \ $(NULL) =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 94f293d418..3d77366d3c 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -48,6 +48,7 @@ augeastest_DATA +=3D secret/test_virtsecretd.aug CLEANFILES +=3D secret/virtsecretd.aug =20 virtsecretd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtsecretd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtsecretd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtsecretd\"" \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index ec35ab7665..1dfe48668f 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -152,6 +152,7 @@ augeastest_DATA +=3D storage/test_virtstoraged.aug CLEANFILES +=3D storage/virtstoraged.aug =20 virtstoraged_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtstoraged_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtstoraged_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtstoraged\"" \ diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index d8c8e61c4b..0eadef71ca 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -253,9 +253,8 @@ KEYMANS =3D $(KEYPODS:%.pod=3D%.7) =20 man7_MANS +=3D $(KEYMANS) =20 -UTIL_SOURCES +=3D $(KEYTABLES) BUILT_SOURCES +=3D $(KEYTABLES) -MAINTAINERCLEANFILES +=3D $(KEYTABLES) +CLEANFILES +=3D $(KEYTABLES) CLEANFILES +=3D $(KEYMANS) $(KEYPODS) =20 UTIL_IO_HELPER_SOURCES =3D util/iohelper.c @@ -266,6 +265,9 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_util.la libvirt_util_la_SOURCES =3D \ $(UTIL_SOURCES) \ $(NULL) +nodist_libvirt_util_la_SOURCES =3D \ + $(KEYTABLES) \ + $(NULL) libvirt_util_la_CFLAGS =3D \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 346a84429b..551189c0f5 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -73,6 +73,7 @@ augeastest_DATA +=3D vbox/test_virtvboxd.aug CLEANFILES +=3D vbox/virtvboxd.aug =20 virtvboxd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtvboxd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtvboxd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtvboxd\"" \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index c5bef04088..1757c8ba10 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -47,6 +47,7 @@ augeastest_DATA +=3D vz/test_virtvzd.aug CLEANFILES +=3D vz/virtvzd.aug =20 virtvzd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtvzd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtvzd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtvzd\"" \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 4 00:46:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571736744; cv=none; d=zoho.com; s=zohoarc; b=hGzfVpgzD8Cdwb+oDvTeAP36BOj/EtOLa+ZaFoMDKENstl33TgP+fJt3daiA0XQGpu69Qpa8L5LOFD56zJ310e7OOpFaWe3lNt8NRFAAAa5eV2JdrmYsxVXBX7Mtriy6/FwOiHxJ71YgCCHw3i9sbAOmD/pDLnDAWDskgbrAoWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736744; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DYBhOyzLLTxLnHIbh3syeAXAwId98eYdS0bKLfTPgsY=; b=KA8iwEYj4QVWxJzNrqNf01gXlnJcGavobUvKEGOTBPsZkjdTYxfokdTVnQYCIYNZbcfLlLwr6yDDTUlpLEVZkdzUVrinxAYtw2iozVG7yH7b4fpluiaxggL6ex055oXjWnWIbr6BzEPjaj2eIyqZNY16fsDvd93Z88KQ2fi11Uw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571736744458857.0109580399181; Tue, 22 Oct 2019 02:32:24 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-105-4CDgQ2g_P9uGWg52TfLfeg-1; Tue, 22 Oct 2019 05:32:19 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF7AD800D4E; Tue, 22 Oct 2019 09:32:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B40D860126; Tue, 22 Oct 2019 09:32:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 611534EE97; Tue, 22 Oct 2019 09:32:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L81Ki2002610 for ; Mon, 21 Oct 2019 04:01:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 495D81001B20; Mon, 21 Oct 2019 08:01:20 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0B6B1001B11 for ; Mon, 21 Oct 2019 08:01:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736743; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DYBhOyzLLTxLnHIbh3syeAXAwId98eYdS0bKLfTPgsY=; b=bb3Xd7jJhmtmiS4jnxPJbvXertNt6JC92YsV4Fy+hzelg8ae3feDpf1MRGTW0MPrsWh2Uc gG5N6L4MAeFsU2D/u9+AFYjt6INkgJRY9qrqydgx2Z17brSkWBYPpPRbpOPYAR+Xj8N6BN lkIhdMuXpn0oXTsW8YcBzGisZRzR/y8= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:50 +0200 Message-Id: <438b3ab12776ea6e9c710bacc68d1974d1b8d35a.1571643673.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 25/25] tools: stop distributing generated source files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 4CDgQ2g_P9uGWg52TfLfeg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- tools/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 68320c7246..1a541a3984 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -84,7 +84,6 @@ EXTRA_DIST =3D \ bash-completion/vsh \ libvirt_recover_xattrs.sh \ $(PODFILES) \ - $(MANINFILES) \ $(NULL) =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list