From nobody Mon May 6 05:58:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1569246246; cv=none; d=zoho.com; s=zohoarc; b=PQmT1q4yF4nswpBnwvQhoxeWdbWRIp3OgXBl1FZX0oLfUc9oDnKyhFwHVATooB/QxiynWX/b4/dcsRqo2yFNYRV2oVdRW1w81s9yCb2buvNpvStNpuIX0yeFfU9AYT0RO+Lyz7yX5oNf6nNGmdI4YWwSwheaotRNsj+BRhk5Os8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569246246; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=d2g9WIlhRmBTrxh9YAFzUgWUKum4CMBNr57ypbSN/g8=; b=oFRv2aeMXwXoRLSD3eL0n+cGcEjgiPVvuuJivUCoe4bdEhgy5YRKmn9YV4lLE9RwkChgu1D7juZFuxD3vNF4OcPAj4RVFDlobDQSqm9cdgrgTnFUi0ftgMafEfDCOXlFKhYbk/fj+ZYQPKFcAPRbp+0z/N1XNdvndsGWob0xCVc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1569246246142613.5457794961286; Mon, 23 Sep 2019 06:44:06 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id A106630917AA; Mon, 23 Sep 2019 13:44:04 +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 74C04601A2; Mon, 23 Sep 2019 13:44: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 1B890180B536; Mon, 23 Sep 2019 13:44:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8NDi2u6005599 for ; Mon, 23 Sep 2019 09:44:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 33CF360628; Mon, 23 Sep 2019 13:44:02 +0000 (UTC) Received: from catbus.gsslab.fab.redhat.com (dhcp-32.gsslab.fab.redhat.com [10.33.9.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99C1060623; Mon, 23 Sep 2019 13:43:58 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 23 Sep 2019 14:39:03 +0100 Message-Id: <20190923133903.29201-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] build: ensure Makefile.inc.am is checked for long lines 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 23 Sep 2019 13:44:05 +0000 (UTC) The filename match rule was accidentally excluding the Makefile.inc.am files from the long lines check. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake --- cfg.mk | 2 +- src/interface/Makefile.inc.am | 6 ++++-- src/libxl/Makefile.inc.am | 5 ++++- src/network/Makefile.inc.am | 6 ++++-- src/node_device/Makefile.inc.am | 6 ++++-- src/nwfilter/Makefile.inc.am | 6 ++++-- src/secret/Makefile.inc.am | 6 ++++-- src/storage/Makefile.inc.am | 27 ++++++++++++++++++--------- 8 files changed, 43 insertions(+), 21 deletions(-) diff --git a/cfg.mk b/cfg.mk index a7c883830f..3731a2830b 100644 --- a/cfg.mk +++ b/cfg.mk @@ -737,7 +737,7 @@ sc_prohibit_long_lines: halt=3D'Wrap long lines in expected output files' \ $(_sc_search_regexp) @prohibit=3D'.{80}' \ - in_vc_files=3D'Makefile\.am' \ + in_vc_files=3D'Makefile(\.inc)?\.am' \ halt=3D'Wrap long lines in Makefiles' \ $(_sc_search_regexp) =20 diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index a88df0bd11..baa85b4ba9 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -75,10 +75,12 @@ VIRTINTERFACED_UNIT_VARS =3D \ -e 's|[@]sockprefix[@]|virtinterfaced|g' \ $(NULL) =20 -virtinterfaced.service: interface/virtinterfaced.service.in $(top_builddir= )/config.status +virtinterfaced.service: interface/virtinterfaced.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtinterface%.socket: remote/libvirt%.socket.in $(top_builddir)/config.st= atus +virtinterface%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 interface/virtinterfaced.conf: remote/libvirtd.conf.in diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index a2151162e6..18a06a47d1 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -80,9 +80,12 @@ SYSTEMD_UNIT_FILES_IN +=3D \ libxl/virtxend.service.in \ $(NULL) =20 +LIBXL_UNIT_COND=3D"ConditionPathExists=3D/proc/xen/capabilities" +LIBXL_UNIT_CONFLICT=3D"Conflicts=3D$(LIBVIRTD_SOCKET_UNIT_FILES)" + VIRTXEND_UNIT_VARS =3D \ $(COMMON_UNIT_VARS) \ - -e 's|[@]deps[@]|Conflicts=3D$(LIBVIRTD_SOCKET_UNIT_FILES)\nConditionPath= Exists=3D/proc/xen/capabilities|g' \ + -e 's|[@]deps[@]|$(LIBXL_UNIT_CONFLICT)\n$(LIBXL_UNIT_COND)|g' \ -e 's|[@]name[@]|Libvirt libxl|g' \ -e 's|[@]service[@]|virtxend|g' \ -e 's|[@]sockprefix[@]|virtxend|g' \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 9f20dad7b3..17467a65ad 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -82,10 +82,12 @@ VIRTNETWORKD_UNIT_VARS =3D \ -e 's|[@]sockprefix[@]|virtnetworkd|g' \ $(NULL) =20 -virtnetworkd.service: network/virtnetworkd.service.in $(top_builddir)/conf= ig.status +virtnetworkd.service: network/virtnetworkd.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtnetwork%.socket: remote/libvirt%.socket.in $(top_builddir)/config.stat= us +virtnetwork%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 network/virtnetworkd.conf: remote/libvirtd.conf.in diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 5a6525d843..eac7f92e88 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -98,10 +98,12 @@ VIRTNODEDEVD_UNIT_VARS =3D \ -e 's|[@]sockprefix[@]|virtnodedevd|g' \ $(NULL) =20 -virtnodedevd.service: node_device/virtnodedevd.service.in $(top_builddir)/= config.status +virtnodedevd.service: node_device/virtnodedevd.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtnodedev%.socket: remote/libvirt%.socket.in $(top_builddir)/config.stat= us +virtnodedev%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 node_device/virtnodedevd.conf: remote/libvirtd.conf.in diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 7693634e29..6acb45705c 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -83,10 +83,12 @@ VIRTNWFILTERD_UNIT_VARS =3D \ -e 's|[@]sockprefix[@]|virtnwfilterd|g' \ $(NULL) =20 -virtnwfilterd.service: nwfilter/virtnwfilterd.service.in $(top_builddir)/c= onfig.status +virtnwfilterd.service: nwfilter/virtnwfilterd.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtnwfilter%.socket: remote/libvirt%.socket.in $(top_builddir)/config.sta= tus +virtnwfilter%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 37f816406e..76bc67418c 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -71,10 +71,12 @@ VIRTSECRETD_UNIT_VARS =3D \ -e 's|[@]sockprefix[@]|virtsecretd|g' \ $(NULL) =20 -virtsecretd.service: secret/virtsecretd.service.in $(top_builddir)/config.= status +virtsecretd.service: secret/virtsecretd.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtsecret%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status +virtsecret%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 secret/virtsecretd.conf: remote/libvirtd.conf.in diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index fd0d57d2b6..4dccb14ac1 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -175,10 +175,12 @@ VIRTSTORAGED_UNIT_VARS =3D \ -e 's|[@]sockprefix[@]|virtstoraged|g' \ $(NULL) =20 -virtstoraged.service: storage/virtstoraged.service.in $(top_builddir)/conf= ig.status +virtstoraged.service: storage/virtstoraged.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtstorage%.socket: remote/libvirt%.socket.in $(top_builddir)/config.stat= us +virtstorage%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 storage/virtstoraged.conf: remote/libvirtd.conf.in @@ -264,7 +266,8 @@ libvirt_storage_backend_iscsi_la_LIBADD =3D \ endif WITH_STORAGE_ISCSI =20 if WITH_STORAGE_ISCSI_DIRECT -libvirt_storage_backend_iscsi_direct_la_SOURCES =3D $(STORAGE_DRIVER_ISCSI= _DIRECT_SOURCES) +libvirt_storage_backend_iscsi_direct_la_SOURCES =3D \ + $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) libvirt_storage_backend_iscsi_direct_la_CFLAGS =3D \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ @@ -346,13 +349,15 @@ libvirt_storage_backend_rbd_la_LDFLAGS =3D $(AM_LDFLA= GS_MOD) endif WITH_STORAGE_RBD =20 if WITH_STORAGE_SHEEPDOG -libvirt_storage_backend_sheepdog_la_SOURCES =3D $(STORAGE_DRIVER_SHEEPDOG_= SOURCES) +libvirt_storage_backend_sheepdog_la_SOURCES =3D \ + $(STORAGE_DRIVER_SHEEPDOG_SOURCES) libvirt_storage_backend_sheepdog_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) =20 -libvirt_storage_backend_sheepdog_priv_la_SOURCES =3D $(STORAGE_DRIVER_SHEE= PDOG_SOURCES) +libvirt_storage_backend_sheepdog_priv_la_SOURCES =3D \ + $(STORAGE_DRIVER_SHEEPDOG_SOURCES) libvirt_storage_backend_sheepdog_priv_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ @@ -368,7 +373,8 @@ libvirt_storage_backend_sheepdog_la_LIBADD =3D \ endif WITH_STORAGE_SHEEPDOG =20 if WITH_STORAGE_GLUSTER -libvirt_storage_backend_gluster_la_SOURCES =3D $(STORAGE_DRIVER_GLUSTER_SO= URCES) +libvirt_storage_backend_gluster_la_SOURCES =3D \ + $(STORAGE_DRIVER_GLUSTER_SOURCES) libvirt_storage_backend_gluster_la_LIBADD =3D \ libvirt.la \ $(GLUSTERFS_LIBS) \ @@ -384,7 +390,8 @@ storagebackend_LTLIBRARIES +=3D libvirt_storage_backend= _gluster.la libvirt_storage_backend_gluster_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 =20 -libvirt_storage_file_gluster_la_SOURCES =3D $(STORAGE_FILE_GLUSTER_SOURCES) +libvirt_storage_file_gluster_la_SOURCES =3D \ + $(STORAGE_FILE_GLUSTER_SOURCES) libvirt_storage_file_gluster_la_LIBADD =3D \ libvirt.la \ $(GLUSTERFS_LIBS) \ @@ -401,7 +408,8 @@ libvirt_storage_file_gluster_la_LDFLAGS =3D $(AM_LDFLAG= S_MOD) endif WITH_STORAGE_GLUSTER =20 if WITH_STORAGE_ZFS -libvirt_storage_backend_zfs_la_SOURCES =3D $(STORAGE_DRIVER_ZFS_SOURCES) +libvirt_storage_backend_zfs_la_SOURCES =3D \ + $(STORAGE_DRIVER_ZFS_SOURCES) libvirt_storage_backend_zfs_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ @@ -416,7 +424,8 @@ libvirt_storage_backend_zfs_la_LIBADD =3D \ endif WITH_STORAGE_ZFS =20 if WITH_STORAGE_VSTORAGE -libvirt_storage_backend_vstorage_la_SOURCES =3D $(STORAGE_DRIVER_VSTORAGE_= SOURCES) +libvirt_storage_backend_vstorage_la_SOURCES =3D \ + $(STORAGE_DRIVER_VSTORAGE_SOURCES) libvirt_storage_backend_vstorage_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list