From nobody Sun Feb 8 10:29:53 2026 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1502205985520113.96187156260123; Tue, 8 Aug 2017 08:26:25 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 988BD4E33A; Tue, 8 Aug 2017 15:26:23 +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 4C97195A41; Tue, 8 Aug 2017 15: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 908D23880; Tue, 8 Aug 2017 15:26:22 +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 v78FQ9D7013160 for ; Tue, 8 Aug 2017 11:26:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0CACF60A9D; Tue, 8 Aug 2017 15:26:09 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64ECD77707 for ; Tue, 8 Aug 2017 15:26:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 988BD4E33A Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 8 Aug 2017 17:25:56 +0200 Message-Id: <2980a0c159ea083d7777e5d1bc90cef59c3ef0c9.1502205855.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 5/7] maint: move service file into data 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: , MIME-Version: 1.0 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 08 Aug 2017 15:26:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- .gitignore | 3 ++- Makefile.am | 2 +- configure.ac | 2 ++ data/Makefile.am | 15 +++++++++++++++ data/session/org.libvirt.service.in | 3 +++ src/Makefile.am | 17 ----------------- src/org.libvirt.service.in | 3 --- 7 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 data/Makefile.am create mode 100644 data/session/org.libvirt.service.in delete mode 100644 src/org.libvirt.service.in diff --git a/.gitignore b/.gitignore index 72f3595..f223068 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ vgcore.* /libvirt-dbus.spec /stamp-h1 =20 +/data/session/org.libvirt.service + /src/.deps/ /src/libvirt-dbus -/src/org.libvirt.service diff --git a/Makefile.am b/Makefile.am index 8ba2137..065334f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ =20 -SUBDIRS =3D src test +SUBDIRS =3D data src test =20 EXTRA_DIST =3D \ $(PACKAGE).spec \ diff --git a/configure.ac b/configure.ac index 8de0d35..158c5e9 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,7 @@ AC_SUBST([LIBVIRT_DBUS_VERSION_INFO]) AC_SUBST([LIBVIRT_DBUS_VERSION_NUMBER]) =20 AC_PROG_CC +AC_PROG_MKDIR_P AM_PROG_CC_C_O =20 PKG_CHECK_MODULES(LIBVIRT, libvirt >=3D $LIBVIRT_REQUIRED) @@ -45,6 +46,7 @@ fi AC_SUBST(DBUS_SERVICES_DIR) =20 AC_OUTPUT(Makefile + data/Makefile src/Makefile test/Makefile libvirt-dbus.spec) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..b0b30b9 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,15 @@ +service_in_files =3D \ + session/org.libvirt.service.in +servicedir =3D $(DBUS_SERVICES_DIR) +service_DATA =3D $(service_in_files:.service.in=3D.service) + +EXTRA_DIST =3D \ + $(service_in_files) + +CLEANFILES =3D \ + $(service_DATA) + +session/org.libvirt.service: session/org.libvirt.service.in + $(AM_V_GEN)$(MKDIR_P) session && \ + sed -e 's|[@]bindir[@]|$(bindir)|g' < $< > $@-t && \ + mv $@-t $@ diff --git a/data/session/org.libvirt.service.in b/data/session/org.libvirt= .service.in new file mode 100644 index 0000000..a8cb6a9 --- /dev/null +++ b/data/session/org.libvirt.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=3Dorg.libvirt +Exec=3D@bindir@/libvirt-dbus --session diff --git a/src/Makefile.am b/src/Makefile.am index 30e7a35..917c46d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,20 +27,3 @@ libvirt_dbus_LDFLAGS =3D \ libvirt_dbus_LDADD =3D \ $(SYSTEMD_LIBS) \ $(LIBVIRT_LIBS) - -service_in_files =3D \ - org.libvirt.service.in -servicedir =3D $(DBUS_SERVICES_DIR) -service_DATA =3D $(service_in_files:.service.in=3D.service) - -EXTRA_DIST +=3D \ - $(service_in_files) - -CLEANFILES +=3D \ - $(service_DATA) - -org.libvirt.service: org.libvirt.service.in - $(AM_V_GEN)sed \ - -e 's|[@]bindir[@]|$(bindir)|g' \ - < $< > $@-t && \ - mv $@-t $@ diff --git a/src/org.libvirt.service.in b/src/org.libvirt.service.in deleted file mode 100644 index a42539e..0000000 --- a/src/org.libvirt.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=3Dorg.libvirt -Exec=3D@bindir@/libvirt-dbus --=20 2.13.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list