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

Disable "ostree trivial-httpd" by default now 

This goes farther along the path of deprecating it; consumers should
have been ported at this point.  Though probably a lot of people
may still use `rpm-ostree-toolbox`.

Closes: #723
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-03-07 17:32:50 -05:00 committed by Atomic Bot
parent fda4a47cae
commit b825aac0ea
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -143,6 +143,14 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes)
AC_ARG_ENABLE(trivial-httpd-cmdline,
[AS_HELP_STRING([--enable-trivial-httpd-cmdline],
[Continue to support "ostree trivial-httpd" [default=no]])],,
enable_trivial_httpd_cmdline=no)
AS_IF([test x$enable_trivial_httpd_cmdline = xyes],
[AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
)
AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [
AC_MSG_ERROR([Curl enabled, but libsoup is not; libsoup is needed for tests]) AC_MSG_ERROR([Curl enabled, but libsoup is not; libsoup is needed for tests])
]) ])
@ -420,6 +428,7 @@ echo "
Rust (internal oxidation): $rust_debug_release Rust (internal oxidation): $rust_debug_release
rofiles-fuse: $enable_rofiles_fuse rofiles-fuse: $enable_rofiles_fuse
HTTP backend: $fetcher_backend HTTP backend: $fetcher_backend
\"ostree trivial-httpd\": $enable_trivial_httpd_cmdline
SELinux: $with_selinux SELinux: $with_selinux
systemd: $have_libsystemd systemd: $have_libsystemd
libmount: $with_libmount libmount: $with_libmount

2
src/ostree/main.c
View File

@ -58,7 +58,7 @@ static OstreeCommand commands[] = {
{ "show", ostree_builtin_show }, { "show", ostree_builtin_show },
{ "static-delta", ostree_builtin_static_delta }, { "static-delta", ostree_builtin_static_delta },
{ "summary", ostree_builtin_summary }, { "summary", ostree_builtin_summary },
#ifdef HAVE_LIBSOUP #if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE)
{ "trivial-httpd", ostree_builtin_trivial_httpd }, { "trivial-httpd", ostree_builtin_trivial_httpd },
#endif #endif
{ NULL } { NULL }