summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/ostree/ostree_2019.6.bb10
1 files changed, 3 insertions, 7 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.6.bb b/meta-oe/recipes-extended/ostree/ostree_2019.6.bb
index 86a7aac31c..a40cc52757 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2019.6.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2019.6.bb
@@ -56,6 +56,7 @@ PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi"
56PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" 56PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig"
57PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" 57PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl"
58PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" 58PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut"
59PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs"
59PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" 60PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls"
60PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" 61PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive"
61PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" 62PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux"
@@ -166,9 +167,10 @@ RDEPENDS_${PN}-ptest += " \
166 grep \ 167 grep \
167 python3-core \ 168 python3-core \
168 python3-multiprocessing \ 169 python3-multiprocessing \
169 python3-pyyaml \
170 tar \ 170 tar \
171 ${PN}-trivial-httpd \ 171 ${PN}-trivial-httpd \
172 ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \
173 ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \
172" 174"
173RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" 175RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us"
174 176
@@ -179,9 +181,3 @@ SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path"
179SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" 181SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service"
180 182
181BBCLASSEXTEND = "native" 183BBCLASSEXTEND = "native"
182
183python __anonymous() {
184 if bb.utils.contains('PTEST_ENABLED', '1', 'True', '', d):
185 if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', '', d):
186 raise bb.parse.SkipRecipe('ptest requires meta-python to be present.')
187}