Quellcode durchsuchen

cherokee: Replace using BBPATH with BBFILE_COLLECTIONS for meta-python2 check

BBPATH check actually does not work

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Khem Raj vor 4 Jahren
Ursprung
Commit
1da85ce7d1

+ 1 - 1
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 = "\

+ 1 - 1
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"