Skip to contentSkip to conversation

ostree: Add recipe

PATCH Superseded Alex Kiernan 2 participants 5 messages Sep 19, 2019 – Sep 21, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ostree: Add recipe

---

 ...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  | 151 ++++++++++++++++++
 4 files changed, 301 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
new file mode 100644
index 000000000000..c9e1306afde0
@@ -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
new file mode 100644
index 000000000000..d8c044cb9224
@@ -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 +151 -0

151 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw
Quoted 202 lines · Alex Kiernan

---

 ...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  | 151 ++++++++++++++++++
 4 files changed, 301 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
new file mode 100644
index 000000000000..c9e1306afde0
@@ -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
new file mode 100644
index 000000000000..d8c044cb9224
@@ -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
new file mode 100644
index 000000000000..362b2f36ab51
@@ -0,0 +1,51 @@
+From 2629328b39ae117876f4854409c2231220a30b9c Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <[email protected]>
+Date: Thu, 5 Sep 2019 13:22:15 +0100
+Subject: [PATCH 2/2] Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD
+
+When building without --enable-trivial-httpd-cmdline, don't build or install
+the ostree-trivial-httpd binary.
+
+Signed-off-by: Alex Kiernan <[email protected]>
+Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912]
+---
+ Makefile-ostree.am | 3 ++-
+ configure.ac       | 3 +++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile-ostree.am b/Makefile-ostree.am
+index 76f39cad4b74..7b53cb148960 100644
+--- a/Makefile-ostree.am
++++ b/Makefile-ostree.am
+@@ -143,12 +143,13 @@ 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
++if BUILDOPT_TRIVIAL_HTTPD
+ 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)
++endif
+
+ if !USE_CURL
+ # This is necessary for the cookie jar bits
+diff --git a/configure.ac b/configure.ac
+index 069bab01752e..ffc67980d507 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -192,6 +192,9 @@ AC_ARG_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)
++AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [
++  AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd])
++])
+ AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
+   [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
+ )
+--
+2.17.1
+
meta-oe/recipes-extended/ostree/ostree_2019.3.bb new file +14 -0
new file mode 100644
index 000000000000..6e2cd7267eb4
@@ -0,0 +1,151 @@
+SUMMARY = "Versioned Operating System Repository."
+DESCRIPTION = "libostree is both a shared library and suite of command line \
+tools that combines a \"git-like\" model for committing and downloading \
+bootable filesystem trees, along with a layer for deploying them and managing \
+the bootloader configuration."
+HOMEPAGE = "https://ostree.readthedocs.io"
+LICENSE = "LGPLv2.1"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+DEPENDS = " \
+    glib-2.0 \
+    gpgme \
+    e2fsprogs \

meta-oe/recipes-extended/ostree/ostree_2019.3.bb line 24

Quoted 10 lines
meta-oe/recipes-extended/ostree/ostree_2019.3.bb new file +10 -0
+    libcap \
+    zlib \
+    xz \
+    bison-native \
+"
+
+# The Yocto mirror has an old export of ostree:
+# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz
+PREMIRRORS = ""
+

I should've added a cover note to this - clearly this hack needs to go away.

Signature · 1 line
Alex Kiernan
#2 lore raw

Also fails on all builders

https://errors.yoctoproject.org/Errors/Details/271527/

Quoted 224 lines · Alex Kiernan
Quoted 202 lines · Alex Kiernan

---

 ...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  | 151 ++++++++++++++++++
 4 files changed, 301 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
new file mode 100644
index 000000000000..c9e1306afde0
@@ -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
new file mode 100644
index 000000000000..d8c044cb9224
@@ -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
new file mode 100644
index 000000000000..362b2f36ab51
@@ -0,0 +1,51 @@
+From 2629328b39ae117876f4854409c2231220a30b9c Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <[email protected]>
+Date: Thu, 5 Sep 2019 13:22:15 +0100
+Subject: [PATCH 2/2] Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD
+
+When building without --enable-trivial-httpd-cmdline, don't build or install
+the ostree-trivial-httpd binary.
+
+Signed-off-by: Alex Kiernan <[email protected]>
+Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912]
+---
+ Makefile-ostree.am | 3 ++-
+ configure.ac       | 3 +++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile-ostree.am b/Makefile-ostree.am
+index 76f39cad4b74..7b53cb148960 100644
+--- a/Makefile-ostree.am
++++ b/Makefile-ostree.am
+@@ -143,12 +143,13 @@ 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
++if BUILDOPT_TRIVIAL_HTTPD
+ 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)
++endif
+
+ if !USE_CURL
+ # This is necessary for the cookie jar bits
+diff --git a/configure.ac b/configure.ac
+index 069bab01752e..ffc67980d507 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -192,6 +192,9 @@ AC_ARG_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)
++AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [
++  AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd])
++])
+ AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
+   [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
+ )
+--
+2.17.1
+
meta-oe/recipes-extended/ostree/ostree_2019.3.bb new file +14 -0
new file mode 100644
index 000000000000..6e2cd7267eb4
@@ -0,0 +1,151 @@
+SUMMARY = "Versioned Operating System Repository."
+DESCRIPTION = "libostree is both a shared library and suite of command line \
+tools that combines a \"git-like\" model for committing and downloading \
+bootable filesystem trees, along with a layer for deploying them and managing \
+the bootloader configuration."
+HOMEPAGE = "https://ostree.readthedocs.io"
+LICENSE = "LGPLv2.1"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+DEPENDS = " \
+    glib-2.0 \
+    gpgme \
+    e2fsprogs \

meta-oe/recipes-extended/ostree/ostree_2019.3.bb line 24

Quoted 10 lines
meta-oe/recipes-extended/ostree/ostree_2019.3.bb new file +10 -0
+    libcap \
+    zlib \
+    xz \
+    bison-native \
+"
+
+# The Yocto mirror has an old export of ostree:
+# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz
+PREMIRRORS = ""
+

I should've added a cover note to this - clearly this hack needs to go away.

--
Alex Kiernan
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#3 lore raw
Quoted 5 lines · Khem Raj

Also fails on all builders

https://errors.yoctoproject.org/Errors/Details/271527/

Huh... I could've sworn I tested all PACAKGECONFIGs, clearly I didn't do gobject-introspection.

| x86_64-poky-linux-libtool: link: x86_64-poky-linux-gcc -m64
-march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong
-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot -std=gnu99 -fno-strict-aliasing -pipe -Wall -Werror=empty-body
-Werror=strict-prototypes -Werror=missing-prototypes
-Werror=implicit-function-declaration -Werror=format=2
-Werror=format-security -Werror=format-nonliteral
-Werror=pointer-arith -Werror=init-self -Werror=missing-declarations
-Werror=return-type -Werror=switch -Werror=overflow
-Werror=int-conversion -Werror=parentheses -Werror=undef
-Werror=incompatible-pointer-types -Werror=misleading-indentation
-Werror=missing-include-dirs -Werror=aggregate-return
-Wstrict-aliasing=2 -Werror=unused-result -I../git/src/libotutil
-I../git/src/libostree -I./src/libostree -I../git/src/ostree
-I../git/libglnx -pthread -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/include/gio-unix-2.0 -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/include/libmount -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/include/blkid -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/lib/glib-2.0/include -DPKGLIBEXECDIR=\"/usr/libexec/libostree\" -pthread -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/include/gio-unix-2.0 -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/include/libmount -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/include/blkid -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot/usr/lib/glib-2.0/include -I../git/libglnx -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0=/usr/src/debug/ostree/2019.3-r0 -fdebug-prefix-map=/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0=/usr/src/debug/ostree/2019.3-r0 -fdebug-prefix-map=/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot= -fdebug-prefix-map=/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/recipe-sysroot-native= -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong
-Wl,-z -Wl,relro -Wl,-z -Wl,now -o tests/.libs/test-rollsum-cli src/libostree/tests_test_rollsum_cli-ostree-rollsum.o
tests/test_rollsum_cli-test-rollsum-cli.o ./.libs/libbupsplit.a
./.libs/libglnx.a ./.libs/libotutil.a ./.libs/libostree-1.so
./.libs/libostreetest.a /home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0/build/.libs/libostree-1.so -lgpgme -lpthread -lassuan -lgpg-error -llzma -lsoup-2.4 -lgio-2.0
-lgobject-2.0 -lglib-2.0 -lz -pthread
...
| gcc: error: unrecognized command line option ‘-fmacro-prefix-map=/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/ostree/2019.3-r0=/usr/src/debug/ostree/2019.3-r0’

That feels like a really strange failure, any insight gratefully accepted!

Signature · 1 line
Alex Kiernan
#4 lore raw
Quoted 11 lines · Alex Kiernan
Quoted 5 lines · Khem Raj

Also fails on all builders

https://errors.yoctoproject.org/Errors/Details/271527/

Huh... I could've sworn I tested all PACAKGECONFIGs, clearly I didn't do gobject-introspection.

Bleurgh... horrid upstream hack to fix a different problem which breaks cross gir completely. About to send v2.

Signature · 1 line
Alex Kiernan