Thanks for the explanation, I am on board too. //Ming Liu
Khem Raj <[email protected]> 於 2019年12月7日 週六 下午7:46寫道： > On Sat, Dec 7, 2019 at 9:23 AM Alex Kiernan <[email protected]> > wrote: > > > > On Sat, Dec 7, 2019 at 3:25 PM Khem Raj <[email protected]> wrote: > > > > > > On Sat, Dec 7, 2019 at 5:04 AM <[email protected]> wrote: > > > > > > > > From: Ming Liu <[email protected]> > > > > > > > > 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 <[email protected]> > > > > --- > > > > 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" > > > > > > are these options exclusive? then we need a check as well to ensure > > > both are not used > > > > > > > They're not exclusive, selecting both is fine, in fact required if you > > want trivial-httpd (which is a prerequisite for ptest). If you choose > > both then curl takes precedence in the client and won't be linked > > against libsoup: > > > > root@tmt-561:~# ostree --version > > libostree: > > Version: '2019.5' > > Git: v2019.5 > > Features: > > - libcurl > > - libsoup > > - gpgme > > - libmount > > - release > > - p2p > > root@tmt-561:~# ldd /usr/bin/ostree | grep soup > > root@tmt-561:~# > > > > I have to admit to not being a fan of this change as (IMO) it just > > confuses what's part of PACKAGECONFIG and what's not. > > > > Thanks for chiming in Alex. I would agree that given that they are not > exclusive it's probably > not going to help to have another variable abstraction. > > > > > + > > > > # 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 > > > > > > > > -- > > > > _______________________________________________ > > > > Openembedded-devel mailing list > > > > [email protected] > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > -- > > > _______________________________________________ > > > Openembedded-devel mailing list > > > [email protected] > > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > > > > > > -- > > Alex Kiernan > -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
