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

112 lines
4.0 KiB
Plaintext
Raw Normal View History

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
# Copyright (C) 2015 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.
noinst_LTLIBRARIES += librpmostreepriv.la
librpmostreepriv_la_SOURCES = \
src/libpriv/rpmostree-postprocess.c \
src/libpriv/rpmostree-postprocess.h \
src/libpriv/rpmostree-json-parsing.c \
src/libpriv/rpmostree-json-parsing.h \
src/libpriv/rpmostree-util.c \
src/libpriv/rpmostree-util.h \
libpriv: add new rpmostree-types.h There are types that we want to share between the daemon and the client for deduplication. Those are, as expected, related to D-Bus things like formats and enums. Let's create a new file for it rather than shove it in `rpmostree-util.h`. As mentioned in the file, some of these probably belong better directly in the public API. Closes: #1147 Approved by: cgwalters
2018-01-22 19:44:16 +03:00
src/libpriv/rpmostree-types.h \
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
src/libpriv/rpmostree-passwd-util.c \
src/libpriv/rpmostree-passwd-util.h \
libpriv: Add RpmOstreeRefTs and API to create one from a commit This API is intended for use by the caching framework to hold open an rpmdb for the previous commit.
2015-05-22 17:54:41 +03:00
src/libpriv/rpmostree-refts.h \
src/libpriv/rpmostree-refts.c \
Rename rpmostree-hif.[ch] -> core This is really going to be the heart of rpm-ostree, so let's give it a better name.
2016-02-09 18:38:38 +03:00
src/libpriv/rpmostree-core.c \
src/libpriv/rpmostree-core.h \
core: Split out a -private.h header with struct Prep for doing the "single object, multiple .c files" pattern like is done in e.g. libostree with OstreeRepo and `ostree-repo-{refs,commit.c}` etc. For jigdo we'll need to split things up (see what I did there?). Closes: #1168 Approved by: jlebon
2017-12-21 14:29:30 +03:00
src/libpriv/rpmostree-core-private.h \
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
src/libpriv/rpmostree-bwrap.cxx \
lib: Extract bwrap-executing internal API The treecompose code will learn how to use bwrap instead of libcontainer in libglnx, since the latter is a buggy copy of a subset of the former. Closes: #429 Approved by: jlebon
2016-08-12 20:03:23 +03:00
src/libpriv/rpmostree-bwrap.h \
libpriv: Introduce an rpmostree-kernel.[ch] for dracut Since the dracut run is now separated from the rest of postprocess, we change it to use the bwrap API diretly, and this lets use the new _IMMUTABLE bwrap type. This will make it easier to reuse for client-side initramfs regeneration. Splitting this off makes it also easier to simplify the remaining mutable usage in postprocess.c. Closes: #560 Approved by: jlebon
2017-01-06 06:55:11 +03:00
src/libpriv/rpmostree-kernel.c \
src/libpriv/rpmostree-kernel.h \
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
src/libpriv/rpmostree-origin.c \
src/libpriv/rpmostree-origin.h \
core: Initial implementation of %posttrans using bwrap+rofiles-fuse In order to make many things work, we need to run scripts. Short version: For now, we: - Run `%posttrans` - Treat most `%post` as the same as `%posttrans` - Ignore `%preun` and such since we never uninstall Most importantly though, we start to build up an "override" list for script handling. Currently it's just a blacklist of scripts we don't need. Significant work here would be needed to run Lua scripts, so far I've been able to just skip them. Closes: #338 Approved by: jlebon
2016-06-17 22:14:24 +03:00
src/libpriv/rpmostree-scripts.c \
src/libpriv/rpmostree-scripts.h \
(cleanup): Move the refsack and root loading code into libpriv We had `src/lib` having its own little private library; I wanted to use some of it inside `src/libpriv`, so let's consistently have all private utility code in `src/libpriv`. Closes: https://github.com/projectatomic/rpm-ostree/pull/147
2015-05-20 20:21:48 +03:00
src/libpriv/rpmostree-refsack.h \
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
src/libpriv/rpmostree-refsack.cxx \
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
src/libpriv/rpmostree-rpm-util.c \
src/libpriv/rpmostree-rpm-util.h \
libpriv: Rename "unpacker" to "importer", split off "unpacker-core" In the jigdo path we don't actually want to import the OIRPM literally into ostree. I considered adding jigdo logic into `rpmostree-unpacker.c` but it'd be a mess as the functionality is quite logically separate from importing. So split off an `unpacker-core.c` file which has the bare libarchive+RPM helpers, and rename `RpmOstreeUnpacker` to `RpmOstreeImporter`. Closes: #1110 Approved by: jlebon
2017-11-18 00:57:05 +03:00
src/libpriv/rpmostree-importer.c \
src/libpriv/rpmostree-importer.h \
src/libpriv/rpmostree-unpacker-core.c \
src/libpriv/rpmostree-unpacker-core.h \
daemon: add TaskBegin, TaskEnd, and PercentProgress Closes: #260 Approved by: cgwalters
2016-05-10 19:17:26 +03:00
src/libpriv/rpmostree-output.c \
src/libpriv/rpmostree-output.h \
app/libpriv: add editor option for karg command Add editor option for kernel arguments. The logic was taken from the ostree-commit editor. The user now can edit the kernel arguments from an editor. The synchronization related issue is resolved by reloading the sysroot and see if the sysroot has been changed since the call of the editor prompt. Closes: #1097 Approved by: jlebon
2017-11-02 23:24:37 +03:00
src/libpriv/rpmostree-editor.c \
src/libpriv/rpmostree-editor.h \
status: Import systemd bits to use UTF-8 circle It's slightly prettier, but this is just laying some groundwork/precedent for importing more systemd code and using it for our formatting. Closes: #295 Approved by: jlebon
2016-05-29 21:15:29 +03:00
src/libpriv/libsd-locale-util.c \
src/libpriv/libsd-locale-util.h \
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
src/libpriv/libsd-time-util.c \
src/libpriv/libsd-time-util.h \
Introduce experimental "rpm-ostree jigdo" Tracking issue: https://github.com/projectatomic/rpm-ostree/issues/1081 To briefly recap: Let's experiment with doing ostree-in-RPM, basically the "compose" process injects additional data (SELinux labels for example) in an "ostree image" RPM, like `fedora-atomic-host-27.8-1.x86_64.rpm`. That "ostree image" RPM will contain the OSTree commit+metadata, and tell us what RPMs we need need to download. For updates, like `yum update` we only download changed RPMs, plus the new "oirpm". But SELinux labeling, depsolving, etc. are still done server side, and we still have a reliable OSTree commit checksum. This is a lot like [Jigdo](http://atterer.org/jigdo/) Here we fully demonstrate the concept working end-to-end; we use the "traditional" `compose tree` to commit a bunch of RPMs to an OSTree repo, which has a checksum, version etc. Then the new `ex commit2jigdo` generates the "oirpm". This is the "server side" operation. Next simulating the client side, `jigdo2commit` takes the OIRPM and uses it and downloads the "jigdo set" RPMs, fully regenerating *bit for bit* the final OSTree commit. If you want to play with this, I'd take a look at the `test-jigdo.sh`; from there you can find other useful bits like the example `fedora-atomic-host.spec` file (though the canonical copy of this will likely land in the [fedora-atomic](http://pagure.io/fedora-atomic) manifest git repo. Closes: #1103 Approved by: jlebon
2017-11-09 22:54:33 +03:00
src/libpriv/rpmostree-libarchive-input-stream.c \
src/libpriv/rpmostree-libarchive-input-stream.h \
daemon: add TaskBegin, TaskEnd, and PercentProgress Closes: #260 Approved by: cgwalters
2016-05-10 19:17:26 +03:00
$(NULL)
Add --enable-rojig, disable by default We're seeing some CI failures that I think are a bug in rojig. In the bigger picture...we never actually started using this, and I think longer term shipping os updates via containers probably makes more sense. I put a *lot* of effort into this code and it's pretty cool so it's hard to just delete it. And *maybe* someone out there is using it (but I doubt it). So rather than just deleting it entirely let's make it a build-time option. I verified that it builds at least.
2020-10-22 20:33:45 +03:00
if BUILDOPT_ROJIG
librpmostreepriv_la_SOURCES += \
src/libpriv/rpmostree-rojig-build.c \
src/libpriv/rpmostree-rojig-build.h \
src/libpriv/rpmostree-rojig-assembler.c \
src/libpriv/rpmostree-rojig-assembler.h \
src/libpriv/rpmostree-rojig-core.h \
src/libpriv/rpmostree-rojig-client.c \
$(NULL)
endif
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
rpmostreepriv_common_cflags = -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 \
-I$(libglnx_srcpath) \
scripts: Ignore new glibc lua %post Tried a `--unified-core` build of Silverblue and it blew up on this. Just copy-pasting the comment in the code: https://src.fedoraproject.org/rpms/glibc/c/34927af202deb7d97dbb211a3cb13b1c53b496d3?branch=master From a read of that script, none of it is necessary for rpm-ostree. It's about working around bugs from a traditional RPM in-place update, but rpm-ostree always starts from a clean filesystem checkout. Closes: #1869 Approved by: jlebon
2019-07-13 20:22:04 +03:00
-DLIBDIR=\"$(libdir)\" \
daemon: add TaskBegin, TaskEnd, and PercentProgress Closes: #260 Approved by: cgwalters
2016-05-10 19:17:26 +03:00
-DPKGLIBDIR=\"$(pkglibdir)\" \
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 \
daemon: add TaskBegin, TaskEnd, and PercentProgress Closes: #260 Approved by: cgwalters
2016-05-10 19:17:26 +03:00
$(PKGDEP_RPMOSTREE_CFLAGS) \
$(NULL)
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
librpmostreepriv_la_CFLAGS = $(AM_CFLAGS) $(rpmostreepriv_common_cflags)
librpmostreepriv_la_CXXFLAGS = $(AM_CXXFLAGS) $(rpmostreepriv_common_cflags)
daemon: add TaskBegin, TaskEnd, and PercentProgress Closes: #260 Approved by: cgwalters
2016-05-10 19:17:26 +03:00
librpmostreepriv_la_LIBADD = \
$(PKGDEP_RPMOSTREE_LIBS) \
libglnx.la \
$(CAP_LIBS) \
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
$(NULL)
core: Initial implementation of %posttrans using bwrap+rofiles-fuse In order to make many things work, we need to run scripts. Short version: For now, we: - Run `%posttrans` - Treat most `%post` as the same as `%posttrans` - Ignore `%preun` and such since we never uninstall Most importantly though, we start to build up an "override" list for script handling. Currently it's just a blacklist of scripts we don't need. Significant work here would be needed to run Lua scripts, so far I've been able to just skip them. Closes: #338 Approved by: jlebon
2016-06-17 22:14:24 +03:00
Update for libhif -> libdnf Still not many PRs outstanding, so it's a good time to take this plunge. Mostly automated via `sed`. Closes: #416 Approved by: Conan-Kudo
2016-08-03 21:30:17 +03:00
# bundled libdnf
Rebase to latest libdnf This brings us back in sync with the latest libdnf git master. This required a bunch of work both on the libdnf and rpm-ostree side to get working. See e.g. https://github.com/rpm-software-management/libdnf/issues/645. A few things to adapt to: - soname bump to `libdnf.so.2` - `DnfAdvisory` is no longer a `GObject` (annoyingly it's not replaced by something we can keep a ref on, so this requires some hacks to steal from the `GPtrArray` -- could enhance libdnf for this later) - disable SWDB history writing - use new reldep public API - update for latest `hy_subject_get_best_selector()` API This now unlocks the possibility to add support for modules. (One can see hints of this in the diff by the fact that `libdnf` links to `libmodulemd1`.) Update submodule: libdnf Closes: #1404 Approved by: cgwalters
2019-03-14 17:06:31 +03:00
EXTRA_librpmostreepriv_la_DEPENDENCIES = libdnf.so.2
Switch to using libhif as a git submodule So I was trying to hack on my host's copy of rpm-ostree inside a pet docker container, but ran into a conflict with libhif since dnf uses it. I think we basically need to *always* build the bundled path, rather than what I'm doing with CAHC and FADC where it's built as a regular RPM. It's not really sustainable right now for us to have both bundled and not-bundled build paths - and we need to support co-installation with dnf. Another major issue is that we want to version lock with libhif - right now our CI and both CAHC/FADC track libhif master, but that means everything breaks if libhif breaks and we don't immediately port. git submodules solve all of these problems - the same as we're doing with libglnx. libglnx is *designed* for use as a git submodule, where as libhif needs to support being both bundled and not-bundled. So we end up with some hacks on our side, but I think it's all not too bad. I've marked build rules with `# bundled libhif` so we know where to find them later when libhif is stable. Closes: #357 Approved by: jlebon
2016-06-29 04:33:02 +03:00
core: Initial implementation of %posttrans using bwrap+rofiles-fuse In order to make many things work, we need to run scripts. Short version: For now, we: - Run `%posttrans` - Treat most `%post` as the same as `%posttrans` - Ignore `%preun` and such since we never uninstall Most importantly though, we start to build up an "override" list for script handling. Currently it's just a blacklist of scripts we don't need. Significant work here would be needed to run Lua scripts, so far I've been able to just skip them. Closes: #338 Approved by: jlebon
2016-06-17 22:14:24 +03:00
gperf_gperf_sources = src/libpriv/rpmostree-script-gperf.gperf
BUILT_SOURCES += $(gperf_gperf_sources:-gperf.gperf=-gperf.c)
CLEANFILES += $(gperf_gperf_sources:-gperf.gperf=-gperf.c)
nodist_librpmostreepriv_la_SOURCES = src/libpriv/rpmostree-script-gperf.c
core: Process `systemctl preset` in `%post` Rather than entirely symlinking `systemctl` → `/bin/true`, in order to e.g. have NetworkManager be enabled, we need to process presets. This is one of the things that's breaking FAHC where I did a `--ex-unified-core` deployment. (Actually it's a bit tempting to run a mass preset pass at the end, but for now let's do this) Implementation note: this is our first use of GResources, which is a handy way to embed data into our final binary. Closes: https://github.com/projectatomic/rpm-ostree/issues/550 Closes: #1148 Approved by: jlebon
2017-12-14 01:17:03 +03:00
rpmostree-libpriv-gresources.c: src/libpriv/gresources.xml Makefile $(shell glib-compile-resources --sourcedir=$(srcdir)/src/libpriv --generate-dependencies $(srcdir)/src/libpriv/gresources.xml)
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir)/src/libpriv --generate-source --c-name _rpmostree_ $<
BUILT_SOURCES += rpmostree-libpriv-gresources.c
librpmostreepriv_la_SOURCES += rpmostree-libpriv-gresources.c
core: Initial implementation of %posttrans using bwrap+rofiles-fuse In order to make many things work, we need to run scripts. Short version: For now, we: - Run `%posttrans` - Treat most `%post` as the same as `%posttrans` - Ignore `%preun` and such since we never uninstall Most importantly though, we start to build up an "override" list for script handling. Currently it's just a blacklist of scripts we don't need. Significant work here would be needed to run Lua scripts, so far I've been able to just skip them. Closes: #338 Approved by: jlebon
2016-06-17 22:14:24 +03:00
AM_V_GPERF = $(AM_V_GPERF_$(V))
AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
AM_V_GPERF_0 = @echo " GPERF " $@;
src/%.c: src/%.gperf Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GPERF)$(GPERF) < $< > $@.tmp && mv $@.tmp $@
Reference in New Issue Copy Permalink