diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-01-21 22:31:24 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-22 09:56:35 -0800 |
commit | 7df11a27a03f8752e3dade2adeb88d21b4b79da5 (patch) | |
tree | fbc24c9af79dae70f220d4c7e577b409ef0ad058 | |
parent | 0a4faceed66002ca04413f69f6b422197981cedf (diff) | |
download | meta-openembedded-contrib-7df11a27a03f8752e3dade2adeb88d21b4b79da5.tar.gz |
cherokee: Only build with meta-py2 is in layermix
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb | 3 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/cherokee/cherokee_git.bb | 7 |
2 files changed, 8 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 fc117850b4..089c325252 100644 --- a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb +++ b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb @@ -19,8 +19,9 @@ RDEPENDS_packagegroup-meta-webserver = "\ " RDEPENDS_packagegroup-meta-webserver-http = "\ - nginx monkey cherokee hiawatha nostromo apache-websocket \ + nginx monkey hiawatha nostromo apache-websocket \ apache2 sthttpd \ + ${@bb.utils.contains("BBPATH", "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 d16e04e6b1..81805891a4 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 python3native +inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd pythonnative PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" @@ -70,3 +70,8 @@ RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "cherokee.service" + +python() { + if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') +} |