helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-14 14:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

cherokee: Only build with meta-py2 is in layermix

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2020-01-21 22:31:24 -08:00
parent 0a4faceed6
commit 7df11a27a0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
View File

@ -19,8 +19,9 @@ RDEPENDS_packagegroup-meta-webserver = "\
" "
RDEPENDS_packagegroup-meta-webserver-http = "\ RDEPENDS_packagegroup-meta-webserver-http = "\
nginx monkey cherokee hiawatha nostromo apache-websocket \ nginx monkey hiawatha nostromo apache-websocket \
apache2 sthttpd \ apache2 sthttpd \
${@bb.utils.contains("BBPATH", "meta-python2", "cherokee", "", d)} \
" "
RDEPENDS_packagegroup-meta-webserver-php = "\ RDEPENDS_packagegroup-meta-webserver-php = "\

7
meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
View File

@ -20,7 +20,7 @@ SRC_URI = "git://github.com/cherokee/webserver \
S = "${WORKDIR}/git" 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 ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"
@ -70,3 +70,8 @@ RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "cherokee.service" 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.')
}