worldofpeace
5 years ago
committed by
GitHub
commit
4f3e9ca93a
@ -0,0 +1,21 @@ |
||||
{ libmodulemd, fetchurl }: |
||||
|
||||
libmodulemd.overrideAttrs(old: rec { |
||||
name = "libmodulemd-${version}"; |
||||
version = "1.8.15"; |
||||
|
||||
# Removes py output since there's no overrides here |
||||
outputs = [ "out" "devdoc" ]; |
||||
|
||||
patches = [ |
||||
# Checks for glib docs in glib's prefix |
||||
# but they're installed to another |
||||
./dont-check-docs.patch |
||||
]; |
||||
|
||||
src = fetchurl { |
||||
url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz"; |
||||
sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z"; |
||||
}; |
||||
|
||||
}) |
||||
@ -0,0 +1,59 @@ |
||||
{ stdenv |
||||
, fetchFromGitHub |
||||
, pkgconfig |
||||
, meson |
||||
, ninja |
||||
, gobject-introspection |
||||
, python3 |
||||
, libyaml |
||||
, gtk-doc |
||||
, docbook_xsl |
||||
, docbook_xml_dtd_412 |
||||
, glib |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "libmodulemd"; |
||||
version = "2.6.0"; |
||||
|
||||
outputs = [ "out" "devdoc" "py" ]; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "fedora-modularity"; |
||||
repo = pname; |
||||
rev = "${pname}-${version}"; |
||||
sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i"; |
||||
}; |
||||
|
||||
patches = [ |
||||
./pygobject-dir.patch |
||||
]; |
||||
|
||||
nativeBuildInputs = [ |
||||
pkgconfig |
||||
meson |
||||
ninja |
||||
gtk-doc |
||||
docbook_xsl |
||||
docbook_xml_dtd_412 |
||||
gobject-introspection |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
libyaml |
||||
glib |
||||
]; |
||||
|
||||
mesonFlags = [ |
||||
"-Ddeveloper_build=false" |
||||
"-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" |
||||
]; |
||||
|
||||
meta = with stdenv.lib; { |
||||
description = "C Library for manipulating module metadata files"; |
||||
homepage = "https://github.com/fedora-modularity/libmodulemd"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ ]; |
||||
platforms = platforms.linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,29 @@ |
||||
diff --git a/meson.build b/meson.build
|
||||
index 155c9e7..9125372 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -60,15 +60,15 @@ sh = find_program('sh')
|
||||
sed = find_program('sed')
|
||||
test = find_program('test')
|
||||
|
||||
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
|
||||
-if ret.returncode() != 0
|
||||
- error('Missing documentation for GLib.')
|
||||
-endif
|
||||
-
|
||||
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
|
||||
-if ret.returncode() != 0
|
||||
- error('Missing documentation for GObject.')
|
||||
-endif
|
||||
+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
|
||||
+# if ret.returncode() != 0
|
||||
+# error('Missing documentation for GLib.')
|
||||
+# endif
|
||||
+
|
||||
+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
|
||||
+# if ret.returncode() != 0
|
||||
+# error('Missing documentation for GObject.')
|
||||
+# endif
|
||||
|
||||
python_name = get_option('python_name')
|
||||
|
||||
@ -0,0 +1,45 @@ |
||||
diff --git a/bindings/python/meson.build b/bindings/python/meson.build
|
||||
index 4358b79..61fd5a5 100644
|
||||
--- a/bindings/python/meson.build
|
||||
+++ b/bindings/python/meson.build
|
||||
@@ -1,3 +1,5 @@
|
||||
+pygobject_override_dir = get_option('pygobject_override_dir')
|
||||
+
|
||||
get_overridedir = '''
|
||||
import os
|
||||
import sysconfig
|
||||
@@ -21,7 +23,7 @@ print(overridedir)
|
||||
'''
|
||||
|
||||
# Python 3
|
||||
-if (get_option('with_py3_overrides'))
|
||||
+if (get_option('with_py3_overrides')) and pygobject_override_dir == ''
|
||||
ret = run_command([python3, '-c', get_overridedir])
|
||||
|
||||
if ret.returncode() != 0
|
||||
@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides'))
|
||||
endif
|
||||
|
||||
# Python 2
|
||||
-if (get_option('with_py2_overrides'))
|
||||
+if (get_option('with_py2_overrides')) and pygobject_override_dir == ''
|
||||
ret2 = run_command([python2, '-c', get_overridedir])
|
||||
|
||||
if ret2.returncode() != 0
|
||||
@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides'))
|
||||
|
||||
install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir)
|
||||
endif
|
||||
+
|
||||
+if pygobject_override_dir != ''
|
||||
+ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir)
|
||||
+endif
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 147419f..9071a04 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false)
|
||||
option('python_name', type : 'string')
|
||||
option('with_py2_overrides', type : 'boolean', value : false)
|
||||
option('with_py3_overrides', type : 'boolean', value : true)
|
||||
+option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory')
|
||||
@ -0,0 +1,271 @@ |
||||
From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Tue, 19 Jun 2018 09:34:18 -0400
|
||||
Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory
|
||||
|
||||
See https://github.com/ostreedev/ostree/issues/1593
|
||||
|
||||
Basically this makes it easier for people packaging, as the trivial-httpd
|
||||
is only for tests, and this way the binary will live with the tests.
|
||||
|
||||
Also at this point nothing should depend on `ostree trivial-httpd`.
|
||||
---
|
||||
Makefile-man.am | 6 --
|
||||
Makefile-ostree.am | 7 ---
|
||||
Makefile-tests.am | 7 +++
|
||||
configure.ac | 10 ---
|
||||
man/ostree-trivial-httpd.xml | 118 -----------------------------------
|
||||
src/ostree/main.c | 5 --
|
||||
tests/libtest.sh | 13 ++--
|
||||
7 files changed, 12 insertions(+), 154 deletions(-)
|
||||
delete mode 100644 man/ostree-trivial-httpd.xml
|
||||
|
||||
diff --git a/Makefile-man.am b/Makefile-man.am
|
||||
index 8ccbba8c..d204aa3e 100644
|
||||
--- a/Makefile-man.am
|
||||
+++ b/Makefile-man.am
|
||||
@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \
|
||||
ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \
|
||||
ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \
|
||||
ostree-static-delta.1
|
||||
-if BUILDOPT_TRIVIAL_HTTPD
|
||||
-man1_files += ostree-trivial-httpd.1
|
||||
-else
|
||||
-# We still want to distribute the source, even if we are not building it
|
||||
-EXTRA_DIST += man/ostree-trivial-httpd.xml
|
||||
-endif
|
||||
|
||||
if BUILDOPT_FUSE
|
||||
man1_files += rofiles-fuse.1
|
||||
diff --git a/Makefile-ostree.am b/Makefile-ostree.am
|
||||
index 8d352e38..1471b3e5 100644
|
||||
--- a/Makefile-ostree.am
|
||||
+++ b/Makefile-ostree.am
|
||||
@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c
|
||||
endif
|
||||
|
||||
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
|
||||
-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)
|
||||
-
|
||||
if !USE_CURL
|
||||
# This is necessary for the cookie jar bits
|
||||
ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
|
||||
diff --git a/Makefile-tests.am b/Makefile-tests.am
|
||||
index 2c0916f6..b11fde89 100644
|
||||
--- a/Makefile-tests.am
|
||||
+++ b/Makefile-tests.am
|
||||
@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u
|
||||
tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
|
||||
tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
|
||||
|
||||
+if USE_LIBSOUP
|
||||
+test_extra_programs += ostree-trivial-httpd
|
||||
+ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
|
||||
+ostree_trivial_httpd_CFLAGS = $(common_tests_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
|
||||
+ostree_trivial_httpd_LDADD = $(common_tests_ldadd) $(OT_INTERNAL_SOUP_LIBS)
|
||||
+endif
|
||||
+
|
||||
if USE_AVAHI
|
||||
test_programs += tests/test-repo-finder-avahi
|
||||
endif
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e6e145db..1e36e6a0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi
|
||||
AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
|
||||
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)
|
||||
-AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes)
|
||||
-AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
|
||||
- [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], [
|
||||
AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)])
|
||||
])
|
||||
@@ -602,7 +593,6 @@ echo "
|
||||
Rust (internal oxidation): $rust_debug_release
|
||||
rofiles-fuse: $enable_rofiles_fuse
|
||||
HTTP backend: $fetcher_backend
|
||||
- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline
|
||||
SELinux: $with_selinux
|
||||
cryptographic checksums: $with_crypto
|
||||
systemd: $have_libsystemd
|
||||
diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml
|
||||
deleted file mode 100644
|
||||
index d03c12be..00000000
|
||||
--- a/man/ostree-trivial-httpd.xml
|
||||
+++ /dev/null
|
||||
@@ -1,118 +0,0 @@
|
||||
-<?xml version='1.0'?> <!--*-nxml-*-->
|
||||
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
|
||||
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
-
|
||||
-<!--
|
||||
-Copyright 2011,2013 Colin Walters <walters@verbum.org>
|
||||
-
|
||||
-SPDX-License-Identifier: LGPL-2.0+
|
||||
-
|
||||
-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.
|
||||
--->
|
||||
-
|
||||
-<refentry id="ostree">
|
||||
-
|
||||
- <refentryinfo>
|
||||
- <title>ostree trivial-httpd</title>
|
||||
- <productname>OSTree</productname>
|
||||
-
|
||||
- <authorgroup>
|
||||
- <author>
|
||||
- <contrib>Developer</contrib>
|
||||
- <firstname>Colin</firstname>
|
||||
- <surname>Walters</surname>
|
||||
- <email>walters@verbum.org</email>
|
||||
- </author>
|
||||
- </authorgroup>
|
||||
- </refentryinfo>
|
||||
-
|
||||
- <refmeta>
|
||||
- <refentrytitle>ostree trivial-httpd</refentrytitle>
|
||||
- <manvolnum>1</manvolnum>
|
||||
- </refmeta>
|
||||
-
|
||||
- <refnamediv>
|
||||
- <refname>ostree-trivial-httpd</refname>
|
||||
- <refpurpose>Simple webserver</refpurpose>
|
||||
- </refnamediv>
|
||||
-
|
||||
- <refsynopsisdiv>
|
||||
- <cmdsynopsis>
|
||||
- <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg>
|
||||
- </cmdsynopsis>
|
||||
- </refsynopsisdiv>
|
||||
-
|
||||
-<!-- Don't entirely understand this command. Needs details, better content-->
|
||||
- <refsect1>
|
||||
- <title>Description</title>
|
||||
-
|
||||
- <para>
|
||||
- This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory.
|
||||
- </para>
|
||||
- </refsect1>
|
||||
-
|
||||
- <refsect1>
|
||||
- <title>Options</title>
|
||||
-
|
||||
- <variablelist>
|
||||
- <varlistentry>
|
||||
- <term><option>--daemonize</option>,<option>-d</option></term>
|
||||
-
|
||||
- <listitem><para>
|
||||
- Fork into background when ready.
|
||||
- </para></listitem>
|
||||
- </varlistentry>
|
||||
-
|
||||
- <varlistentry>
|
||||
- <term><option>--autoexit</option></term>
|
||||
-
|
||||
- <listitem><para>
|
||||
- Automatically exit when directory is deleted.
|
||||
- </para></listitem>
|
||||
- </varlistentry>
|
||||
-
|
||||
- <varlistentry>
|
||||
- <term><option>--port-file</option>,<option>-p</option>="PATH"</term>
|
||||
-
|
||||
- <listitem><para>
|
||||
- Write port number to PATH (- for standard output).
|
||||
- </para></listitem>
|
||||
- </varlistentry>
|
||||
-
|
||||
- <varlistentry>
|
||||
- <term><option>--port</option>,<option>-P</option></term>
|
||||
-
|
||||
- <listitem><para>
|
||||
- Use the specified TCP port to listen on.
|
||||
- </para></listitem>
|
||||
- </varlistentry>
|
||||
-
|
||||
- <varlistentry>
|
||||
- <term><option>--force-range-requests</option></term>
|
||||
-
|
||||
- <listitem><para>
|
||||
- Force range requests by only serving half of files.
|
||||
- </para></listitem>
|
||||
- </varlistentry>
|
||||
- </variablelist>
|
||||
- </refsect1>
|
||||
-
|
||||
-<!-- NEED EXAMPLE OUTPUT HERE!-->
|
||||
- <refsect1>
|
||||
- <title>Example</title>
|
||||
- <para><command>$ ostree trivial-httpd</command></para>
|
||||
- </refsect1>
|
||||
-</refentry>
|
||||
diff --git a/src/ostree/main.c b/src/ostree/main.c
|
||||
index c5b45012..6478a62b 100644
|
||||
--- a/src/ostree/main.c
|
||||
+++ b/src/ostree/main.c
|
||||
@@ -116,11 +116,6 @@ static OstreeCommand commands[] = {
|
||||
{ "summary", OSTREE_BUILTIN_FLAG_NONE,
|
||||
ostree_builtin_summary,
|
||||
"Manage summary metadata" },
|
||||
-#if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE)
|
||||
- { "trivial-httpd", OSTREE_BUILTIN_FLAG_NONE,
|
||||
- ostree_builtin_trivial_httpd,
|
||||
- NULL },
|
||||
-#endif
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
diff --git a/tests/libtest.sh b/tests/libtest.sh
|
||||
index e0022512..b07dc962 100755
|
||||
--- a/tests/libtest.sh
|
||||
+++ b/tests/libtest.sh
|
||||
@@ -149,15 +149,12 @@ fi
|
||||
if test -n "${OSTREE_UNINSTALLED:-}"; then
|
||||
OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd
|
||||
else
|
||||
- # trivial-httpd is now in $libexecdir by default, which we don't
|
||||
- # know at this point. Fortunately, libtest.sh is also in
|
||||
- # $libexecdir, so make an educated guess. If it's not found, assume
|
||||
- # it's still runnable as "ostree trivial-httpd".
|
||||
- if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then
|
||||
- OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd"
|
||||
- else
|
||||
- OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd"
|
||||
+ # trivial-httpd is now the test directory.
|
||||
+ OSTREE_HTTPD="${G_TEST_BUILDDIR}/ostree-trivial-httpd"
|
||||
+ if ! [ -x "${OSTREE_HTTPD}" ]; then
|
||||
+ fatal "Failed to find ${OSTREE_HTTPD}"
|
||||
fi
|
||||
+ OSTREE_HTTPD="${CMD_PREFIX} ${OSTREE_HTTPD}"
|
||||
fi
|
||||
|
||||
files_are_hardlinked() {
|
||||
--
|
||||
2.22.0
|
||||
|
||||
@ -1,12 +1,12 @@ |
||||
diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am
|
||||
--- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200
|
||||
@@ -243,7 +243,7 @@
|
||||
diff --git a/Makefile-tests.am b/Makefile-tests.am
|
||||
index b11fde89..82937a67 100644
|
||||
--- a/Makefile-tests.am
|
||||
+++ b/Makefile-tests.am
|
||||
@@ -245,7 +245,6 @@ endif
|
||||
|
||||
_installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \
|
||||
tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \
|
||||
- tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
|
||||
+ tests/test-checksum tests/test-lzma tests/test-rollsum \
|
||||
tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
|
||||
|
||||
if USE_AVAHI
|
||||
if USE_LIBSOUP
|
||||
|
||||
Loading…
Reference in new issue