summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-dangling
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-05-21 13:18:58 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-05-21 13:18:58 -0400
commit05dc8bd7aef39682c7f2d8e932aaad59dccb8cae (patch)
treef029bf011790b4d2ffb08e5401ca8209a2afc5f7 /meta-openstack/recipes-dangling
parent99116f5a9bdfba28ff9142a778fbcb2432848afe (diff)
downloadmeta-cloud-services-05dc8bd7aef39682c7f2d8e932aaad59dccb8cae.tar.gz
bbappends: update bbappends to match oe-core, meta-oe and meta-virtualization versions
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-dangling')
-rw-r--r--meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend15
-rw-r--r--meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend2
-rw-r--r--meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend5
-rw-r--r--meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend5
4 files changed, 27 insertions, 0 deletions
diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend
new file mode 100644
index 0000000..7aca867
--- /dev/null
+++ b/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend
@@ -0,0 +1,15 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
5
6 # default layout for htdocsdir in 2.4.7 is different, create the following for
7 # backward compatibility reasons
8
9 mkdir -p ${D}${datadir}/${BPN}/default-site
10 ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
11
12 sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2
13}
14
15FILES_${PN} += "${datadir}/${BPN}/default-site"
diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend
new file mode 100644
index 0000000..34ad5b8
--- /dev/null
+++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend
@@ -0,0 +1,2 @@
1RRECOMMENDS_${PN} += "kernel-module-veth \
2 "
diff --git a/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend
new file mode 100644
index 0000000..50fab9f
--- /dev/null
+++ b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend
@@ -0,0 +1,5 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 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
5}
diff --git a/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend
new file mode 100644
index 0000000..50fab9f
--- /dev/null
+++ b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend
@@ -0,0 +1,5 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 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
5}