diff options
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree_2019.6.bb | 10 |
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" | |||
| 56 | PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" | 56 | PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" |
| 57 | PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" | 57 | PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" |
| 58 | PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" | 58 | PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" |
| 59 | PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs" | ||
| 59 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" | 60 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" |
| 60 | PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" | 61 | PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" |
| 61 | PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" | 62 | PACKAGECONFIG[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 | " |
| 173 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" | 175 | RDEPENDS_${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" | |||
| 179 | SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" | 181 | SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" |
| 180 | 182 | ||
| 181 | BBCLASSEXTEND = "native" | 183 | BBCLASSEXTEND = "native" |
| 182 | |||
| 183 | python __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 | } | ||
