ostree: introduce OSTREE_PULL_TRANSPORT
PATCH 1/1 ostree: introduce OSTREE_PULL_TRANSPORT
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.
--- meta-oe/recipes-extended/ostree/ostree_2019.5.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +7 -4
@@ -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"
Signature · 1 line
2.7.4
Quoted 17 lines · 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(-)meta-oe/recipes-extended/ostree/ostree_2019.5.bb +0
-0
meta-oe/recipes-extended/ostree/ostree_2019.5.bb S = "${WORKDIR}/git" · line 49
Quoted 7 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +4
-0@@ -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
Quoted 30 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +3
-5+ # 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
Quoted 22 lines · Khem Raj
Quoted 20 lines · 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(-)meta-oe/recipes-extended/ostree/ostree_2019.5.bb +0
-0@@ -43,6 +43,11 @@ S = "${WORKDIR}/git" inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd
Quoted 8 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb S = "${WORKDIR}/git" · line 49
Quoted 4 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +4
-0+# 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.
Quoted 35 lines
Quoted 25 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +3
-5+ # 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
Quoted 5 lines
--
_______________________________________________
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
Signature · 1 line
Alex Kiernan
Quoted 52 lines · Alex Kiernan
Quoted 22 lines · Khem Raj
Quoted 20 lines · 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(-)meta-oe/recipes-extended/ostree/ostree_2019.5.bb +0
-0@@ -43,6 +43,11 @@ S = "${WORKDIR}/git" inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemdQuoted 8 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb S = "${WORKDIR}/git" · line 49
Quoted 4 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +4
-0+# 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:~#
Quoted 3 lines
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.
Quoted 40 lines
Quoted 25 lines
Quoted 25 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +3
-5+ # 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
Quoted 10 lines
Quoted 5 lines
--
_______________________________________________
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
Thanks for the explanation, I am on board too.
//Ming Liu
Khem Raj <[email protected]> 於 2019年12月7日 週六 下午7:46寫道:
Quoted 108 lines
Quoted 11 lines · Alex Kiernan
Quoted 9 lines · Khem Raj
Quoted 7 lines · 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.
Quoted 6 lines
Quoted 6 lines
Review
Quoted 6 lines
Signed-off-by Ming Liu <[email protected]>--- meta-oe/recipes-extended/ostree/ostree_2019.5.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)(quoted diff) +0
-0b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
Quoted 6 lines
Quoted 6 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb S = "${WORKDIR}/git" · line 44
Quoted 6 lines
index 4f437f3..c3e3a12 100644
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +0
-0@@ -43,6 +43,11 @@ S = "${WORKDIR}/git" inherit autotools bash-completion gobject-introspection gtk-docmanpages pkgconfig ptest-gnome systemd
Quoted 29 lines
Quoted 9 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb S = "${WORKDIR}/git" · line 49
Quoted 5 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +4
-0+# 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:~#Quoted 3 lines
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.Quoted 2 lines
Quoted 2 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb S = "${WORKDIR}/git" · line 50
Quoted 2 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +1
-0+ # Package configuration - match ostree defaults, but withoutrofiles-fuse
Quoted 3 lines
Quoted 3 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb inherit autotools bash-completion
Quoted 3 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +0
-0# otherwise we introduce a dependendency on meta-filesystems #@@ -50,15 +55,13 @@ inherit autotools bash-completiongobject-introspection gtk-doc manpages pkgconf
Quoted 3 lines
Quoted 3 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconf
Quoted 3 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +0
-0PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemdlibmount', '', d)} \
Quoted 32 lines
Quoted 17 lines
Quoted 17 lines
meta-oe/recipes-extended/ostree/ostree_2019.5.bb +2
-5- 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
Quoted 10 lines
Quoted 5 lines
--
_______________________________________________
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