[oe] [meta-oe] [PATCH] ostree: introduce OSTREE_PULL_TRANSPORT

liu.ming50 at gmail.com liu.ming50 at gmail.com
Sat Dec 7 13:03:54 UTC 2019


From: Ming Liu <liu.ming50 at gmail.com>

It could be soup or curl, for convenience to be overridden by other
meta layers, like in meta-updater, it is choosing curl as the pull
transport.

Signed-off-by: Ming Liu <liu.ming50 at gmail.com>
---
 meta-oe/recipes-extended/ostree/ostree_2019.5.bb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
index 4f437f3..c3e3a12 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
@@ -43,6 +43,11 @@ S = "${WORKDIR}/git"
 
 inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd
 
+# Value: soup or curl
+# We include soup because ostree can't (currently) be built without
+# soup or curl - https://github.com/ostreedev/ostree/issues/1897
+OSTREE_PULL_TRANSPORT ??= "soup"
+
 # Package configuration - match ostree defaults, but without rofiles-fuse
 # otherwise we introduce a dependendency on meta-filesystems
 #
@@ -50,15 +55,13 @@ inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconf
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \
-    soup \
+    ${OSTREE_PULL_TRANSPORT} \
 "
 
-# We include soup because ostree can't (currently) be built without
-# soup or curl - https://github.com/ostreedev/ostree/issues/1897
 PACKAGECONFIG_class-native ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
     builtin-grub2-mkconfig \
-    soup \
+    ${OSTREE_PULL_TRANSPORT} \
 "
 
 PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi"
-- 
2.7.4



More information about the Openembedded-devel mailing list