keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
83fb40593f
rpm-ostree/Makefile-daemon.am

129 lines
4.4 KiB
Plaintext
Raw Normal View History

daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
dbus_built_sources = rpm-ostreed-generated.h rpm-ostreed-generated.c
build: Fix Makefile dependency for gdbus-codegen Also add a comment about enabling autoptr in the future. Closes: #705 Approved by: jlebon
2017-03-25 00:57:21 +03:00
# TODO: Add --c-generate-autocleanup=all once we depend on GLib 2.50+
# https://github.com/projectatomic/rpm-ostree/pull/705
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
rpm-ostreed-generated.h: rpm-ostreed-generated.c
build: Fix Makefile dependency for gdbus-codegen Also add a comment about enabling autoptr in the future. Closes: #705 Approved by: jlebon
2017-03-25 00:57:21 +03:00
rpm-ostreed-generated.c: Makefile $(top_srcdir)/src/daemon/org.projectatomic.rpmostree1.xml
Makefile-daemon.am: work around gdbus-codegen path logic I just rebased my pet container to F27, and this was the only hiccup when trying to build rpm-ostree. Basically, gdbus-codegen is sensitive to how it's called when trying to find its own Python modules. Calling it with the explicit `/usr` prefix works around that. This was fixed upstream in [1], but hasn't made its way down the metaphorical stream yet. See [2] for more information. [1] https://github.com/GNOME/glib/commit/b9f2ea423526735f7fe7371fb1339eae91a618c2 [2] https://bugzilla.redhat.com/show_bug.cgi?id=1485853 Closes: #1153 Approved by: cgwalters
2017-12-15 02:06:08 +03:00
$(AM_V_GEN) /usr/bin/gdbus-codegen \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
--interface-prefix org.projectatomic.rpmostree1 \
--c-namespace RPMOSTree \
--c-generate-object-manager \
--generate-c-code rpm-ostreed-generated \
docs: Add generated D-Bus interfaces
2015-07-15 23:39:25 +03:00
--generate-docbook rpm-ostreed-generated \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(top_srcdir)/src/daemon/org.projectatomic.rpmostree1.xml \
$(NULL)
BUILT_SOURCES += $(dbus_built_sources)
build: Use git.mk, make git status clean Having a clean `git status` is really important for not missing files one wants to `git add`.
2016-03-10 22:36:44 +03:00
CLEANFILES += rpm-ostreed-generated-org.projectatomic.rpmostree1.OS.xml \
build: Add OSExperimental to .gitignore Tempting to have a check that `git status` is clean after a build in CI. Closes: #705 Approved by: jlebon
2017-03-25 17:21:33 +03:00
rpm-ostreed-generated-org.projectatomic.rpmostree1.OSExperimental.xml \
build: Use git.mk, make git status clean Having a clean `git status` is really important for not missing files one wants to `git add`.
2016-03-10 22:36:44 +03:00
rpm-ostreed-generated-org.projectatomic.rpmostree1.Sysroot.xml \
rpm-ostreed-generated-org.projectatomic.rpmostree1.Transaction.xml \
$(NULL)
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
noinst_LTLIBRARIES += librpmostreed.la
nodist_librpmostreed_la_SOURCES = $(dbus_built_sources)
librpmostreed_la_SOURCES = \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
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 \
daemon: Introduce a "sysroot core" file Right now, the `rpm-ostree cleanup` logic calls into a "public static" method of `RpmOstreeSysrootUpgrader`. That's because today, a lot of the high level "core server side" logic lived in that class. However, it's only for upgrades (well, really "generating pending deployments"). As I'm working on "livefs" which is really something different, I find it needs to interact with some of `SysrootUpgrader`'s logic. Let's introduce a "sysroot core" which is just a set of static functions taking an `OstreeSysroot*`, and then all 3 of cleanup, (upgrade|deploy) and livefs can use these. Closes: #708 Approved by: jlebon
2017-03-27 21:12:05 +03:00
src/daemon/rpmostree-sysroot-core.h \
src/daemon/rpmostree-sysroot-core.c \
pkg-add: New builtin to layer additional packages This builds upon the earlier prototype in https://github.com/cgwalters/atomic-pkglayer The `.origin` file says for a replicated installation: [origin] refspec=local:rhel-atomic-host/7/x86_64/standard If you then run `rpm-ostree pkg-add strace`, it will result in a new tree with: [origin] baserefspec=local:rhel-atomic-host/7/x86_64/standard [packages] requested=strace; Work still remaining here is to teach `rpm-ostree status` and `rpm-ostree upgrade` about this. Closes: #289 Approved by: cgwalters
2015-02-11 21:06:43 +03:00
src/daemon/rpmostree-sysroot-upgrader.h \
src/daemon/rpmostree-sysroot-upgrader.c \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
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 \
Introduce `ex livefs` There are a few different use cases here. First, for layering new packages, there's no good reason for us to force a reboot. Second, we want some support for cherry-picking security updates and allowing admins to restart services. Finally, at some point we should offer support for entirely replacing the running tree if that's what the user wants. Until now we've been very conservative, but there's a spectrum here. In particular, this patch changes things so we push a rollback before we start doing anything live. I think in practice, many use cases would be totally fine with doing most changes live, and falling back to the rollback if something went wrong. This initial code drop *only* supports live layering of new packages. However, a lot of the base infrastructure is laid for future work. For now, this will be classified as an experimental feature, hence `ex livefs`. Part of: https://github.com/projectatomic/rpm-ostree/issues/639 Closes: #652 Approved by: jlebon
2017-03-01 01:16:48 +03:00
src/daemon/rpmostreed-transaction-livefs.c \
daemon: Implement package diff methods
2015-06-10 05:27:39 +03:00
src/daemon/rpmostree-package-variants.h \
src/daemon/rpmostree-package-variants.c \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
src/daemon/rpmostreed-os.h \
src/daemon/rpmostreed-os.c \
daemon: Add a separate OSExperimental interface Just like `rpm-ostree ex`, for things like `ex livefs` that have DBus interfaces, we should segregate these off so that people know they're unstable. And conversely that they can test for the presence of the method on the main interface for stability. I initially tried having the same `RpmostreeOS` object implement both but couldn't work out how to do that; see https://mail.gnome.org/archives/gtk-app-devel-list/2017-March/msg00161.html Closes: #701 Approved by: jlebon
2017-03-23 04:44:09 +03:00
src/daemon/rpmostreed-os-experimental.h \
src/daemon/rpmostreed-os-experimental.c \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(NULL)
librpmostreed_la_CFLAGS = \
$(AM_CFLAGS) \
$(PKGDEP_RPMOSTREE_CFLAGS) \
-DG_LOG_DOMAIN=\"rpm-ostreed\" \
Introduce `ex livefs` There are a few different use cases here. First, for layering new packages, there's no good reason for us to force a reboot. Second, we want some support for cherry-picking security updates and allowing admins to restart services. Finally, at some point we should offer support for entirely replacing the running tree if that's what the user wants. Until now we've been very conservative, but there's a spectrum here. In particular, this patch changes things so we push a rollback before we start doing anything live. I think in practice, many use cases would be totally fine with doing most changes live, and falling back to the rollback if something went wrong. This initial code drop *only* supports live layering of new packages. However, a lot of the base infrastructure is laid for future work. For now, this will be classified as an experimental feature, hence `ex livefs`. Part of: https://github.com/projectatomic/rpm-ostree/issues/639 Closes: #652 Approved by: jlebon
2017-03-01 01:16:48 +03:00
-D_RPMOSTREE_EXTERN= \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
-I$(srcdir)/src/daemon \
-I$(srcdir)/src/lib \
daemon: add TaskBegin, TaskEnd, and PercentProgress Closes: #260 Approved by: cgwalters
2016-05-10 19:17:26 +03:00
-I$(srcdir)/src/libpriv \
daemon: Catch systemd journal messages by redirecting stdout libostree logs messages to systemd's journal and also to stdout. Redirect our own stdout back to ourselves so we can capture those messages and pass them on to clients. Admittedly hokey but avoids hacking libostree directly (for now).
2015-08-10 17:47:59 +03:00
-I$(libglnx_srcpath) \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(NULL)
librpmostreed_la_LIBADD = \
$(PKGDEP_RPMOSTREE_LIBS) \
daemon: Catch systemd journal messages by redirecting stdout libostree logs messages to systemd's journal and also to stdout. Redirect our own stdout back to ourselves so we can capture those messages and pass them on to clients. Admittedly hokey but avoids hacking libostree directly (for now).
2015-08-10 17:47:59 +03:00
librpmostreepriv.la \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
librpmostree-1.la \
$(CAP_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/
tests: Disable ASAN leak checks Right now we're far from leak free, and I want to use ASAN as a sanity checker, not a leak checker. Closes: #576 Approved by: jlebon
2017-01-17 21:29:48 +03:00
if BUILDOPT_ASAN
daemon_asan_options = -e s,@SYSTEMD_ENVIRON\@,Environment=ASAN_OPTIONS=detect_leaks=false,
else
daemon_asan_options = -e /@SYSTEMD_ENVIRON\@/d
endif
$(systemdunit_DATA): Makefile
$(SED_SUBST) $(daemon_asan_options) $@.in > $@
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
Merge daemon binary into main binary The actual problem I am trying to fix with this is fallout from the introduction of `/usr/libexec/rpm-ostreed`, which required a SELinux policy change. Specifically for CentOS, the base policy is rev'd slowly. My hope was that by merging the daemon code back into `/usr/bin/rpm-ostree` which is labeled `install_exec_t`, starting via systemd would do the right thing. It turns out that doesn't happen. Now later, I'm picking this patch back up because I want to do multprocessing in the daemon (and in the core), and it makes sense to share code between them, because multiprocessing will need to go through a re-exec path. Another benefit is we avoid duplicated text (libglnx, internal helpers) between the two binaries. Closes: #292 Approved by: jlebon
2016-05-27 21:46:46 +03:00
# We keep this stub script around to have SELinux labeling work,
# plus some backwards compatibility.
libexec_SCRIPTS = rpm-ostreed
rpm-ostreed: $(srcdir)/src/daemon/rpm-ostreed-stub.sh.in Makefile
$(SED_SUBST) $< > $@.tmp && mv $@.tmp $@
Add infrastructure for alternative name (currently nts) See https://github.com/projectatomic/rpm-ostree/issues/405 This patch adds an (off by default) `--enable-new-name` build option which currently defaults to `nts`. This is purely additive, and the intention is that we'll support the rpm-ostree name in perpetuity most likely. At the moment, we add a new name for: - /usr/bin/$name - The systemd unit file But we notably *don't* attempt to add a new name to the DBus API, as it'd be a lot more invasive of a patch, and less payoff (it's mostly just programs/scripts that interact with the DBus). Closes: #497 Approved by: jlebon
2016-10-19 21:24:40 +03:00
install-daemon-altname-hook:
mv $(DESTDIR)$(systemdunitdir)/rpm-ostreed.service $(DESTDIR)$(systemdunitdir)/$(primaryname)d.service
ln -sf $(primaryname)d.service $(DESTDIR)$(systemdunitdir)/rpm-ostreed.service
if BUILDOPT_NEW_NAME
INSTALL_DATA_HOOKS += install-daemon-altname-hook
endif
# We don't yet rename the DBus related items
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
service_in_files = $(srcdir)/src/daemon/org.projectatomic.rpmostree1.service.in
service_DATA = $(service_in_files:.service.in=.service)
servicedir = $(dbusservicedir)
Merge daemon binary into main binary The actual problem I am trying to fix with this is fallout from the introduction of `/usr/libexec/rpm-ostreed`, which required a SELinux policy change. Specifically for CentOS, the base policy is rev'd slowly. My hope was that by merging the daemon code back into `/usr/bin/rpm-ostree` which is labeled `install_exec_t`, starting via systemd would do the right thing. It turns out that doesn't happen. Now later, I'm picking this patch back up because I want to do multprocessing in the daemon (and in the core), and it makes sense to share code between them, because multiprocessing will need to go through a re-exec path. Another benefit is we avoid duplicated text (libglnx, internal helpers) between the two binaries. Closes: #292 Approved by: jlebon
2016-05-27 21:46:46 +03:00
%.service: %.service.in Makefile
$(SED_SUBST) $@.in > $@.tmp && mv $@.tmp $@
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
Add polkit support This allows non-root users access to the rpm-ostree daemon, which is a pre-requirement for gnome-software rpm-ostree support. Closes: #745 Closes: #825 Approved by: cgwalters
2017-06-09 13:52:01 +03:00
polkit_policy_DATA = $(srcdir)/src/daemon/org.projectatomic.rpmostree1.policy
polkit_policydir = $(datadir)/polkit-1/actions
daemon: Install dbus introspection files This makes it possible to use the dbus introspection files in other apps without having to bundle them. Closes: #841 Approved by: cgwalters
2017-06-23 11:35:46 +03:00
dbus_introspection_DATA = src/daemon/org.projectatomic.rpmostree1.xml
dbus_introspectiondir = $(datadir)/dbus-1/interfaces
daemon/config: add new rpm-ostreed.conf Making this a separate commit, since it's a first for rpm-ostree. We now have a conf file complete with man page! No options yet though. Interestingly, there was a function called `rpmostreed_reload_config` which was declared but never defined. Didn't look too much into that. We make sure that the config is part of the things we reload when users call `rpm-ostree reload`. Closes: #1204 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
sysconf_DATA += $(srcdir)/src/daemon/rpm-ostreed.conf
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
EXTRA_DIST += \
daemon: Install dbus introspection files This makes it possible to use the dbus introspection files in other apps without having to bundle them. Closes: #841 Approved by: cgwalters
2017-06-23 11:35:46 +03:00
$(dbus_introspection_DATA) \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(dbusservice_DATA) \
Add polkit support This allows non-root users access to the rpm-ostree daemon, which is a pre-requirement for gnome-software rpm-ostree support. Closes: #745 Closes: #825 Approved by: cgwalters
2017-06-09 13:52:01 +03:00
$(polkit_policy_DATA) \
daemon/config: add new rpm-ostreed.conf Making this a separate commit, since it's a first for rpm-ostree. We now have a conf file complete with man page! No options yet though. Interestingly, there was a function called `rpmostreed_reload_config` which was declared but never defined. Didn't look too much into that. We make sure that the config is part of the things we reload when users call `rpm-ostree reload`. Closes: #1204 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
$(sysconf_DATA) \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(service_in_files) \
$(systemdunit_in_files) \
$(NULL)
CLEANFILES += \
$(service_DATA) \
$(systemdunit_DATA) \
$(NULL)
Reference in New Issue Copy Permalink