[oe-commits] [meta-openembedded] 01/02: cherokee: Replace using BBPATH with BBFILE_COLLECTIONS for meta-python2 check
git at git.openembedded.org
git at git.openembedded.org
Thu Jan 23 03:22:01 UTC 2020
This is an automated email from the git hooks/post-receive script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit 1da85ce7d160b05f7a9e689a470917c7b17e2dd4
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Wed Jan 22 19:05:34 2020 -0800
cherokee: Replace using BBPATH with BBFILE_COLLECTIONS for meta-python2 check
BBPATH check actually does not work
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
.../recipes-core/packagesgroups/packagegroup-meta-webserver.bb | 2 +-
meta-webserver/recipes-httpd/cherokee/cherokee_git.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
index 089c325..f5d5deb 100644
--- a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
+++ b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
@@ -21,7 +21,7 @@ RDEPENDS_packagegroup-meta-webserver = "\
RDEPENDS_packagegroup-meta-webserver-http = "\
nginx monkey hiawatha nostromo apache-websocket \
apache2 sthttpd \
- ${@bb.utils.contains("BBPATH", "meta-python2", "cherokee", "", d)} \
+ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "cherokee", "", d)} \
"
RDEPENDS_packagegroup-meta-webserver-php = "\
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
index b31f4c4..7424467 100644
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
+++ b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/cherokee/webserver \
S = "${WORKDIR}/git"
-inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)}
+inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list