ostree: Add recipe
PATCH v3 1/1 ostree: Add recipe
Signed-off-by Alex Kiernan <[email protected]>
---
Changes in v3:
- correct packaging path for ostree-prepare-root.service
Changes in v2:
- override INTROSPECTION_SCANNER_ENV to allow gobject-introspection to build
- don't enable rofiles-fuse by default to avoid bringing in meta-filesystems
...lways-enable-trivial-httpd-for-tests.patch | 59 +++++++ ...cros-Add-TEMP_FAILURE_RETRY-for-musl.patch | 40 +++++ ...vial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch | 51 ++++++ .../recipes-extended/ostree/ostree_2019.3.bb | 157 ++++++++++++++++++ 4 files changed, 307 insertions(+) create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch create mode 100644 meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch create mode 100644 meta-oe/recipes-extended/ostree/ostree_2019.3.bb
meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch new file +59 -0
@@ -0,0 +1,59 @@ +From 44e0647230b22cd136ae2fb252ce90eed4751970 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <[email protected]> +Date: Wed, 4 Sep 2019 17:29:15 +0100 +Subject: [PATCH 1/2] Always enable trivial-httpd for tests + +When running tests we always need ostree-trivial-httpd, so enable it +unconditionally + +Signed-off-by: Alex Kiernan <[email protected]> +Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] +--- + Makefile.am | 1 + + ci/build.sh | 5 +++++ + ci/travis-build.sh | 1 + + 3 files changed, 7 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index cd04a055045a..673dbf88de55 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \ + --enable-gtk-doc \ + --enable-man \ + --disable-maintainer-mode \ ++ --enable-trivial-httpd-cmdline \ + $(NULL) + + GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make +diff --git a/ci/build.sh b/ci/build.sh +index 0901507498f2..806af050b780 100755 +--- a/ci/build.sh ++++ b/ci/build.sh +@@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in + fi + ;; + esac ++# unless libsoup is disabled, enable trivial-httpd for the tests ++case "${CONFIGOPTS:-}" in ++ *--without-soup*) ;; ++ *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;; ++esac + + # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 + # NB: this disables the default set of flags from configure.ac +diff --git a/ci/travis-build.sh b/ci/travis-build.sh +index 3fd969bdced6..7c85313a2d32 100755 +--- a/ci/travis-build.sh ++++ b/ci/travis-build.sh +@@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1" + + ../configure \ + --enable-always-build-tests \ ++ --enable-trivial-httpd-cmdline \ + ${ci_configopts} + "$@" + +-- +2.17.1 +
meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 5a4f2ddb0a6c656b425a3caa41f5af766ed5f44b Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <[email protected]> +Date: Mon, 9 Sep 2019 14:19:18 +0100 +Subject: [PATCH] macros: Add TEMP_FAILURE_RETRY for musl + +TEMP_FAILURE_RETRY is glibc specific, add a definition for musl. + +See https://github.com/ostreedev/ostree/issues/731 + +Signed-off-by: Leon Woestenberg <[email protected]> +Signed-off-by: Alex Kiernan <[email protected]> +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libglnx/commit/15c06468804014fc49f6f340132930703f919b19] +--- + glnx-macros.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libglnx.glnx-macros.h b/libglnx/glnx-macros.h +index 6d8aca93f8a3..700fc75ceed0 100644 +--- a/libglnx.glnx-macros.h ++++ b/libglnx/glnx-macros.h +@@ -31,6 +31,16 @@ G_BEGIN_DECLS + /* All of these are for C only. */ + #ifndef __GI_SCANNER__ + ++/* fixes builds against musl, taken from glibc unistd.h */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + /* Taken from https://github.com/systemd/systemd/src/basic/string-util.h + * at revision v228-666-gcf6c8c4 + */ +-- +2.17.1 +
meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch new file +51 -0
51 lines not on this page · raw message
meta-oe/recipes-extended/ostree/ostree_2019.3.bb new file +157 -0
157 lines not on this page · raw message
Signature · 1 line
2.17.1