packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Add --disable-static-deltas 

Since they're unstable, we want to allow organizations shipping ostree
now to be future proof against any changes.
This commit is contained in:
Colin Walters 2015-01-22 16:19:11 -05:00
parent f2e4830409
commit 8f4999c854
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -218,6 +218,15 @@ AS_IF([test "x$found_introspection" = xyes], [
], [have_gjs=no]) ], [have_gjs=no])
AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes) AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes)
AC_ARG_ENABLE(static_deltas,
AS_HELP_STRING([--enable-static-deltas],
[Enable static delta code (default: yes)]),,
[enable_static_deltas=yes])
AS_IF([test x$enable_static_deltas = xyes], [
AC_DEFINE(BUILDOPT_STATIC_DELTAS, 1, [Define if static deltas are enabled])
])
AM_CONDITIONAL(BUILDOPT_STATIC_DELTAS, test x$enable_static_deltas = xyes)
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
doc/Makefile doc/Makefile
@ -236,6 +245,7 @@ echo "
SELinux: $with_selinux SELinux: $with_selinux
libarchive (parse tar files directly): $with_libarchive libarchive (parse tar files directly): $with_libarchive
gpgme (sign commits): $with_gpgme gpgme (sign commits): $with_gpgme
static deltas: $enable_static_deltas
documentation: $enable_gtk_doc documentation: $enable_gtk_doc
gjs-based tests: $have_gjs gjs-based tests: $have_gjs
dracut: $with_dracut dracut: $with_dracut

2
src/libostree/ostree-repo-pull.c
View File

@ -1965,12 +1965,14 @@ ostree_repo_pull_with_options (OstreeRepo *self,
&from_revision, error)) &from_revision, error))
goto out; goto out;
#ifdef BUILDOPT_STATIC_DELTAS
if (from_revision == NULL || g_strcmp0 (from_revision, to_revision) != 0) if (from_revision == NULL || g_strcmp0 (from_revision, to_revision) != 0)
{ {
if (!request_static_delta_superblock_sync (pull_data, from_revision, to_revision, if (!request_static_delta_superblock_sync (pull_data, from_revision, to_revision,
&delta_superblock, cancellable, error)) &delta_superblock, cancellable, error))
goto out; goto out;
} }
#endif
if (!delta_superblock) if (!delta_superblock)
{ {