aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-extended/lighttpd
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-01-22 18:02:40 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-01-22 18:02:40 +0000
commit1d174d4e851b1dc74c4c4778cf7d0c52d1f38142 (patch)
treeb02bc6399a9bb5dfabd6dff33da1a1c41a6b3e0a /meta-openstack/recipes-extended/lighttpd
parenta401a1c3d86eb00bab8bfccba83c12cc67ce06a1 (diff)
downloadmeta-cloud-services-1d174d4e851b1dc74c4c4778cf7d0c52d1f38142.tar.gz
meta-cloud-services-1d174d4e851b1dc74c4c4778cf7d0c52d1f38142.tar.bz2
meta-cloud-services-1d174d4e851b1dc74c4c4778cf7d0c52d1f38142.zip
bbappends: make distro feature safe
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'meta-openstack/recipes-extended/lighttpd')
-rw-r--r--meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend4
-rw-r--r--meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc3
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend
index 33b1f61..025ee4e 100644
--- a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend
+++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.%.bbappend
@@ -1,3 +1 @@
-do_install_append() {
- sed -i '2i port=`grep "^server.port" /etc/lighttpd.conf`; if [ -z $port ]; then echo "server port not configured, not running lighttpd..."; exit 0; fi' ${D}/etc/init.d/lighttpd
-}
+require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)}
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc
new file mode 100644
index 0000000..33b1f61
--- /dev/null
+++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc
@@ -0,0 +1,3 @@
+do_install_append() {
+ sed -i '2i port=`grep "^server.port" /etc/lighttpd.conf`; if [ -z $port ]; then echo "server port not configured, not running lighttpd..."; exit 0; fi' ${D}/etc/init.d/lighttpd
+}