[oe] [meta-webserver][PATCH 1/2] cherokee: Replace using BBPATH with BBFILE_COLLECTIONS for meta-python2 check

Khem Raj raj.khem at gmail.com
Thu Jan 23 03:21:09 UTC 2020


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 089c325252..f5d5debe11 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 b31f4c430b..7424467946 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"
-- 
2.25.0



More information about the Openembedded-devel mailing list