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

124 lines
4.4 KiB
Plaintext
Raw Normal View History

buildsys: Compile daemon code directly with binary A long time ago we de-duplicated the daemon and binary into a single executable, but left the daemon code building as an internal static library. Let's take the next step and compile the sources directly as part of the executable build. For example, we can then de-duplicate the `CFLAGS/CXXFLAGS`. And in the future this will help us turn on LTO.
2020-12-17 01:17:49 +03:00
# This file used to declare a separate libtool static library.
# Now that the daemon and binary are the same thing, we have
# Makefile-rpm-ostree.am reuse these variables.
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
daemon: Don't use absolute path for gdbus-codegen This breaks builds on platforms that don't have `gdbus-codegen` installed at that path. This reverts #1153, which was needed at the time, but things appear to be fixed now. Closes: #1383 Approved by: cgwalters
2018-06-04 16:11:24 +03:00
$(AM_V_GEN) 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
buildsys: Compile daemon code directly with binary A long time ago we de-duplicated the daemon and binary into a single executable, but left the daemon code building as an internal static library. Let's take the next step and compile the sources directly as part of the executable build. For example, we can then de-duplicate the `CFLAGS/CXXFLAGS`. And in the future this will help us turn on LTO.
2020-12-17 01:17:49 +03:00
librpmostreed_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 \
Port rpmostreed-daemon to C++ Prep for using https://cxx.rs/
2020-12-21 19:08:51 +03:00
src/daemon/rpmostreed-daemon.cxx \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
src/daemon/rpmostreed-utils.h \
Port rpmostreed-utils to C++ Prep for using https://cxx.rs/
2020-12-21 19:08:51 +03:00
src/daemon/rpmostreed-utils.cxx \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
src/daemon/rpmostreed-sysroot.h \
Port rpmostreed-sysroot to C++ Prep for using https://cxx.rs/
2020-12-21 19:08:51 +03:00
src/daemon/rpmostreed-sysroot.cxx \
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 \
Port rpmostree-sysroot-core to C++ Prep for using https://cxx.rs
2020-12-11 23:14:56 +03:00
src/daemon/rpmostree-sysroot-core.cxx \
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 \
Port rpmostree-sysroot-upgrader to C++ Prep for usage of cxx.rs
2020-12-11 23:07:43 +03:00
src/daemon/rpmostree-sysroot-upgrader.cxx \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
src/daemon/rpmostreed-errors.h \
Port rpmostreed-errors to C++ Prep for using https://cxx.rs/
2020-12-21 19:08:51 +03:00
src/daemon/rpmostreed-errors.cxx \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
src/daemon/rpmostreed-deployment-utils.h \
Port rpmostree-deployment-utils to C++ Prep for using https://cxx.rs
2020-12-11 23:23:11 +03:00
src/daemon/rpmostreed-deployment-utils.cxx \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
src/daemon/rpmostreed-transaction.h \
Port rpmostreed-transaction to C++ And add a try/catch-convert-to-GError here too. This will allow us to throw exceptions from transaction implementations.
2020-12-08 20:41:59 +03:00
src/daemon/rpmostreed-transaction.cxx \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
src/daemon/rpmostreed-transaction-types.h \
Port rpmostreed-transaction-types to C++ Prep for using https://cxx.rs
2020-12-12 01:27:25 +03:00
src/daemon/rpmostreed-transaction-types.cxx \
Rename livefs → apply-live in more places Keep up the renaming momentum by using the new name in more places. Prep for further work.
2021-01-12 02:18:17 +03:00
src/daemon/rpmostreed-transaction-applylive.cxx \
daemon: Implement package diff methods
2015-06-10 05:27:39 +03:00
src/daemon/rpmostree-package-variants.h \
Port rpmostree-package-variants to C++ Prep for using https://cxx.rs/
2020-12-21 19:08:51 +03:00
src/daemon/rpmostree-package-variants.cxx \
daemon: Rename all the things! Use 'rpmostreed' as the symbol prefix.
2015-08-24 22:44:40 +03:00
src/daemon/rpmostreed-os.h \
Port rpmostreed-os to C++ Prep for using https://cxx.rs
2020-12-11 23:26:45 +03:00
src/daemon/rpmostreed-os.cxx \
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 \
Port rpmostreed-os-experimental to C++ Prep for using https://cxx.rs/
2020-12-21 19:08:51 +03:00
src/daemon/rpmostreed-os-experimental.cxx \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(NULL)
dbusconf_DATA = $(srcdir)/src/daemon/org.projectatomic.rpmostree1.conf
Move D-Bus conf file to $(datadir)/dbus-1/system.d Since D-Bus 1.9.18 configuration files installed by third-party should go in share/dbus-1/system.d. The old location is for sysadmin overrides. Closes: #1903 Approved by: jlebon
2019-09-16 18:51:13 +03:00
dbusconfdir = $(datadir)/dbus-1/system.d
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
Initial support for automatic updates This patch introduces a new `AutomaticUpdatePolicy` configuration. This was a long time coming for rpm-ostree, given that its update model makes it extremely apt for such a feature. The config supports a `check` mode, which should be very useful to Atomic Workstation users, as well as a `reboot` mode, which could be used in its present form in simple single node Atomic Host situations. There is still a lot of work to be done, including integrating advisories, and supporting a `deploy` mode. This feature hopefully will be leveraged as well by higher-level projects like GNOME Software and Cockpit. Closes: #1147 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
systemdunit_service_in_files = \
$(srcdir)/src/daemon/rpm-ostreed.service.in \
$(srcdir)/src/daemon/rpm-ostreed-automatic.service.in \
Add rpm-ostree-bootstatus.service Capturing the system state at boot aids debugging. This is a trivial implementation; we could in the future do structured logging too. The high level goal here is to help us track system state in Red Hat CoreOS. Closes: #1693 Approved by: jlebon
2018-11-30 01:19:38 +03:00
$(srcdir)/src/daemon/rpm-ostree-bootstatus.service.in \
Install rpm-ostree sysusers config and countme units Install the systemd unit, timer and sysusers configuration for Count Me support. We do not enable or pull as a dependency those units by default as this is a decision that should be taken at the distribution level and needs support on the infrastructure side. To enable those units in a disctribution package, you can add the following symlink: $ ln -snf /usr/lib/systemd/system/rpm-ostree-countme.timer /usr/lib/systemd/system/rpm-ostreed.service.wants/ or add the following config snippet to the rpm-ostreed.service unit: Wants=rpm-ostree-countme.timer
2021-02-25 14:14:36 +03:00
$(srcdir)/src/daemon/rpm-ostree-countme.service.in \
Initial support for automatic updates This patch introduces a new `AutomaticUpdatePolicy` configuration. This was a long time coming for rpm-ostree, given that its update model makes it extremely apt for such a feature. The config supports a `check` mode, which should be very useful to Atomic Workstation users, as well as a `reboot` mode, which could be used in its present form in simple single node Atomic Host situations. There is still a lot of work to be done, including integrating advisories, and supporting a `deploy` mode. This feature hopefully will be leveraged as well by higher-level projects like GNOME Software and Cockpit. Closes: #1147 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
$(NULL)
systemdunit_service_files = $(systemdunit_service_in_files:.service.in=.service)
Install rpm-ostree sysusers config and countme units Install the systemd unit, timer and sysusers configuration for Count Me support. We do not enable or pull as a dependency those units by default as this is a decision that should be taken at the distribution level and needs support on the infrastructure side. To enable those units in a disctribution package, you can add the following symlink: $ ln -snf /usr/lib/systemd/system/rpm-ostree-countme.timer /usr/lib/systemd/system/rpm-ostreed.service.wants/ or add the following config snippet to the rpm-ostreed.service unit: Wants=rpm-ostree-countme.timer
2021-02-25 14:14:36 +03:00
systemdunit_timer_files = \
$(srcdir)/src/daemon/rpm-ostreed-automatic.timer \
$(srcdir)/src/daemon/rpm-ostree-countme.timer \
$(NULL)
Initial support for automatic updates This patch introduces a new `AutomaticUpdatePolicy` configuration. This was a long time coming for rpm-ostree, given that its update model makes it extremely apt for such a feature. The config supports a `check` mode, which should be very useful to Atomic Workstation users, as well as a `reboot` mode, which could be used in its present form in simple single node Atomic Host situations. There is still a lot of work to be done, including integrating advisories, and supporting a `deploy` mode. This feature hopefully will be leveraged as well by higher-level projects like GNOME Software and Cockpit. Closes: #1147 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
systemdunit_DATA = \
$(systemdunit_service_files) \
$(systemdunit_timer_files) \
$(NULL)
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
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
Initial support for automatic updates This patch introduces a new `AutomaticUpdatePolicy` configuration. This was a long time coming for rpm-ostree, given that its update model makes it extremely apt for such a feature. The config supports a `check` mode, which should be very useful to Atomic Workstation users, as well as a `reboot` mode, which could be used in its present form in simple single node Atomic Host situations. There is still a lot of work to be done, including integrating advisories, and supporting a `deploy` mode. This feature hopefully will be leveraged as well by higher-level projects like GNOME Software and Cockpit. Closes: #1147 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
$(systemdunit_service_files): Makefile
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
$(SED_SUBST) $(daemon_asan_options) $@.in > $@
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
Install rpm-ostree sysusers config and countme units Install the systemd unit, timer and sysusers configuration for Count Me support. We do not enable or pull as a dependency those units by default as this is a decision that should be taken at the distribution level and needs support on the infrastructure side. To enable those units in a disctribution package, you can add the following symlink: $ ln -snf /usr/lib/systemd/system/rpm-ostree-countme.timer /usr/lib/systemd/system/rpm-ostreed.service.wants/ or add the following config snippet to the rpm-ostreed.service unit: Wants=rpm-ostree-countme.timer
2021-02-25 14:14:36 +03:00
systemdsysusers_DATA = $(srcdir)/src/daemon/rpm-ostree.conf
systemdsysusersdir = $(prefix)/lib/sysusers.d
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
# 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)
build-sys: Drop autoconf bits to find dbus service directory We set it to the same value in both cases. There's no reason to require it at build time anyways. Part of thinning out the Autotools side in prep for using Cargo.
2020-12-22 23:38:29 +03:00
servicedir = $(datadir)/dbus-1/system-services
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) \
Initial support for automatic updates This patch introduces a new `AutomaticUpdatePolicy` configuration. This was a long time coming for rpm-ostree, given that its update model makes it extremely apt for such a feature. The config supports a `check` mode, which should be very useful to Atomic Workstation users, as well as a `reboot` mode, which could be used in its present form in simple single node Atomic Host situations. There is still a lot of work to be done, including integrating advisories, and supporting a `deploy` mode. This feature hopefully will be leveraged as well by higher-level projects like GNOME Software and Cockpit. Closes: #1147 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
$(systemdunit_service_in_files) \
$(systemdunit_timer_files) \
Install rpm-ostree sysusers config and countme units Install the systemd unit, timer and sysusers configuration for Count Me support. We do not enable or pull as a dependency those units by default as this is a decision that should be taken at the distribution level and needs support on the infrastructure side. To enable those units in a disctribution package, you can add the following symlink: $ ln -snf /usr/lib/systemd/system/rpm-ostree-countme.timer /usr/lib/systemd/system/rpm-ostreed.service.wants/ or add the following config snippet to the rpm-ostreed.service unit: Wants=rpm-ostree-countme.timer
2021-02-25 14:14:36 +03:00
$(systemdsysusers_conf_files) \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(NULL)
CLEANFILES += \
$(service_DATA) \
Initial support for automatic updates This patch introduces a new `AutomaticUpdatePolicy` configuration. This was a long time coming for rpm-ostree, given that its update model makes it extremely apt for such a feature. The config supports a `check` mode, which should be very useful to Atomic Workstation users, as well as a `reboot` mode, which could be used in its present form in simple single node Atomic Host situations. There is still a lot of work to be done, including integrating advisories, and supporting a `deploy` mode. This feature hopefully will be leveraged as well by higher-level projects like GNOME Software and Cockpit. Closes: #1147 Approved by: cgwalters
2017-12-15 20:01:46 +03:00
$(systemdunit_service_files) \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(NULL)
Reference in New Issue Copy Permalink