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

114 lines
3.8 KiB
Makefile
Raw Normal View History

Initial import from pkgsys-ostree
2013-12-22 04:41:30 +04:00
# Copyright (C) 2011,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.
Import some code for using GJS This is forked from gnome-continuous.
2014-01-03 22:15:12 +04:00
include Makefile-decls.am
ci: Verify rustfmt Split out the command into a separate `Makefile` that doesn't use Automake so we can invoke it early. Closes: #1674 Approved by: dustymabe
2018-11-13 18:57:50 +03:00
include Makefile-extra.inc
Import some code for using GJS This is forked from gnome-continuous.
2014-01-03 22:15:12 +04:00
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
primaryname = rpm-ostree
doc: Add gtk-doc for new library
2015-04-09 00:20:50 +03:00
SUBDIRS += .
if ENABLE_GTK_DOC
Move gtk-doc into api-doc Since that's all it is now, we use mkdocs for the manual.
2016-03-09 19:20:06 +03:00
SUBDIRS += api-doc
doc: Add gtk-doc for new library
2015-04-09 00:20:50 +03:00
endif
build: allow `git describe` versioning in worktrees In git worktrees, `.git` is not a directory but a regular file containing the path to the real git directory. This was causing us to not use `git describe` in the versioning info, which is really useful to sanity check that you're running the code you think you're running. Fix this by just checking that a `.git` entry exists. Closes: #1102 Approved by: cgwalters
2017-11-13 06:45:20 +03:00
RPM_OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -e $(srcdir)/.git; then git describe --abbrev=42 --tags --always HEAD; fi)
build: Capture `git describe` on build if available, add to --version Many projects do this, and it really helps debugging to know the exact hash. (Of course this is broken in traditional rpm builds from a tarball, and rpmdistro-gitoverlay injects it into the Version field, but it will help me for vmcheck debugging) Closes: #584 Approved by: jlebon
2017-01-19 20:38:40 +03:00
Import some code for using GJS This is forked from gnome-continuous.
2014-01-03 22:15:12 +04:00
ACLOCAL_AMFLAGS += -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS += -DDATADIR='"$(datadir)"' \
Initial import from pkgsys-ostree
2013-12-22 04:41:30 +04:00
-DLIBEXECDIR='"$(libexecdir)"' \
-DLOCALEDIR=\"$(datadir)/locale\" \
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
-DSYSCONFDIR='"$(sysconfdir)"' \
-DRPM_OSTREE_FEATURES='"$(RPM_OSTREE_FEATURES)"' \
build: Capture `git describe` on build if available, add to --version Many projects do this, and it really helps debugging to know the exact hash. (Of course this is broken in traditional rpm builds from a tarball, and rpmdistro-gitoverlay injects it into the Version field, but it will help me for vmcheck debugging) Closes: #584 Approved by: jlebon
2017-01-19 20:38:40 +03:00
-DRPM_OSTREE_GITREV='"$(RPM_OSTREE_GITREV)"' \
build: Bump minimum glib2 version to 2.56 That's the latest available in (f28, el8). Prep for using some new APIs without tripping compiler warnings. Closes: #1796 Approved by: cgwalters
2019-03-22 18:14:51 +03:00
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_56
Convert some code to compile in C++ mode This is part of investigating using https://cxx.rs/ In order to make this really work, we need to convert some of our C code to C++ so we can include cxx.rs-generated code. This starts by converting just two files as a starting point. I did the minimal porting; I didn't try to actually rewrite them to resemble modern C++, just "C in C++ mode".
2020-11-22 22:55:06 +03:00
# We make some C warnings always a hard error; these should never happen in our code.
# These flags are not valid for C++.
warn_only_c_flags = -Werror=strict-prototypes \
-Werror=missing-prototypes \
-Werror=implicit-function-declaration \
-Werror=int-conversion \
-Werror=incompatible-pointer-types \
-Werror=int-conversion \
$(NULL)
build-sys: Sync CFLAGS with libostree In particular this pulls in `-fno-strict-aliasing`. See https://github.com/ostreedev/ostree/pull/1384 Closes: #1156 Approved by: jlebon
2017-12-15 17:52:48 +03:00
# Keep this in sync with the AM_CFLAGS in libostree; see
# that project for more information about e.g. -fno-strict-aliasing
Convert some code to compile in C++ mode This is part of investigating using https://cxx.rs/ In order to make this really work, we need to convert some of our C code to C++ so we can include cxx.rs-generated code. This starts by converting just two files as a starting point. I did the minimal porting; I didn't try to actually rewrite them to resemble modern C++, just "C in C++ mode".
2020-11-22 22:55:06 +03:00
AM_CFLAGS += -std=gnu11 -fno-strict-aliasing $(WARN_CFLAGS) $(warn_only_c_flags)
# Our default CXX flags
build: Use -std=c++17 Notably this includes [std::optional](https://en.cppreference.com/w/cpp/utility/optional) which I'd like to use. The dnf-5-devel branch uses this too, and C++-17 is now well supported in current GCC, which is available in RHEL8 DTS too.
2021-01-26 22:18:36 +03:00
AM_CXXFLAGS += -std=c++17 -fno-strict-aliasing $(WARN_CFLAGS)
Initial import from pkgsys-ostree
2013-12-22 04:41:30 +04:00
EXTRA_DIST += autogen.sh COPYING
Makefile.am: add rpm-ostreed stub to GITIGNOREFILES Closes: #636 Approved by: cgwalters
2017-02-12 07:25:53 +03:00
GITIGNOREFILES += build-aux/ gtk-doc.make config.h.in aclocal.m4 insttree/ rpm-ostreed
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
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
SED_SUBST = sed \
-e 's,[@]libexecdir[@],$(libexecdir),g' \
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
-e 's,[@]primaryname[@],$(primaryname),g' \
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
-e 's,[@]bindir[@],$(bindir),g' \
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
$(NULL)
Start using libglnx The high level goal is to deprecate libgsystem. I was trying to share code between ostree/rpm-ostree, but it was too painful to commit to forver frozen ABI for new utility APIs. The git submodule approach will much more easily allow breaking API/ABI, and iterate on APIs until they either land in GLib or not. Note that libglnx will not use GFile*, so a full port to it will involve also not using that. Thus, it will be necessarily incremental; in the meantime we'll link to both libgsystem and libglnx.
2015-02-15 21:56:14 +03:00
libglnx_srcpath := $(srcdir)/libglnx
build: Use -fvisibility=hidden and explicit exports This avoids symbol leakage. Previously we were at risk of exporting other random API from libpriv, as well as libglnx.
2015-04-14 04:25:05 +03:00
libglnx_cflags := $(PKGDEP_GIO_UNIX_CFLAGS) -I$(libglnx_srcpath) -fvisibility=hidden
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
libglnx_ldflags :=
Start using libglnx The high level goal is to deprecate libgsystem. I was trying to share code between ostree/rpm-ostree, but it was too painful to commit to forver frozen ABI for new utility APIs. The git submodule approach will much more easily allow breaking API/ABI, and iterate on APIs until they either land in GLib or not. Note that libglnx will not use GFile*, so a full port to it will involve also not using that. Thus, it will be necessarily incremental; in the meantime we'll link to both libgsystem and libglnx.
2015-02-15 21:56:14 +03:00
libglnx_libs := $(PKGDEP_GIO_UNIX_LIBS)
Add a public shared library, with "rpm -qa" for commit functionality This will help build release engineering and other types of tools; for example, rather than parsing the output of `db diff`, one should be able to call an API. Initially, this adds the generic infrastructure for a public shared library, with a new function call to do the equivalent of `rpm -qa` on a particular OSTree commit. Closes: https://github.com/projectatomic/rpm-ostree/issues/117 Closes: https://github.com/projectatomic/rpm-ostree/pull/124
2015-03-20 03:45:30 +03:00
include $(INTROSPECTION_MAKEFILE)
GIRS =
TYPELIBS = $(GIRS:.gir=.typelib)
packaging: Support vendoring the Rust sources This ends up being different than what landed in librsvg (that was imported into ostree) because in rpm-ostree we've basically been using `git archive`-based tarball generation rather than `make dist` for a long time. And supporting `make dist` looks like it'd get into handling the `libdnf` bits and walking into `cmake` land so...yeah let's not do that. The canonical sources are in git (recursively via submodule), except for the Rust sources, which cargo can download dynamically, and with this patch we support glomming all of that together into a tarball. (And turn off `make dist` so people understand how we do it) Tested by `make -f Makefile.dist-packaging dist-snapshot`, then copying the resulting tarball into a container with `--net=none` and building there. Closes: #1391 Approved by: jlebon
2018-06-06 00:49:48 +03:00
# These bits were originally based on gnome:librsvg/Makefile.am
# but have been adapted to non-recursive Automake, and additionally
# the "cargo vendor" bits for us live in packaging/Makefile.dist-packaging.
.PHONY: check-local-cargo clean-local-cargo use-git-not-dist-hook
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
if RUST_DEBUG
CARGO_RELEASE_ARGS=
else
CARGO_RELEASE_ARGS=--release
endif
rust: Fix automake warnings, add unit tests to glibutils Automake was warning about duplicate `clean-local` definitions, let's do the nonrecursive automake dance. And while I'm here, let's add some Rust unit tests that actually run on `make check` too, since the whole unit testing bits of Rust are awesome. (I also tweaked the propagate bits to use the nicer `is_null()` method) Closes: #1389 Approved by: jlebon
2018-06-05 17:59:35 +03:00
check-local-cargo:
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 $(srcdir)/rust && CARGO_TARGET_DIR=$(abs_top_builddir)/target cargo test
packaging: Support vendoring the Rust sources This ends up being different than what landed in librsvg (that was imported into ostree) because in rpm-ostree we've basically been using `git archive`-based tarball generation rather than `make dist` for a long time. And supporting `make dist` looks like it'd get into handling the `libdnf` bits and walking into `cmake` land so...yeah let's not do that. The canonical sources are in git (recursively via submodule), except for the Rust sources, which cargo can download dynamically, and with this patch we support glomming all of that together into a tarball. (And turn off `make dist` so people understand how we do it) Tested by `make -f Makefile.dist-packaging dist-snapshot`, then copying the resulting tarball into a container with `--net=none` and building there. Closes: #1391 Approved by: jlebon
2018-06-06 00:49:48 +03:00
CHECK_LOCAL_HOOKS += check-local-cargo
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
rust: Fix automake warnings, add unit tests to glibutils Automake was warning about duplicate `clean-local` definitions, let's do the nonrecursive automake dance. And while I'm here, let's add some Rust unit tests that actually run on `make check` too, since the whole unit testing bits of Rust are awesome. (I also tweaked the propagate bits to use the nicer `is_null()` method) Closes: #1389 Approved by: jlebon
2018-06-05 17:59:35 +03:00
clean-local-cargo:
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 $(srcdir)/rust && CARGO_TARGET_DIR=$(abs_top_builddir)/target cargo clean
packaging: Support vendoring the Rust sources This ends up being different than what landed in librsvg (that was imported into ostree) because in rpm-ostree we've basically been using `git archive`-based tarball generation rather than `make dist` for a long time. And supporting `make dist` looks like it'd get into handling the `libdnf` bits and walking into `cmake` land so...yeah let's not do that. The canonical sources are in git (recursively via submodule), except for the Rust sources, which cargo can download dynamically, and with this patch we support glomming all of that together into a tarball. (And turn off `make dist` so people understand how we do it) Tested by `make -f Makefile.dist-packaging dist-snapshot`, then copying the resulting tarball into a container with `--net=none` and building there. Closes: #1391 Approved by: jlebon
2018-06-06 00:49:48 +03:00
CLEAN_LOCAL_HOOKS += clean-local-cargo
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
packaging: Support vendoring the Rust sources This ends up being different than what landed in librsvg (that was imported into ostree) because in rpm-ostree we've basically been using `git archive`-based tarball generation rather than `make dist` for a long time. And supporting `make dist` looks like it'd get into handling the `libdnf` bits and walking into `cmake` land so...yeah let's not do that. The canonical sources are in git (recursively via submodule), except for the Rust sources, which cargo can download dynamically, and with this patch we support glomming all of that together into a tarball. (And turn off `make dist` so people understand how we do it) Tested by `make -f Makefile.dist-packaging dist-snapshot`, then copying the resulting tarball into a container with `--net=none` and building there. Closes: #1391 Approved by: jlebon
2018-06-06 00:49:48 +03:00
use-git-not-dist-hook:
@echo
@echo 'ERROR: rpm-ostree does not use/support "make dist"; see packaging/Makefile.dist-packaging' 1>&2
@echo
@exit 1
DIST_HOOKS += use-git-not-dist-hook
build-sys: Add some gitignore for Rust bits Just keeping status tidy. Closes: #1397 Approved by: jlebon
2018-06-09 15:10:17 +03:00
GITIGNOREFILES += target/
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: Ignore cosa/kola artifacts These currently end up in the toplevel.
2020-04-29 20:52:23 +03:00
# From coreos-assembler
GITIGNOREFILES += "fastbuild*.qcow2" _kola_temp/
automake: squash warnings re. subdir-objects During autoreconf, automake would emit many warnings regarding the option 'subdir-objects' being disabled. We squash those warnings by enabling the option. We also fix Makefile.am so that it includes the patched libglnx Makefile rather than the original one, which would cause libglnx output to be placed in the literal dir './$(libglnx_srcpath)'.
2015-09-11 16:33:46 +03:00
include libglnx/Makefile-libglnx.am.inc
Start using libglnx The high level goal is to deprecate libgsystem. I was trying to share code between ostree/rpm-ostree, but it was too painful to commit to forver frozen ABI for new utility APIs. The git submodule approach will much more easily allow breaking API/ABI, and iterate on APIs until they either land in GLib or not. Note that libglnx will not use GFile*, so a full port to it will involve also not using that. Thus, it will be necessarily incremental; in the meantime we'll link to both libgsystem and libglnx.
2015-02-15 21:56:14 +03:00
noinst_LTLIBRARIES += libglnx.la
Link lib/ against libpriv/, use it to share sack loading function On the plus side, we share some code between the library and the binary now. On the downside, because `librpmostreepriv.la` is a noinst library, its code text is duplicated between the shared library and binary, at least until we either: - Have the binary solely use the public shared library (like ostree does) - Install `librpmostreepriv.so` to e.g. `/usr/lib64/rpm-ostree/librpmostreepriv.so` without the headers being public
2015-04-17 21:03:24 +03:00
include Makefile-libpriv.am
Add a public shared library, with "rpm -qa" for commit functionality This will help build release engineering and other types of tools; for example, rather than parsing the output of `db diff`, one should be able to call an API. Initially, this adds the generic infrastructure for a public shared library, with a new function call to do the equivalent of `rpm -qa` on a particular OSTree commit. Closes: https://github.com/projectatomic/rpm-ostree/issues/117 Closes: https://github.com/projectatomic/rpm-ostree/pull/124
2015-03-20 03:45:30 +03:00
include Makefile-lib.am
daemon: Start of work on daemon
2015-04-28 04:22:58 +03:00
include Makefile-daemon.am
Initial import from pkgsys-ostree
2013-12-22 04:41:30 +04:00
include Makefile-rpm-ostree.am
Import some basic testing infrastructure from OSTree This is using the https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests model. In order to run the tests, you will need to: ./configure --enable-installed-tests Then: gnome-desktop-testing-runner -p 0 rpm-ostree/
2014-07-16 17:02:45 +04:00
include Makefile-tests.am
Add basic man page
2014-03-25 16:24:19 +04:00
include Makefile-man.am
build: Hook up bash completions Follow-up to #1499. This is mostly based on https://github.com/ostreedev/ostree/pull/1077. Closes: #1772 Approved by: rfairley
2019-03-06 20:31:36 +03:00
include Makefile-bash.am
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
-include $(top_srcdir)/git.mk
Reference in New Issue Copy Permalink