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

139 lines
5.4 KiB
Plaintext
Raw Normal View History

Initial import from pkgsys-ostree
2013-12-22 04:41:30 +04:00
# Copyright (C) 2013 Colin Walters <walters@verbum.org>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
Unify rpm-ostree into one binary And start making an internal library.
2014-01-29 23:37:44 +04:00
bin_PROGRAMS += rpm-ostree
Initial import from pkgsys-ostree
2013-12-22 04:41:30 +04:00
build: Split up src into `app/` and `libpriv/` We currently have an internal-only library, but the sources for it are in the same dir as the app. For future work on a public shared library, we'll need a clearer source structure. Start by just renaming the app files into `src/app/`, and the internal private library into `src/libpriv/`, with the appropriate `Makefile.am` changes. Closes: https://github.com/projectatomic/rpm-ostree/pull/123
2015-04-07 03:18:50 +03:00
rpm_ostree_SOURCES = src/app/main.c \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
rpm-ostreed-generated.h \
rpm-ostreed-generated.c \
build: Split up src into `app/` and `libpriv/` We currently have an internal-only library, but the sources for it are in the same dir as the app. For future work on a public shared library, we'll need a clearer source structure. Start by just renaming the app files into `src/app/`, and the internal private library into `src/libpriv/`, with the appropriate `Makefile.am` changes. Closes: https://github.com/projectatomic/rpm-ostree/pull/123
2015-04-07 03:18:50 +03:00
src/app/rpmostree-builtins.h \
src/app/rpmostree-db-builtins.h \
src/app/rpmostree-compose-builtins.h \
src/app/rpmostree-builtin-upgrade.c \
src/app/rpmostree-builtin-rollback.c \
app: Add "deploy" command Command-line interface for new D-Bus "Deploy" methods.
2015-10-21 16:50:26 +03:00
src/app/rpmostree-builtin-deploy.c \
daemon: Implement "reload" There are two main issues right now; first, we don't pick up manual changes to `.origin` files, which occurs when one needs to sed it to remove `unconfigured` for example. Second, we need to reload changes to the remotes. Closes: #598 Approved by: jlebon
2016-08-06 16:07:56 +03:00
src/app/rpmostree-builtin-reload.c \
build: Split up src into `app/` and `libpriv/` We currently have an internal-only library, but the sources for it are in the same dir as the app. For future work on a public shared library, we'll need a clearer source structure. Start by just renaming the app files into `src/app/`, and the internal private library into `src/libpriv/`, with the appropriate `Makefile.am` changes. Closes: https://github.com/projectatomic/rpm-ostree/pull/123
2015-04-07 03:18:50 +03:00
src/app/rpmostree-builtin-rebase.c \
Add `cancel` verb and DBus API Right now the fact that one can only cancel via `Ctrl-C` of an existing client process is rather frustrating if for example one's ssh connection to a machine drops. Now, upon reconnecting, one can easily `rpm-ostree cancel` a hung update or whatever rather than doing the more forcible `systemctl stop rpm-ostreed` (which is safe of course, unless livefs is involved). Closes: #1019 Approved by: jlebon
2017-12-06 01:14:18 +03:00
src/app/rpmostree-builtin-cancel.c \
Add a cleanup command and DBus API We sometimes talk about using `ostree admin undeploy`, but that doesn't know about the pkgcache, and hence space there leaks until the next rpm-ostree operation. Just for this, we need to expose a cleanup command (and API). But we also need to support cleaning: - repomd - downloads (repo/tmp) So let's start implementing that. Closes: #614 Approved by: jlebon
2017-02-09 01:38:49 +03:00
src/app/rpmostree-builtin-cleanup.c \
start-daemon: make hidden I debated just putting this in the supported list, but decided against it in the end. This really should be something that happens transparently, and if it doesn't then something else is probably wrong. Closes: #617 Approved by: cgwalters
2017-02-10 20:33:08 +03:00
src/app/rpmostree-builtin-initramfs.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/app/rpmostree-builtin-livefs.c \
Add `rpm-ostree usroverlay` I saw kalev's slides reference `rpm-ostree unlock`; this patch makes it exist. In general, people have a hard time (understandably) grasping the distinction between ostree and rpm-ostree; along with the goal of making ostree really "libostree", let's start wrapping more commands where it makes sense. I also took this opportunity to have a more descriptive name; it's important to note that it *doesn't* overlay `/etc`, `/var`, or `/boot` for example. Closes: #1233 Approved by: jlebon
2018-02-06 22:44:48 +03:00
src/app/rpmostree-builtin-usroverlay.c \
app: add experimental support for pkg removals This is one more step towards making rpm-ostree more powerful in its quest to be the ultimate *hybrid* image/package system. Package layering allows us to add packages on top of the base package set received from the content provider. However, we're not able to remove or replace packages in the base set itself. This patch introduces a new `override` command, which is for now nested under the experimental `ex` command. The `override` command will allow users to modify the base package set itself. The first implemented subcommands are `remove` and `reset`. A stub has been provided for the more useful `replace` subcommand, though much of the needed logic for that operation are implemented in this patch as part of the `remove` subcommand. Part of: https://github.com/projectatomic/rpm-ostree/issues/485 Closes: #797 Approved by: cgwalters
2017-06-05 19:37:56 +03:00
src/app/rpmostree-builtin-override.c \
app: add 'refresh-md' command This is essentially the `dnf/yum makecache` equivalent for rpm-ostree. To complete the picture, this goes hand in hand with the `-C` equivalent, which is added in the next patch. Closes: #1035 Approved by: cgwalters
2017-10-04 18:20:16 +03:00
src/app/rpmostree-builtin-refresh-md.c \
Add new `reset` command Add a new `reset` command that makes it easy to blow away all customizations: overlays, overrides, and initramfs. One can use flags to only reset some of the customizations. I placed this under `ex` out of conservatism. It's a pretty simple command with simple behaviour, though the features it relies on (no-layering, no-initramfs) are brand new. We can move it out of there in a release or two? Closes: #1387 Closes: #1419 Approved by: cgwalters
2018-06-26 17:30:32 +03:00
src/app/rpmostree-builtin-reset.c \
app: Rename pkg-delete -> pkg-remove and unify codebase I've found it's a lot less code to have multiple builtins share live in the same `.c` file where they can share things like options. Also, rename `pkg-delete` -> `pkg-remove` since the canonical antonym of `add` is `remove`. Closes: #345 Approved by: jlebon
2016-06-23 04:14:27 +03:00
src/app/rpmostree-pkg-builtins.c \
build: Split up src into `app/` and `libpriv/` We currently have an internal-only library, but the sources for it are in the same dir as the app. For future work on a public shared library, we'll need a clearer source structure. Start by just renaming the app files into `src/app/`, and the internal private library into `src/libpriv/`, with the appropriate `Makefile.am` changes. Closes: https://github.com/projectatomic/rpm-ostree/pull/123
2015-04-07 03:18:50 +03:00
src/app/rpmostree-builtin-status.c \
app: Rename internals → ex The goal is to consolidate our "experimental" functionality under one subcommand. This makes it easier to determine when things "graduate" to permanent-stability status under the main command line. Closes: https://github.com/projectatomic/rpm-ostree/issues/682 Closes: #683 Approved by: jlebon
2017-03-16 04:05:14 +03:00
src/app/rpmostree-builtin-ex.c \
Add a `container` builtin This is just a tech demo. Example usage: ``` mkdir -p ~/.cache/rpmostree-containers cd ~/.cache/rpmostree-containers rpm-ostree container init cp /etc/yum.repos.d/CentOS-Core.repo rpmmd.repos.d rpm-ostree container assemble bash rpm-ostree container assemble httpd ```
2016-01-26 22:40:51 +03:00
src/app/rpmostree-builtin-container.c \
rojig-rename: Rename the "build" side files Closes: #1279 Approved by: jlebon
2018-02-27 23:16:28 +03:00
src/app/rpmostree-ex-builtin-commit2rojig.c \
rojig-rename: (almost) Everything else This renames the remaining C files, tests, etc. There are only a few hits for `jigdo` left; changing them would be a format break, so let's wait to do that until we need to. Closes: #1279 Approved by: jlebon
2018-02-27 23:23:59 +03:00
src/app/rpmostree-ex-builtin-rojig2commit.c \
build: Split up src into `app/` and `libpriv/` We currently have an internal-only library, but the sources for it are in the same dir as the app. For future work on a public shared library, we'll need a clearer source structure. Start by just renaming the app files into `src/app/`, and the internal private library into `src/libpriv/`, with the appropriate `Makefile.am` changes. Closes: https://github.com/projectatomic/rpm-ostree/pull/123
2015-04-07 03:18:50 +03:00
src/app/rpmostree-builtin-db.c \
start-daemon: make hidden I debated just putting this in the supported list, but decided against it in the end. This really should be something that happens transparently, and if it doesn't then something else is probably wrong. Closes: #617 Approved by: cgwalters
2017-02-10 20:33:08 +03:00
src/app/rpmostree-builtin-start-daemon.c \
build: Split up src into `app/` and `libpriv/` We currently have an internal-only library, but the sources for it are in the same dir as the app. For future work on a public shared library, we'll need a clearer source structure. Start by just renaming the app files into `src/app/`, and the internal private library into `src/libpriv/`, with the appropriate `Makefile.am` changes. Closes: https://github.com/projectatomic/rpm-ostree/pull/123
2015-04-07 03:18:50 +03:00
src/app/rpmostree-db-builtin-diff.c \
src/app/rpmostree-db-builtin-list.c \
src/app/rpmostree-db-builtin-version.c \
daemon: Make parts of cli use the daemon
2015-06-13 03:19:16 +03:00
src/app/rpmostree-dbus-helpers.c \
src/app/rpmostree-dbus-helpers.h \
Add a `container` builtin This is just a tech demo. Example usage: ``` mkdir -p ~/.cache/rpmostree-containers cd ~/.cache/rpmostree-containers rpm-ostree container init cp /etc/yum.repos.d/CentOS-Core.repo rpmmd.repos.d rpm-ostree container assemble bash rpm-ostree container assemble httpd ```
2016-01-26 22:40:51 +03:00
src/app/rpmostree-container-builtins.h \
src/app/rpmostree-container-builtins.c \
app: add experimental support for pkg removals This is one more step towards making rpm-ostree more powerful in its quest to be the ultimate *hybrid* image/package system. Package layering allows us to add packages on top of the base package set received from the content provider. However, we're not able to remove or replace packages in the base set itself. This patch introduces a new `override` command, which is for now nested under the experimental `ex` command. The `override` command will allow users to modify the base package set itself. The first implemented subcommands are `remove` and `reset`. A stub has been provided for the more useful `replace` subcommand, though much of the needed logic for that operation are implemented in this patch as part of the `remove` subcommand. Part of: https://github.com/projectatomic/rpm-ostree/issues/485 Closes: #797 Approved by: cgwalters
2017-06-05 19:37:56 +03:00
src/app/rpmostree-override-builtins.h \
src/app/rpmostree-override-builtins.c \
Move diff printing code into client This is a step forward to deduplicating; the client tooling now calls into the public API for diffs, rather than using the older internal function. Note: this patch also links the client against the public library.
2015-04-19 16:36:53 +03:00
src/app/rpmostree-libbuiltin.c \
src/app/rpmostree-libbuiltin.h \
app: spawn polkit authentication agent Spawn pkttyagent when trying to call a method that may require authentication to give users a chance to provide auth right from the terminal. Since we're now relying on polkit for authorizing most of the OS interface methods, let's drop the root check on those. Closes: #894 Approved by: cgwalters
2017-07-25 19:59:56 +03:00
src/app/rpmostree-polkit-agent.c \
src/app/rpmostree-polkit-agent.h \
app/daemon: add groundwork for rpm-ostree kargs command This is initial groundwork for https://github.com/projectatomic/rpm-ostree/issues/594. This commit sets up most of the required front end logic( arg parsing, transaction handling), and will be used in the following commits. There is nothing really fancy in this commit, as most of the code shares the similar style between other dbus related commands. Closes: #1013 Approved by: cgwalters
2017-09-25 19:05:24 +03:00
src/app/rpmostree-builtin-kargs.c \
Add --disable-compose-tooling build option Some downstreams want the ability to separate the compose tooling from the client, for e.g. support reasons. This approach supports generating a tarball without the source for the compose command, and requires specifying a config option to disable it.
2014-09-17 05:45:30 +04:00
$(NULL)
if BUILDOPT_COMPOSE_TOOLING
rpm_ostree_SOURCES += \
build: Split up src into `app/` and `libpriv/` We currently have an internal-only library, but the sources for it are in the same dir as the app. For future work on a public shared library, we'll need a clearer source structure. Start by just renaming the app files into `src/app/`, and the internal private library into `src/libpriv/`, with the appropriate `Makefile.am` changes. Closes: https://github.com/projectatomic/rpm-ostree/pull/123
2015-04-07 03:18:50 +03:00
src/app/rpmostree-compose-builtin-tree.c \
compose: Split off composeutil.[ch] Prep for adding a new toplevel rojig command. It's also just cleaner to avoid cluttering up the main compose logic with distractions like the `_legacy_prep_dev()` bits. Closes: #1564 Approved by: jlebon
2018-09-19 16:48:04 +03:00
src/app/rpmostree-composeutil.c \
src/app/rpmostree-composeutil.h \
build: Split up src into `app/` and `libpriv/` We currently have an internal-only library, but the sources for it are in the same dir as the app. For future work on a public shared library, we'll need a clearer source structure. Start by just renaming the app files into `src/app/`, and the internal private library into `src/libpriv/`, with the appropriate `Makefile.am` changes. Closes: https://github.com/projectatomic/rpm-ostree/pull/123
2015-04-07 03:18:50 +03:00
src/app/rpmostree-builtin-compose.c \
Unify rpm-ostree into one binary And start making an internal library.
2014-01-29 23:37:44 +04:00
$(NULL)
Add --disable-compose-tooling build option Some downstreams want the ability to separate the compose tooling from the client, for e.g. support reasons. This approach supports generating a tarball without the source for the compose command, and requires specifying a config option to disable it.
2014-09-17 05:45:30 +04:00
endif
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
rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/app -I$(srcdir)/src/daemon \
-I$(srcdir)/src/lib -I$(srcdir)/src/libpriv -I$(libglnx_srcpath) \
build-sys: Mark libpriv symbols as private This was caught by the abicheck in Fedora; since we were building with default visibility for `librpmostreepriv.la` which was linked statically into the public library, we'd end up with lots of internals as public ABI. Fix this by using `-fvisibility=private` for the libpriv build and for good measure elsewhere so we remember to use it by default. Closes: #1320 Approved by: jlebon
2018-03-28 17:08:16 +03:00
-fvisibility=hidden -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
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
rpm_ostree_LDADD = $(PKGDEP_RPMOSTREE_LIBS) librpmostreepriv.la librpmostree-1.la librpmostreed.la
Split out postprocess+commit to separate script As this logic is of most interest to potential other consumers; it's not entangled with yum for example.
2014-01-16 16:26:54 +04:00
Initial import from pkgsys-ostree
2013-12-22 04:41:30 +04:00
privdatadir=$(pkglibdir)
tmpfiles.d: rename and re-order According to tmpfiles.d(5), files should follow the convention <package>.conf or <package>-<part>.conf. So we rename tmpfiles-ostree-integration.conf to rpm-ostree-0-integration.conf. The 0 index is so that the autovar conf created by postprocess is sourced *after* this one, so that `integration.conf` has higher precedence if there are duplicate entries. Closes: #325 Approved by: cgwalters
2016-06-15 23:30:11 +03:00
privdata_DATA = src/app/rpm-ostree-0-integration.conf
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-bin-hook:
mv $(DESTDIR)$(bindir)/rpm-ostree $(DESTDIR)$(bindir)/$(primaryname)
ln -sf $(primaryname) $(DESTDIR)$(bindir)/rpm-ostree
if BUILDOPT_NEW_NAME
INSTALL_DATA_HOOKS += install-bin-hook
endif
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
build-sys: Propagate Automake verbose mode to Rust/cargo This is analogous to commit c62058e54860165899581fa11de2d7a956bca7d5 which propagated `V=1` into `cmake`. Except if the build *isn't* verbose (for local development), let's not force `--verbose` on for Rust. Closes: #1583 Approved by: jlebon
2018-09-26 17:23:48 +03:00
# Propagate automake verbose mode
cargo_build = $(cargo) build $(if $(subst 0,,$(V)),--verbose,)
Split cbindgen to separate build, support external version The problem is building bindgen as part of our single run locks serde to way old versions, and I want to use newer versions. Since Fedora will now again ship a `cbindgen` package, let's also support using it if we find it, saving ourselves the cost of building it. For distros that don't ship it (e.g. CentOS) for CI purposes we build it. For downstream builds that are offline, rather than vendor the cbindgen sources like we do with our main Rust, let's just vendor the `rpmostree-rust.h` file as was suggested in https://bugzilla.redhat.com/show_bug.cgi?id=1608670 Closes: https://github.com/projectatomic/rpm-ostree/issues/1557 Closes: #1573 Approved by: jlebon
2018-09-22 01:02:18 +03:00
if !HAVE_PREBUILT_CBINDGEN
if !HAVE_EXTERNAL_CBINDGEN
rpmostree-bindgen: bindgen/Cargo.toml bindgen/src/main.rs
cd $(top_srcdir)/bindgen && \
export CARGO_TARGET_DIR=@abs_top_builddir@/bindgen-target && \
build-sys: Just error out if building with multiple uids The `--frozen` stuff ends up being annoying when switching branches. What we're really trying to protect against here is the `sudo make install` problem, so let's test for that more directly by verifying the uids. (The previous code was also totally broken as it used `$` where `$$` should have been in multiple places) Closes: #1601 Approved by: cgwalters
2018-10-12 20:40:56 +03:00
if test -d "$${CARGO_TARGET_DIR}" && [ "$$(stat -c '%u' ${target_subdir})" != "$$(id -u)" ]; then echo "mismatched uids on build"; exit 1; fi && \
build-sys: Propagate Automake verbose mode to Rust/cargo This is analogous to commit c62058e54860165899581fa11de2d7a956bca7d5 which propagated `V=1` into `cmake`. Except if the build *isn't* verbose (for local development), let's not force `--verbose` on for Rust. Closes: #1583 Approved by: jlebon
2018-09-26 17:23:48 +03:00
$(cargo_build) && \
Split cbindgen to separate build, support external version The problem is building bindgen as part of our single run locks serde to way old versions, and I want to use newer versions. Since Fedora will now again ship a `cbindgen` package, let's also support using it if we find it, saving ourselves the cost of building it. For distros that don't ship it (e.g. CentOS) for CI purposes we build it. For downstream builds that are offline, rather than vendor the cbindgen sources like we do with our main Rust, let's just vendor the `rpmostree-rust.h` file as was suggested in https://bugzilla.redhat.com/show_bug.cgi?id=1608670 Closes: https://github.com/projectatomic/rpm-ostree/issues/1557 Closes: #1573 Approved by: jlebon
2018-09-22 01:02:18 +03:00
ln -sf $${CARGO_TARGET_DIR}/debug/rpmostree-bindgen $(abs_top_builddir)/rpmostree-bindgen
endif
endif
build-sys: Make Rust library naming/entrypoint more generic Prep for adding more functionality beyond treefile bits. Closes: #1444 Approved by: jlebon
2018-07-04 21:50:40 +03:00
librpmostree_rust_path = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librpmostree_rust.a
build-sys: Just error out if building with multiple uids The `--frozen` stuff ends up being annoying when switching branches. What we're really trying to protect against here is the `sudo make install` problem, so let's test for that more directly by verifying the uids. (The previous code was also totally broken as it used `$` where `$$` should have been in multiple places) Closes: #1601 Approved by: cgwalters
2018-10-12 20:40:56 +03:00
# If the target directory exists, and isn't owned by our uid, then
# we exit with a fatal error, since someone probably did `make && sudo make install`,
# and in this case cargo will download into ~/.root which we don't want.
build: Regenerate rpmostree-rust.h if cbindgen.toml changes So when I edit it I get the changes. Figuring this out took me a little while, we were missing two dependencies. Closes: #1559 Approved by: jlebon
2018-09-13 23:10:50 +03:00
LIBRPMOSTREE_RUST_SRCS = $(wildcard rust/src/*.rs) rust/cbindgen.toml
build-sys: Make Rust library naming/entrypoint more generic Prep for adding more functionality beyond treefile bits. Closes: #1444 Approved by: jlebon
2018-07-04 21:50:40 +03:00
$(librpmostree_rust_path): Makefile $(LIBRPMOSTREE_RUST_SRCS)
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
cd $(top_srcdir)/rust && \
build-sys: Use --frozen if Rust library was already built The main rationale here is avoiding any Cargo internet access during `sudo make install` type flows. Closes: #1444 Approved by: jlebon
2018-07-04 22:13:25 +03:00
export CARGO_TARGET_DIR=@abs_top_builddir@/target && \
build-sys: Rework Rust --frozen logic For local development, I want to be able to e.g. update `Cargo.toml` or switch branches and not have to `rm -rf target`. Let's tweak the logic here so we only pass `--frozen` if the ownership of the dir is different. Probably an even better fix would be to just error out, but this is a conservative tweak. Closes: #1563 Approved by: jlebon
2018-09-16 23:32:47 +03:00
target_subdir=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@; \
build-sys: Just error out if building with multiple uids The `--frozen` stuff ends up being annoying when switching branches. What we're really trying to protect against here is the `sudo make install` problem, so let's test for that more directly by verifying the uids. (The previous code was also totally broken as it used `$` where `$$` should have been in multiple places) Closes: #1601 Approved by: cgwalters
2018-10-12 20:40:56 +03:00
if test -d "$${target_subdir}" && [ "$$(stat -c '%u' $${target_subdir})" != "$$(id -u)" ]; then echo "mismatched uids on build"; exit 1; fi && \
$(cargo_build) $(CARGO_RELEASE_ARGS)
build-sys: Make Rust library naming/entrypoint more generic Prep for adding more functionality beyond treefile bits. Closes: #1444 Approved by: jlebon
2018-07-04 21:50:40 +03:00
EXTRA_DIST += $(LIBRPMOSTREE_RUST_SRCS) rust/Cargo.lock
Add support for YAML treefiles Let's modernize and start supporting YAML treefiles. I'll dare make the sweeping generalization that most people would prefer reading and writing YAML over JSON. This takes bits from coreos-assembler[1] that know how to serialize a YAML file and spit it back out as a JSON and makes it into a shared lib that we can link against. We could use this eventually for JSON inputs as well to force a validation check before composing. If we go this route, we could then turn on `--enable-rust` in FAHC for now and drop the duplicate code in coreos-assembler. [1] https://github.com/cgwalters/coreos-assembler Closes: #1377 Approved by: cgwalters
2018-05-31 23:31:22 +03:00
Split cbindgen to separate build, support external version The problem is building bindgen as part of our single run locks serde to way old versions, and I want to use newer versions. Since Fedora will now again ship a `cbindgen` package, let's also support using it if we find it, saving ourselves the cost of building it. For distros that don't ship it (e.g. CentOS) for CI purposes we build it. For downstream builds that are offline, rather than vendor the cbindgen sources like we do with our main Rust, let's just vendor the `rpmostree-rust.h` file as was suggested in https://bugzilla.redhat.com/show_bug.cgi?id=1608670 Closes: https://github.com/projectatomic/rpm-ostree/issues/1557 Closes: #1573 Approved by: jlebon
2018-09-22 01:02:18 +03:00
# Generate bindings from Rust to C
if !HAVE_PREBUILT_CBINDGEN
if HAVE_EXTERNAL_CBINDGEN
Use cbindgen If we're going to scale out our oxidation, let's follow the path of Firefox (and other projects) further and use cbindgen: https://github.com/eqrion/cbindgen It's actually nice that `cbindgen` is packaged today in Fedora, but I doubt it is elsewhere; we may end up needing to push that forward, or just vendor it via a `build.rs` script and Cargo. I chose to rename things to `ROR`/`ror_` since it's shorter. I am tempted a bit to rename our internal functions to just `ro_` to or so. Closes: #1516 Approved by: jlebon
2018-08-24 17:42:31 +03:00
rpmostree-rust.h: $(librpmostree_rust_path)
Split cbindgen to separate build, support external version The problem is building bindgen as part of our single run locks serde to way old versions, and I want to use newer versions. Since Fedora will now again ship a `cbindgen` package, let's also support using it if we find it, saving ourselves the cost of building it. For distros that don't ship it (e.g. CentOS) for CI purposes we build it. For downstream builds that are offline, rather than vendor the cbindgen sources like we do with our main Rust, let's just vendor the `rpmostree-rust.h` file as was suggested in https://bugzilla.redhat.com/show_bug.cgi?id=1608670 Closes: https://github.com/projectatomic/rpm-ostree/issues/1557 Closes: #1573 Approved by: jlebon
2018-09-22 01:02:18 +03:00
$(AM_V_GEN) cbindgen -c rust/cbindgen.toml -o $@ $(top_srcdir)/rust
else
rpmostree-rust.h: $(librpmostree_rust_path) rpmostree-bindgen
$(AM_V_GEN) ./rpmostree-bindgen $(top_srcdir)/rust
endif
Use cbindgen If we're going to scale out our oxidation, let's follow the path of Firefox (and other projects) further and use cbindgen: https://github.com/eqrion/cbindgen It's actually nice that `cbindgen` is packaged today in Fedora, but I doubt it is elsewhere; we may end up needing to push that forward, or just vendor it via a `build.rs` script and Cargo. I chose to rename things to `ROR`/`ror_` since it's shorter. I am tempted a bit to rename our internal functions to just `ro_` to or so. Closes: #1516 Approved by: jlebon
2018-08-24 17:42:31 +03:00
BUILT_SOURCES += rpmostree-rust.h
Split cbindgen to separate build, support external version The problem is building bindgen as part of our single run locks serde to way old versions, and I want to use newer versions. Since Fedora will now again ship a `cbindgen` package, let's also support using it if we find it, saving ourselves the cost of building it. For distros that don't ship it (e.g. CentOS) for CI purposes we build it. For downstream builds that are offline, rather than vendor the cbindgen sources like we do with our main Rust, let's just vendor the `rpmostree-rust.h` file as was suggested in https://bugzilla.redhat.com/show_bug.cgi?id=1608670 Closes: https://github.com/projectatomic/rpm-ostree/issues/1557 Closes: #1573 Approved by: jlebon
2018-09-22 01:02:18 +03:00
endif
Use cbindgen If we're going to scale out our oxidation, let's follow the path of Firefox (and other projects) further and use cbindgen: https://github.com/eqrion/cbindgen It's actually nice that `cbindgen` is packaged today in Fedora, but I doubt it is elsewhere; we may end up needing to push that forward, or just vendor it via a `build.rs` script and Cargo. I chose to rename things to `ROR`/`ror_` since it's shorter. I am tempted a bit to rename our internal functions to just `ro_` to or so. Closes: #1516 Approved by: jlebon
2018-08-24 17:42:31 +03:00
rpm_ostree_CFLAGS += $(PKGDEP_RPMOSTREE_RS_CFLAGS)
app: Add support for passing URLs to RPMs This teaches the client to fetch packages from URLs directly so that one doesn't have to `curl` first and then install. Supported anywhere package filenames are allowed (notably: `install` and `override replace`). One neat things about this is that we download the file into an `O_TMPFILE` and then pass on ownership of that fd directly to the daemon. So at no point are the packages actually laying visible on the system. (Assuming the filesystem supports `O_TMPFILE` that is). This adds direct linking to libcurl and openssl, two libraries which we were already pulling in indirectly. Closes: #1508 Approved by: cgwalters
2018-08-18 00:34:02 +03:00
rpm_ostree_LDADD += $(librpmostree_rust_path) $(PKGDEP_RPMOSTREE_RS_LIBS)
rust: Add a `make rustfmt`, run it It is actually really nice that there's One Canonical Style, even if I sometimes don't like some details of what rustfmt does. Closes: #1444 Approved by: jlebon
2018-07-04 22:47:45 +03:00
rustfmt:
build-sys: Fix `make rustfmt`, and run it When we added the bindgen config this broke as it's not a `.rs`. Let's keep the source formatted canonically. Closes: #1635 Approved by: jlebon
2018-10-23 21:53:35 +03:00
rustfmt $(filter %.rs,$(LIBRPMOSTREE_RUST_SRCS))
rust: Add a `make rustfmt`, run it It is actually really nice that there's One Canonical Style, even if I sometimes don't like some details of what rustfmt does. Closes: #1444 Approved by: jlebon
2018-07-04 22:47:45 +03:00
# Outside the ifdef, otherwise automake complains
.PHONY: rustfmt
build-sys: Add a `rust-test` target I often am editing just the Rust code, and want the fast iteration feedback of a `cargo test` - don't want to pay the cost of full optimization (particularly LTO) for the release build, and I *just* want to run the Rust tests. Basically if you're editing our Rust code a lot, this target is your friend. Closes: #1585 Approved by: jlebon
2018-09-26 17:43:18 +03:00
# Wraps `cargo test`. This is always a debug non-release build;
# the main thing here is we still drop the `target` dir in our build
# directory, since we nominally support srcdir != builddir.
rust-test:
cd $(top_srcdir)/rust && CARGO_TARGET_DIR=@abs_top_builddir@/target cargo test
.PHONY: rust-test
Reference in New Issue Copy Permalink