shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-25 01:34:34 +03:00
Code Issues Projects Releases Wiki Activity
22e753176e
ostree/Makefile-ostree.am

140 lines
4.7 KiB
Plaintext
Raw Normal View History

De-recursify source tree
2011-11-02 23:45:32 +04:00
# Makefile for C source code
#
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
#
Switch to LGPLv2+ for most code Since we're making a shared library, it should be usable by non-GPL apps. To allow more code sharing between the core and the tests, move them to the LGPLv2+ too. A few bits of test and other code are still GPL. See the new COPYING file for more information.
2011-11-10 22:17:04 +04:00
# 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.
De-recursify source tree
2011-11-02 23:45:32 +04:00
#
Switch to LGPLv2+ for most code Since we're making a shared library, it should be usable by non-GPL apps. To allow more code sharing between the core and the tests, move them to the LGPLv2+ too. A few bits of test and other code are still GPL. See the new COPYING file for more information.
2011-11-10 22:17:04 +04:00
# This library is distributed in the hope that it will be useful,
De-recursify source tree
2011-11-02 23:45:32 +04:00
# but WITHOUT ANY WARRANTY; without even the implied warranty of
Switch to LGPLv2+ for most code Since we're making a shared library, it should be usable by non-GPL apps. To allow more code sharing between the core and the tests, move them to the LGPLv2+ too. A few bits of test and other code are still GPL. See the new COPYING file for more information.
2011-11-10 22:17:04 +04:00
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
De-recursify source tree
2011-11-02 23:45:32 +04:00
#
Switch to LGPLv2+ for most code Since we're making a shared library, it should be usable by non-GPL apps. To allow more code sharing between the core and the tests, move them to the LGPLv2+ too. A few bits of test and other code are still GPL. See the new COPYING file for more information.
2011-11-10 22:17:04 +04:00
# 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.
De-recursify source tree
2011-11-02 23:45:32 +04:00
bin_PROGRAMS += ostree
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
ostree_SOURCES = src/ostree/main.c \
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
src/ostree/ot-builtin-admin.c \
admin: Rework /ostree/deploy to support multiple independent operating systems The real vision of OSTree is to "multiple versions of multiple operating systems". Up until now, it's worked to install gnome-ostree inside a host distribution, but several things don't work quite right if you try to do completely different systems. In the new model, there's the concept of an "osname" which encompasses a few properties: 1) Its own /var 2) A set of trees deployed in /ostree/deploy/OSNAME/ 3) Its own "current" and "previous" links. Now it no longer really makes sense to boot with "ostree=current". Instead, you specify e.g. "ostree=gnome/current". This is an incompatible change to the deployment code - you will need to run init-os gnome and redeploy. All "ostree admin" subcommands now take an OSNAME argument.
2012-12-20 02:52:46 +04:00
src/ostree/ot-builtins.h \
core: Add 'cat' builtin
2012-03-05 20:32:48 +04:00
src/ostree/ot-builtin-cat.c \
core: Add ability for repositories to have a "parent" This will be useful for ostbuild; a user can create their own archive mode repository which transparently inherits objects from the root-owned one in /ostree.
2012-04-17 05:21:50 +04:00
src/ostree/ot-builtin-config.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-checkout.c \
core: Add checksum builtin This necessitated reworking things so that builtins can specify no --repo is required.
2011-11-18 16:29:13 +04:00
src/ostree/ot-builtin-checksum.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-commit.c \
src/ostree/ot-builtin-diff.c \
Add an `export` builtin, and API to write to libarchive At the moment I'm looking at using rpm-ostree to manage RPM inputs which can then be converted into Docker images. It's most convenient if we can stream directly out of libostree rather than doing a checkout + tar combination. There are also backup/debugging etc. reasons to implement `export` as well.
2016-01-28 22:41:27 +03:00
src/ostree/ot-builtin-export.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-fsck.c \
ostree: Add gpg-sign command Signs a commit with one or more GPG keys.
2015-02-25 21:55:14 +03:00
src/ostree/ot-builtin-gpg-sign.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-init.c \
core: Rename local-clone to pull-local Also change it to copy selective refs, rather than enumerating all objects.
2012-05-02 01:43:26 +04:00
src/ostree/ot-builtin-pull-local.c \
Add 'ostree log' command Follows the parent of commits showing each in turn until it reaches the top of the commit tree. https://bugzilla.gnome.org/show_bug.cgi?id=705973
2013-08-14 13:47:30 +04:00
src/ostree/ot-builtin-log.c \
core: Add ls builtin
2011-11-28 05:10:48 +04:00
src/ostree/ot-builtin-ls.c \
core: Add "prune" builtin This should be useful on clients to trim old refs. For example, after an upgrade the system could do: ostree --repo=/ostree/repo prune --depth=2 gnomeos-3.4-i686-runtime This would remote all objects that aren't in the current build and the previous one.
2012-02-24 19:23:35 +04:00
src/ostree/ot-builtin-prune.c \
Add "refs" builtin This is just useful to look at before pruning, etc.
2013-06-29 22:51:08 +04:00
src/ostree/ot-builtin-refs.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-remote.c \
Add 'ostree reset' command to undo a bad commit Accepts the following arguments: ref checksum Checks that the checksum is a parent of the ref before rewriting the ref. https://bugzilla.gnome.org/show_bug.cgi?id=705979
2013-08-14 14:42:13 +04:00
src/ostree/ot-builtin-reset.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-rev-parse.c \
Add repository "summary" file and metalink support For Fedora and potentially other distributions which use globally distributed mirrors, metalink is a popular solution to redirect clients to a dynamic set of mirrors. In order to make metalink work though, it needs *one* file which can be checksummed. (Well, potentially we could explode all refs into the metalink.xml, but that would be a lot more invasive, and a bit weird as we'd end up checksumming the checksum file). This commit adds a new command: $ ostree summary -u To regenerate the summary file. Can only be run by one process at a time. After that's done, the metalink can be generated based on it, and the client fetch code will parse and load it. https://bugzilla.gnome.org/show_bug.cgi?id=729585
2014-08-01 02:50:19 +04:00
src/ostree/ot-builtin-summary.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-show.c \
Initial basic static delta code drop This has a very basic level of functionality (deltas can be generated, and applied offline). There is only some stubbed out pull code to fetch them via HTTP. But, better to commit this now and improve it from a known starting point, rather than have it languish in a branch.
2013-08-15 17:17:37 +04:00
src/ostree/ot-builtin-static-delta.c \
core: Split pull functionality into separate ostree-pull binary This is to avoid everything depending on libsoup.
2011-11-30 18:21:14 +04:00
src/ostree/ot-main.h \
src/ostree/ot-main.c \
Intelligible display for 'ostree show' Show something similar to git metadata display. Show raw variant data when --raw is specified https://bugzilla.gnome.org/show_bug.cgi?id=705973
2013-08-14 13:25:32 +04:00
src/ostree/ot-dump.h \
src/ostree/ot-dump.c \
ostree: Support for using EDITOR to fill commit subject/body Behave similar to git when 'ostree commit' is run without a --subject or --body. Bring up an editor. The first line becomes the subject and following lines become the --body after an optional blank line. Use similar logic to git in determining EDITOR https://bugzilla.gnome.org/show_bug.cgi?id=707063
2013-08-29 19:23:20 +04:00
src/ostree/ot-editor.c \
src/ostree/ot-editor.h \
prune: add --keep-younger-than=DATE The format used for DATE is "%Y-%m-%d %H:%M:%S %z" Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-06 11:50:17 +03:00
src/ostree/parse-datetime.h \
src/ostree/parse-datetime.c \
De-recursify source tree
2011-11-02 23:45:32 +04:00
$(NULL)
core: Support being built without libsoup-gnome While bootstrapping gnomeos, it's really handy if we can be built without pull support, because libsoup-gnome pulls in a huge set of dependencies.
2011-11-15 00:08:09 +04:00
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
# Admin subcommand
ostree_SOURCES += \
admin init-fs: New builtin Should be used when initializing a new root filesystem for a "pure OSTree" system; for example, what "ostbuild privhelper-deploy-qemu" does when creating a filesystem image loopback.
2012-12-10 02:01:51 +04:00
src/ostree/ot-admin-builtin-init-fs.c \
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
src/ostree/ot-admin-builtin-diff.c \
src/ostree/ot-admin-builtin-deploy.c \
admin: Add an "undeploy" command Otherwise it's really easy to keep accumulating deployments. Also, we may want to run this after rebooting, so we're back down to one operating system.
2013-07-23 17:19:24 +04:00
src/ostree/ot-admin-builtin-undeploy.c \
Add "ostree admin instutil", move selinux-ensure-labeled there There are going to be a few utilities that are only useful for installers and disk image creation tools. Let's not expose them all at the toplevel; instead, hide them under "instutil".
2014-03-17 20:28:36 +04:00
src/ostree/ot-admin-builtin-instutil.c \
admin: Rename prune -> cleanup, avoid doing repo prune twice Calling it "cleanup" is better since it does more than repo pruning. We were also doing a prune twice; ot_admin_cleanup() already does one, so drop the bits to do it in cleanup.c.
2013-07-16 00:13:12 +04:00
src/ostree/ot-admin-builtin-cleanup.c \
admin: Rework /ostree/deploy to support multiple independent operating systems The real vision of OSTree is to "multiple versions of multiple operating systems". Up until now, it's worked to install gnome-ostree inside a host distribution, but several things don't work quite right if you try to do completely different systems. In the new model, there's the concept of an "osname" which encompasses a few properties: 1) Its own /var 2) A set of trees deployed in /ostree/deploy/OSNAME/ 3) Its own "current" and "previous" links. Now it no longer really makes sense to boot with "ostree=current". Instead, you specify e.g. "ostree=gnome/current". This is an incompatible change to the deployment code - you will need to run init-os gnome and redeploy. All "ostree admin" subcommands now take an OSNAME argument.
2012-12-20 02:52:46 +04:00
src/ostree/ot-admin-builtin-os-init.c \
admin: Add set-origin command See projectatomic/rpm-ostree#42 for rationale. There are two high level use cases: - If the OS comes unconfigured, this is a way to point it at a repo of your choice. - To switch between repositories while keeping the same branch easily.
2015-01-16 21:07:26 +03:00
src/ostree/ot-admin-builtin-set-origin.c \
[INCOMPATIBLE CHANGE] Implement new deployment model See https://wiki.gnome.org/OSTree/DeploymentModel2 This is a major rework of the on-disk filesystem layout, and the boot process. OSTree now explicitly supports upgrading kernels, and these upgrades are also atomic. The core concept of the new model is the "deployment list", which is an ordered list of bootable operating system trees. The deployment list is reflected in the bootloader configuration; which has a kernel argument that tells the initramfs (dracut) which operating system root to use. Invidiual notable changes that come along with this: 1) Operating systems should now come with their etc in usr/etc; OSTree will perform a 3-way merge at deployment time, and place etc in the actual root. This avoids the need for a bind mount, and is just a lot cleaner. 2) OSTree no longer bind mounts /root, /home, and /tmp. It is expected that the the OS/ has these as symbolic links into /var. At the moment, OSTree only supports managing syslinux; other bootloader backends will follow.
2013-06-29 19:45:53 +04:00
src/ostree/ot-admin-builtin-status.c \
admin/switch: New builtin to switch between trees This is something I want to make easier, as it better showcases the flexibility of OSTree.
2014-01-19 02:42:24 +04:00
src/ostree/ot-admin-builtin-switch.c \
admin: Rework /ostree/deploy to support multiple independent operating systems The real vision of OSTree is to "multiple versions of multiple operating systems". Up until now, it's worked to install gnome-ostree inside a host distribution, but several things don't work quite right if you try to do completely different systems. In the new model, there's the concept of an "osname" which encompasses a few properties: 1) Its own /var 2) A set of trees deployed in /ostree/deploy/OSNAME/ 3) Its own "current" and "previous" links. Now it no longer really makes sense to boot with "ostree=current". Instead, you specify e.g. "ostree=gnome/current". This is an incompatible change to the deployment code - you will need to run init-os gnome and redeploy. All "ostree admin" subcommands now take an OSNAME argument.
2012-12-20 02:52:46 +04:00
src/ostree/ot-admin-builtin-upgrade.c \
admin: Add an `unlock` command, and libostree API I'm trying to improve the developer experience on OSTree-managed systems, and I had an epiphany the other day - there's no reason we have to be absolutely against mutating the current rootfs live. The key should be making it easy to rollback/reset to a known good state. I see this command as useful for two related but distinct workflows: - `ostree admin unlock` will assume you're doing "development". The semantics hare are that we mount an overlayfs on `/usr`, but the overlay data is in `/var/tmp`, and is thus discarded on reboot. - `ostree admin unlock --hotfix` first clones your current deployment, then creates an overlayfs over `/usr` persistent to this deployment. Persistent in that now the initramfs switchroot tool knows how to mount it as well. In this model, if you want to discard the hotfix, at the moment you roll back/reboot into the clone. Note originally, I tried using `rofiles-fuse` over `/usr` for this, but then everything immediately explodes because the default (at least CentOS 7) SELinux policy denies tons of things (including `sshd_t` access to `fusefs_t`). Sigh. So the switch to `overlayfs` came after experimentation. It still seems to have some issues...specifically `unix_chkpwd` is broken, possibly because it's setuid? Basically I can't ssh in anymore. But I *can* `rpm -Uvh strace.rpm` which is handy. NOTE: I haven't tested the hotfix path fully yet, specifically the initramfs bits.
2016-03-18 22:32:58 +03:00
src/ostree/ot-admin-builtin-unlock.c \
build: Add one header file missing from dist
2012-09-26 03:13:05 +04:00
src/ostree/ot-admin-builtins.h \
Add "ostree admin instutil", move selinux-ensure-labeled there There are going to be a few utilities that are only useful for installers and disk image creation tools. Let's not expose them all at the toplevel; instead, hide them under "instutil".
2014-03-17 20:28:36 +04:00
src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c \
core: Add "admin instutil set-kargs" This will be used by Anaconda as a convenience command to set the bootloader arguments.
2014-03-18 03:24:56 +04:00
src/ostree/ot-admin-instutil-builtin-set-kargs.c \
libostree: Add initial GRUB2 support In this approach, we drop a /etc/grub.d/15_ostree file which is a hybrid of shell/C that picks up bits from the GRUB2 library (e.g. the block device script generation), and then calls into libostree's GRUB2 code which knows about the BLS entries. This is admittedly ugly. There exists another approach for GRUB2 to learn the BLS specification. However, the spec has a few issues: https://www.redhat.com/archives/anaconda-devel-list/2014-July/msg00002.html This approach also gives a bit more control to the admin via the naming of the 15_ostree symlink; they can easily disable it: Or reorder the ostree entries ahead of 10_linux: Also, this approach doesn't require patches for grub2, which is an issue with the pressure to backport (rpm-)OSTree to EL7.
2014-10-11 16:59:06 +04:00
src/ostree/ot-admin-instutil-builtin-grub2-generate.c \
Add "ostree admin instutil", move selinux-ensure-labeled there There are going to be a few utilities that are only useful for installers and disk image creation tools. Let's not expose them all at the toplevel; instead, hide them under "instutil".
2014-03-17 20:28:36 +04:00
src/ostree/ot-admin-instutil-builtins.h \
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
src/ostree/ot-admin-functions.h \
src/ostree/ot-admin-functions.c \
$(NULL)
ostree: Split up "remote" subcommands To make room for "remote gpg-import", which will be non-trivial. ot-builtin-remote.c was already a little too crowded anyway. Also while we're at it, port this bit of code away from libgsystem.
2015-04-29 18:09:40 +03:00
# Remote subcommand
ostree_SOURCES += \
src/ostree/ot-remote-builtins.h \
src/ostree/ot-remote-builtin-add.c \
src/ostree/ot-remote-builtin-delete.c \
ostree: Add a "remote gpg-import" command Imports GPG keys into a remote-specific keyring.
2015-05-01 16:09:42 +03:00
src/ostree/ot-remote-builtin-gpg-import.c \
ostree: Split up "remote" subcommands To make room for "remote gpg-import", which will be non-trivial. ot-builtin-remote.c was already a little too crowded anyway. Also while we're at it, port this bit of code away from libgsystem.
2015-04-29 18:09:40 +03:00
src/ostree/ot-remote-builtin-list.c \
src/ostree/ot-remote-builtin-show-url.c \
remote: Add "ostree remote summary" command Downloads and prints a remote summary file and any signatures in an easy-to-read format, or alternatively with the --raw option, prints the summary GVariant data directly. https://bugzilla.gnome.org/show_bug.cgi?id=759250
2015-12-17 02:55:28 +03:00
src/ostree/ot-remote-builtin-refs.c \
src/ostree/ot-remote-builtin-summary.c \
ostree: Split up "remote" subcommands To make room for "remote gpg-import", which will be non-trivial. ot-builtin-remote.c was already a little too crowded anyway. Also while we're at it, port this bit of code away from libgsystem.
2015-04-29 18:09:40 +03:00
$(NULL)
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
if USE_CURL_OR_SOUP
ostree_SOURCES += src/ostree/ot-remote-builtin-add-cookie.c \
src/ostree/ot-remote-builtin-delete-cookie.c \
src/ostree/ot-remote-builtin-list-cookies.c \
src/ostree/ot-remote-cookie-util.h \
src/ostree/ot-remote-cookie-util.c \
$(NULL)
build: Make libsoup optional again The "remote cookies" code broke this. While I'm not sure anyone is actually using ostree-without-http, it isn't too hard to keep the build time conditional going. Further, this work is preparatory for libcurl porting. Closes: #621 Approved by: jlebon
2016-12-08 05:16:52 +03:00
endif
build: Delete generated parse-datetime.c file, use AM_V_GEN Bison is a well known external dependency, so just require it. Including the generated content in git means it may or may not be regenerated based randomly on timestamps, etc. Also use `$(AM_V_GEN)` so we get prettier output.
2015-12-07 18:33:23 +03:00
src/ostree/parse-datetime.c: src/ostree/parse-datetime.y Makefile
$(AM_V_GEN) $(YACC) $< -o $@
parse-datetime: use the module from gnulib Use the parse-datetime module from gnulib, and adapt it to not require other modules as portability is not really an issue for us. DATE can be specified in different formats, such as: "-1 week", "last monday", "1 week ago". Include the generated .c file in the repository so to not add another dependency to Bison. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-25 12:37:21 +03:00
build: 'make clean' removes parse-datetime.c and fix make dist while at it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2016-01-29 13:02:17 +03:00
EXTRA_DIST += src/ostree/parse-datetime.y
CLEANFILES += src/ostree/parse-datetime.c
parse-datetime: use the module from gnulib Use the parse-datetime module from gnulib, and adapt it to not require other modules as portability is not really an issue for us. DATE can be specified in different formats, such as: "-1 week", "last monday", "1 week ago". Include the generated .c file in the repository so to not add another dependency to Bison. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-25 12:37:21 +03:00
build-sys: Minor makefile tweaks I'm introducing a new binary in a later patch, and it makes sense to move more things to be common into the common section. Also I noticed we were missing an inclusion of common `$(AM_LDFLAGS)`, though AFAIK this doesn't break anything right now. Closes: #636 Approved by: jlebon
2016-12-29 23:57:53 +03:00
ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree \
libostree: add versioning macros OSTree currently provides no way to inspect the versioning information at run time, being only available at compile time through pkg-config. This is a problem for e.g. Flatpak, that needs to check whether the 'update-frequency' option is available. Checking at compile time isn't great since it's not looking for new symbols, but only if an optional feature is present. This commit, then, adds a new header that is generated at compile time, exposing OSTree's versioning information. Closes: #728 Approved by: cgwalters
2017-03-10 20:33:52 +03:00
-I$(builddir)/src/libostree -I$(srcdir)/src/ostree -I$(srcdir)/libglnx $(OT_INTERNAL_GIO_UNIX_CFLAGS) \
Split trivial-httpd into separate binary Working on the libcurl backend, I hit the issue that the trivial-httpd program depends on libsoup. I briefly considered having two versions, but libcurl is client only, and moreover trivial-httpd is no longer trivial - it has various features which are used by the test suite extensively. Hence, what we'll do is build it as a separate binary which links to libsoup, and use it during the tests. We *also* currently still provide `ostree trivial-httpd` since some things use it like `rpm-ostree-toolbox` and the Cockpit tests. After those are ported to use some other webserver, I plan to add a build-time option to drop it. Closes: #636 Approved by: jlebon
2016-12-30 22:18:34 +03:00
-DPKGLIBEXECDIR=\"$(pkglibexecdir)\"
build-sys: Minor makefile tweaks I'm introducing a new binary in a later patch, and it makes sense to move more things to be common into the common section. Also I noticed we were missing an inclusion of common `$(AM_LDFLAGS)`, though AFAIK this doesn't break anything right now. Closes: #636 Approved by: jlebon
2016-12-29 23:57:53 +03:00
ostree_bin_shared_ldadd = $(AM_LDFLAGS) libglnx.la libotutil.la libostree-1.la \
$(OT_INTERNAL_GIO_UNIX_LIBS)
ostree_CFLAGS = $(ostree_bin_shared_cflags)
ostree_LDADD = $(ostree_bin_shared_ldadd) libbsdiff.la libostree-kernel-args.la $(LIBSYSTEMD_LIBS)
core: Split pull functionality into separate ostree-pull binary This is to avoid everything depending on libsoup.
2011-11-30 18:21:14 +04:00
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
if USE_CURL_OR_SOUP
ostree_SOURCES += src/ostree/ot-builtin-pull.c
endif
Split trivial-httpd into separate binary Working on the libcurl backend, I hit the issue that the trivial-httpd program depends on libsoup. I briefly considered having two versions, but libcurl is client only, and moreover trivial-httpd is no longer trivial - it has various features which are used by the test suite extensively. Hence, what we'll do is build it as a separate binary which links to libsoup, and use it during the tests. We *also* currently still provide `ostree trivial-httpd` since some things use it like `rpm-ostree-toolbox` and the Cockpit tests. After those are ported to use some other webserver, I plan to add a build-time option to drop it. Closes: #636 Approved by: jlebon
2016-12-30 22:18:34 +03:00
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
if USE_LIBSOUP
# Eventually once we stop things from using this, we should support disabling this
ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c
Split trivial-httpd into separate binary Working on the libcurl backend, I hit the issue that the trivial-httpd program depends on libsoup. I briefly considered having two versions, but libcurl is client only, and moreover trivial-httpd is no longer trivial - it has various features which are used by the test suite extensively. Hence, what we'll do is build it as a separate binary which links to libsoup, and use it during the tests. We *also* currently still provide `ostree trivial-httpd` since some things use it like `rpm-ostree-toolbox` and the Cockpit tests. After those are ported to use some other webserver, I plan to add a build-time option to drop it. Closes: #636 Approved by: jlebon
2016-12-30 22:18:34 +03:00
pkglibexec_PROGRAMS += ostree-trivial-httpd
ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS)
libcurl backend For rpm-ostree, we already link to libcurl indirectly via librepo, and only having one HTTP library in process makes sense. Further, libcurl is (I think) more popular in the embedded space. It also supports HTTP/2.0 today, which is a *very* nice to have for OSTree. This seems to be working fairly well for me in my local testing, but it's obviously brand new nontrivial code, so it's going to need some soak time. The ugliest part of this is having to vendor in the soup-url code. With Oxidation we could follow the path of Firefox and use the [Servo URL parser](https://github.com/servo/rust-url). Having to redo cookie parsing also sucked, and that would also be a good oxidation target. But that's for the future. Closes: #641 Approved by: jlebon
2016-12-08 05:02:30 +03:00
if !USE_CURL
# This is necessary for the cookie jar bits
ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
ostree_LDADD += $(OT_INTERNAL_SOUP_LIBS)
endif
core: Support being built without libsoup-gnome While bootstrapping gnomeos, it's really handy if we can be built without pull support, because libsoup-gnome pulls in a huge set of dependencies.
2011-11-15 00:08:09 +04:00
endif
build: Link ostree with libarchive libarchive (when available) is being used in ot-builtin-export.c so it is necessary to link ostree with it. https://bugzilla.gnome.org/show_bug.cgi?id=762457
2016-02-22 17:02:47 +03:00
if USE_LIBARCHIVE
ostree_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)
ostree_LDADD += $(OT_DEP_LIBARCHIVE_LIBS)
endif
Reference in New Issue Copy Permalink