summaryrefslogtreecommitdiffstats
path: root/recipes-sota
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-01-12 11:02:48 +0100
committerGitHub <noreply@github.com>2018-01-12 11:02:48 +0100
commit0afff0c944763238026283fbb409d038705c6b13 (patch)
tree3ea07796842c809fb2bc45747310dfee7938987f /recipes-sota
parentb0ee1c37c20dff5f6c2b9f718b29b2697a4cb797 (diff)
parent13a294b1aeec9cc18efd4ac006d104c73dded658 (diff)
downloadmeta-updater-0afff0c944763238026283fbb409d038705c6b13.tar.gz
Merge pull request #227 from advancedtelematic/bugfix/PRO-4670/bumpostree
Bump OSTree version
Diffstat (limited to 'recipes-sota')
-rw-r--r--recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch26
-rw-r--r--recipes-sota/ostree/ostree_git.bb5
2 files changed, 2 insertions, 29 deletions
diff --git a/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch b/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch
deleted file mode 100644
index f45bae4..0000000
--- a/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 666e80acda17680e20d363ddc6fcf0a63f9c1dde Mon Sep 17 00:00:00 2001
2From: Anton Gerasimov <anton.gerasimov@openmailbox.org>
3Date: Thu, 21 Dec 2017 22:36:06 +0100
4Subject: [PATCH] Allow building without libsoup
5
6---
7 configure.ac | 3 ---
8 1 file changed, 3 deletions(-)
9
10diff --git a/configure.ac b/configure.ac
11index 92248af8..baf66e4f 100644
12--- a/configure.ac
13+++ b/configure.ac
14@@ -182,9 +182,6 @@ AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
15 [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
16 )
17
18-AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [
19- AC_MSG_ERROR([Curl enabled, but libsoup is not; libsoup is needed for tests])
20-])
21 AM_CONDITIONAL(USE_CURL_OR_SOUP, test x$with_curl != xno || test x$with_soup != xno)
22 AS_IF([test x$with_curl != xno || test x$with_soup != xno],
23 [AC_DEFINE([HAVE_LIBCURL_OR_LIBSOUP], 1, [Define if we have soup or curl])])
24--
252.15.0
26
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index 9ef4478..00559b6 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -6,10 +6,9 @@ inherit autotools-brokensep pkgconfig systemd gobject-introspection
6 6
7INHERIT_remove_class-native = "systemd" 7INHERIT_remove_class-native = "systemd"
8 8
9SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master \ 9SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
10 file://0001-Allow-building-without-libsoup.patch"
11 10
12SRCREV="ae61321046ad7f4148a5884c8c6c8b2594ff840e" 11SRCREV="854a823e05d6fe8b610c02c2a71eaeb2bf1e98a6"
13 12
14PV = "v2017.13" 13PV = "v2017.13"
15 14