WIP: Start of work on daemon

.gitignore

@@ -47,3 +47,10 @@ rpm-ostree-*.tar.xz
 rpm-ostree-*.rpm
 
 rpm-ostree.1
+
+rpm-ostreed
+rpm-ostreed.1
+org.projectatomic.rpmostree1.service
+rpm-ostreed.service
+rpm-ostreed-generated.c
+rpm-ostreed-generated.h

Makefile-daemon.am

@@ -0,0 +1,105 @@
+libexec_PROGRAMS += rpm-ostreed
+
+dbus_built_sources = rpm-ostreed-generated.h rpm-ostreed-generated.c
+
+rpm-ostreed-generated.h: rpm-ostreed-generated.c
+rpm-ostreed-generated.c: Makefile.am $(top_srcdir)/src/daemon/org.projectatomic.rpmostree1.xml
+	$(AM_V_GEN) gdbus-codegen \
+		--interface-prefix org.projectatomic.rpmostree1 \
+		--c-namespace RPMOSTree \
+		--c-generate-object-manager \
+		--generate-c-code rpm-ostreed-generated \
+		--generate-docbook rpm-ostreed-generated \
+		$(top_srcdir)/src/daemon/org.projectatomic.rpmostree1.xml \
+		$(NULL)
+BUILT_SOURCES += $(dbus_built_sources)
+CLEANFILES += rpm-ostreed-generated*
+
+noinst_LTLIBRARIES += librpmostreed.la
+nodist_librpmostreed_la_SOURCES = $(dbus_built_sources)
+
+librpmostreed_la_SOURCES = \
+	src/daemon/rpmostreed-types.h \
+	src/daemon/rpmostreed-daemon.h \
+	src/daemon/rpmostreed-daemon.c \
+	src/daemon/rpmostreed-utils.h \
+	src/daemon/rpmostreed-utils.c \
+	src/daemon/rpmostreed-sysroot.h \
+	src/daemon/rpmostreed-sysroot.c \
+	src/daemon/rpmostreed-errors.h \
+	src/daemon/rpmostreed-errors.c \
+	src/daemon/rpmostreed-deployment-utils.h \
+	src/daemon/rpmostreed-deployment-utils.c \
+	src/daemon/rpmostreed-transaction.h \
+	src/daemon/rpmostreed-transaction.c \
+	src/daemon/rpmostreed-transaction-monitor.h \
+	src/daemon/rpmostreed-transaction-monitor.c \
+	src/daemon/rpmostreed-transaction-types.h \
+	src/daemon/rpmostreed-transaction-types.c \
+	src/daemon/rpmostree-package-variants.h \
+	src/daemon/rpmostree-package-variants.c \
+	src/daemon/rpmostreed-os.h \
+	src/daemon/rpmostreed-os.c \
+	$(NULL)
+
+librpmostreed_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(PKGDEP_RPMOSTREE_CFLAGS) \
+	-DG_LOG_DOMAIN=\"rpm-ostreed\" \
+	-I$(srcdir)/src/daemon \
+	-I$(srcdir)/src/lib \
+	-I$(libglnx_srcpath) \
+	$(NULL)
+
+librpmostreed_la_LIBADD = \
+	$(AM_LDFLAGS) \
+	$(PKGDEP_RPMOSTREE_LIBS) \
+	librpmostreepriv.la \
+	librpmostree-1.la \
+	$(CAP_LIBS)
+	$(NULL)
+
+rpm_ostreed_SOURCES = \
+	src/daemon/main.c \
+	$(NULL)
+
+rpm_ostreed_CFLAGS = \
+	$(AM_CFLAGS) \
+	-DPKGLIBDIR=\"$(pkglibdir)\" \
+	$(PKGDEP_RPMOSTREE_CFLAGS) \
+	-I$(srcdir)/src/daemon \
+	-I$(srcdir)/libglnx \
+	-DG_LOG_DOMAIN=\"rpm-ostreed\" \
+	$(NULL)
+
+rpm_ostreed_LDADD = \
+	librpmostreed.la \
+	$(AM_LDFLAGS) \
+	$(PKGDEP_RPMOSTREE_LIBS) \
+	$(NULL)
+
+dbusconf_DATA = $(srcdir)/src/daemon/org.projectatomic.rpmostree1.conf
+dbusconfdir = ${sysconfdir}/dbus-1/system.d
+
+systemdunit_in_files = $(srcdir)/src/daemon/rpm-ostreed.service.in
+systemdunit_DATA     = $(systemdunit_in_files:.service.in=.service)
+systemdunitdir       = $(prefix)/lib/systemd/system/
+$(systemdunit_DATA):
+	$(SED_SUBST) [email protected] > $@
+
+service_in_files = $(srcdir)/src/daemon/org.projectatomic.rpmostree1.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+servicedir       = $(dbusservicedir)
+$(service_DATA):
+	$(SED_SUBST) [email protected] > $@
+
+EXTRA_DIST += \
+	$(dbusservice_DATA) \
+	$(service_in_files) \
+	$(systemdunit_in_files) \
+	$(NULL)
+
+CLEANFILES += \
+	$(service_DATA) \
+	$(systemdunit_DATA) \
+	$(NULL)

Makefile-rpm-ostree.am

@@ -18,6 +18,8 @@
 bin_PROGRAMS += rpm-ostree
 
 rpm_ostree_SOURCES = src/app/main.c \
+	rpm-ostreed-generated.h \
+	rpm-ostreed-generated.c \
 	src/app/rpmostree-builtins.h \
 	src/app/rpmostree-db-builtins.h \
 	src/app/rpmostree-compose-builtins.h \
@@ -29,6 +31,8 @@ rpm_ostree_SOURCES = src/app/main.c \
 	src/app/rpmostree-db-builtin-diff.c \
 	src/app/rpmostree-db-builtin-list.c \
 	src/app/rpmostree-db-builtin-version.c \
+	src/app/rpmostree-dbus-helpers.c \
+	src/app/rpmostree-dbus-helpers.h \
 	src/app/rpmostree-libbuiltin.c \
 	src/app/rpmostree-libbuiltin.h \
 	$(NULL)

Makefile-tests.am

@@ -1,6 +1,7 @@
 include $(top_srcdir)/buildutil/glib-tap.mk
 
 CLEANFILES += \
+	tests/setup-session.sh \
 	tests/compose/yum/empty tests/compose/yum/repodata/repomd.xml \
 	tests/compose/test-repo.repo \
 	tests/compose/yum/repodata/*.bz2 \
@@ -33,6 +34,16 @@ installed_test_data = tests/libtest.sh \
 	tests/compose/test-repo.repo.in \
 	$(NULL)
 
+tests/setup-session.sh: tests/setup-session.sh.in
+	sed \
+          -e "s|[@]installed_testdir[@]|$(installed_testdir)|" \
+	  -e "s|[@]LIBEXECDIR[@]|$(libexecdir)|" \
+	  < $< > [email protected] && mv [email protected] $@
+
+test_installed_extra_scripts = \
+	tests/setup-session.sh \
+	$(NULL)
+
 nobase_installed_test_DATA += $(shell find tests/compose/yum/ -type f) \
 	$(NULL)
 
@@ -46,6 +57,9 @@ test_programs = \
 	tests/jsonutil			\
 	$(NULL)
 
+installed_test_PROGRAMS += dbus-run-session
+dbus_run_session_SOURCES = tests/dbus-run-session.c
+
 check-local:
 	@echo "  *** NOTE ***"
 	@echo "  *** NOTE ***"

Makefile.am

@@ -35,9 +35,13 @@ AM_CFLAGS += $(WARN_CFLAGS)
 
 EXTRA_DIST += autogen.sh COPYING
 
+SED_SUBST = sed \
+        -e 's,[@]libexecdir[@],$(libexecdir),g' \
+        $(NULL)
+
 libglnx_srcpath := $(srcdir)/libglnx
 libglnx_cflags := $(PKGDEP_GIO_UNIX_CFLAGS) -I$(libglnx_srcpath) -fvisibility=hidden
-libglnx_ldflags := 
+libglnx_ldflags :=
 libglnx_libs := $(PKGDEP_GIO_UNIX_LIBS)
 
 include $(INTROSPECTION_MAKEFILE)
@@ -48,6 +52,7 @@ include libglnx/Makefile-libglnx.am
 noinst_LTLIBRARIES += libglnx.la
 include Makefile-libpriv.am
 include Makefile-lib.am
+include Makefile-daemon.am
 include Makefile-rpm-ostree.am
 include Makefile-tests.am
 include Makefile-man.am

buildutil/glib-tap.mk

@@ -117,7 +117,7 @@ installed_test_meta_DATA = $(installed_testcases:=.test)
 %.test: %$(EXEEXT) Makefile
 	$(AM_V_GEN) (echo '[Test]' > [email protected]; \
 	echo 'Type=session' >> [email protected]; \
-	echo 'Exec=$(installed_testdir)/$(notdir $<)' >> [email protected]; \
+	echo 'Exec=$(installed_testdir)/setup-session.sh $(installed_testdir)/$(notdir $<)' >> [email protected]; \
 	mv [email protected] $@)
 
 CLEANFILES += $(installed_test_meta_DATA)

configure.ac

@@ -13,6 +13,19 @@ AC_SYS_LARGEFILE
 AC_PROG_CC
 AM_PROG_CC_C_O
 
+# dbus system dir
+AC_MSG_CHECKING(for dbus system services directory)
+if test "$enable_prefix_only" = "yes"; then
+  dbusservicedir='${datadir}/dbus-1/system-services'
+else
+  dbusservicedir='${datadir}/dbus-1/system-services'
+  if test "$dbusservicedir" = ""; then
+    AC_MSG_ERROR(Couldn't find dbus services directory. Try installing dbus-devel)
+  fi
+fi
+AC_SUBST([dbusservicedir], [$dbusservicedir])
+AC_MSG_RESULT(dbusservicedir)
+
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
   WARN_CFLAGS="-Wall -Wstrict-prototypes -Werror=missing-prototypes \

doc/Makefile.am

@@ -96,8 +96,16 @@ GTKDOC_LIBS=
 rpmostree-sections.txt: $(srcdir)/rpmostree-sections.txt
 	cp $< $@
 
+$(DOC_MAIN_SGML_FILE): $(DOC_MAIN_SGML_FILE).in
+	sed -e 's|\@SRCDIR\@|$(top_srcdir)|g' $< > $(@)
+
 version.xml:
 	echo -n $(VERSION) > "$@"
 
+BUILT_SOURCES = $(DOC_MAIN_SGML_FILE)
+
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
+
+CLEANFILES += $(BUILT_SOURCES)
+EXTRA_DIST += $(DOC_MAIN_SGML_FILE).in

doc/rpmostree-docs.xml → doc/rpmostree-docs.xml.in

@@ -21,4 +21,11 @@
 		</index>
 
 	</chapter>
+
+	<chapter>
+		<title>D-Bus Interfaces</title>
+		<xi:include href="@SRCDIR@/rpm-ostreed-generated-org.projectatomic.rpmostree1.Sysroot.xml"/>
+		<xi:include href="@SRCDIR@/rpm-ostreed-generated-org.projectatomic.rpmostree1.OS.xml"/>
+		<xi:include href="@SRCDIR@/rpm-ostreed-generated-org.projectatomic.rpmostree1.Transaction.xml"/>
+	</chapter>
 </book>

packaging/rpm-ostree.spec.in

@@ -52,6 +52,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 %{_mandir}/man1/*
 %{_libdir}/*.so.1*
 %{_libdir}/girepository-1.0/*.typelib
+%{_libexecdir}/rpm-ostreed
+%{_datadir}/dbus-1/system-services/org.projectatomic.rpmostree1.service
+%{_prefix}/lib/systemd/system/rpm-ostreed.service
+%{_sysconfdir}/dbus-1/system.d/org.projectatomic.rpmostree1.conf
 
 %files devel
 %{_libdir}/lib*.so