summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Müller-Klieser <S.Mueller-Klieser@phytec.de>2017-08-22 13:56:56 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2017-08-25 14:11:42 +0200
commit12b61f875ce36b83e7cb4e837e2e09e5e433929f (patch)
tree59cf216aef7734025e2d540e3121ad612ac43608
parent74380772697268a26a1c620eada3b1190e1dcde2 (diff)
downloadmeta-yogurt-12b61f875ce36b83e7cb4e837e2e09e5e433929f.tar.bz2
meta-yogurt-12b61f875ce36b83e7cb4e837e2e09e5e433929f.zip
lighttpd with php: updates
Changes: - Fix startup bug reported by David Ramunno - remove packagegroup - add dependencies so only one line is required in local.conf IMAGE_INSTALL_append = " lighttpd" - updated yocto reference manual - php append: remove mysql support in yogurt for a smaller footprint - full php runtime with webserver requires 5.5 MiB Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-devtools/php/php_%.bbappend4
-rw-r--r--recipes-extended/lighttpd/lighttpd_%.bbappend6
-rw-r--r--recipes-images/packagegroups/packagegroup-phpserver.bb11
3 files changed, 10 insertions, 11 deletions
diff --git a/recipes-devtools/php/php_%.bbappend b/recipes-devtools/php/php_%.bbappend
new file mode 100644
index 0000000..e2c27d1
--- /dev/null
+++ b/recipes-devtools/php/php_%.bbappend
@@ -0,0 +1,4 @@
+PACKAGECONFIG ??= "sqlite3 \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+"
diff --git a/recipes-extended/lighttpd/lighttpd_%.bbappend b/recipes-extended/lighttpd/lighttpd_%.bbappend
index 72d991c..cde1ae8 100644
--- a/recipes-extended/lighttpd/lighttpd_%.bbappend
+++ b/recipes-extended/lighttpd/lighttpd_%.bbappend
@@ -1 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+RDEPENDS_${PN} += " \
+ lighttpd-module-cgi \
+"
+RRECOMMENDS_${PN} += " \
+ php-cli \
+"
diff --git a/recipes-images/packagegroups/packagegroup-phpserver.bb b/recipes-images/packagegroups/packagegroup-phpserver.bb
deleted file mode 100644
index 87689ad..0000000
--- a/recipes-images/packagegroups/packagegroup-phpserver.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Small and simple setup for a lighttpd server serving php over cgi"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-RDEPENDS_${PN} = " \
- lighttpd \
- lighttpd-module-cgi \
- php \
- php-cli \
-"