From 05dc8bd7aef39682c7f2d8e932aaad59dccb8cae Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 21 May 2014 13:18:58 -0400
Subject: bbappends: update bbappends to match oe-core, meta-oe and
 meta-virtualization versions

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-dangling/apache2/apache2_2.4.7.bbappend       | 15 +++++++++++++++
 .../recipes-dangling/iproute2/iproute2_3.12.0.bbappend    |  2 ++
 .../recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend    |  5 +++++
 .../recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend    |  5 +++++
 .../recipes-extended/apache2/apache2_2.4.7.bbappend       | 15 ---------------
 .../recipes-extended/apache2/apache2_2.4.9.bbappend       | 15 +++++++++++++++
 .../recipes-extended/lighttpd/lighttpd_1.4.30.bbappend    |  5 -----
 .../recipes-extended/lighttpd/lighttpd_1.4.33.bbappend    |  5 -----
 .../recipes-extended/lighttpd/lighttpd_1.4.35.bbappend    |  5 +++++
 .../recipes-support/dnsmasq/dnsmasq_2.63.bbappend         |  9 ---------
 .../recipes-support/dnsmasq/dnsmasq_2.68.bbappend         |  9 +++++++++
 .../recipes-support/iproute2/iproute2_3.12.0.bbappend     |  2 --
 .../recipes-support/iproute2/iproute2_3.14.0.bbappend     |  2 ++
 13 files changed, 58 insertions(+), 36 deletions(-)
 create mode 100644 meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend
 create mode 100644 meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend
 create mode 100644 meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend
 create mode 100644 meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend
 delete mode 100644 meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend
 create mode 100644 meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend
 delete mode 100644 meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
 delete mode 100644 meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
 create mode 100644 meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend
 delete mode 100644 meta-openstack/recipes-support/dnsmasq/dnsmasq_2.63.bbappend
 create mode 100644 meta-openstack/recipes-support/dnsmasq/dnsmasq_2.68.bbappend
 delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend
 create mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend

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 @@
+INC := "${@int(PRINC) + 1}"
+
+do_install_append() {
+    sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
+
+    # default layout for htdocsdir in 2.4.7 is different, create the following for
+    # backward compatibility reasons
+
+    mkdir -p ${D}${datadir}/${BPN}/default-site
+    ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
+    
+    sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2
+}
+
+FILES_${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 @@
+RRECOMMENDS_${PN} += "kernel-module-veth \
+	"
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 @@
+INC := "${@int(PRINC) + 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
+}
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 @@
+INC := "${@int(PRINC) + 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
+}
diff --git a/meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend b/meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend
deleted file mode 100644
index 7aca867..0000000
--- a/meta-openstack/recipes-extended/apache2/apache2_2.4.7.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-INC := "${@int(PRINC) + 1}"
-
-do_install_append() {
-    sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
-
-    # default layout for htdocsdir in 2.4.7 is different, create the following for
-    # backward compatibility reasons
-
-    mkdir -p ${D}${datadir}/${BPN}/default-site
-    ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
-    
-    sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2
-}
-
-FILES_${PN} += "${datadir}/${BPN}/default-site"
diff --git a/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend b/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend
new file mode 100644
index 0000000..7aca867
--- /dev/null
+++ b/meta-openstack/recipes-extended/apache2/apache2_2.4.9.bbappend
@@ -0,0 +1,15 @@
+INC := "${@int(PRINC) + 1}"
+
+do_install_append() {
+    sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
+
+    # default layout for htdocsdir in 2.4.7 is different, create the following for
+    # backward compatibility reasons
+
+    mkdir -p ${D}${datadir}/${BPN}/default-site
+    ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
+    
+    sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2
+}
+
+FILES_${PN} += "${datadir}/${BPN}/default-site"
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
deleted file mode 100644
index 50fab9f..0000000
--- a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-INC := "${@int(PRINC) + 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
-}
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
deleted file mode 100644
index 50fab9f..0000000
--- a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-INC := "${@int(PRINC) + 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
-}
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend
new file mode 100644
index 0000000..50fab9f
--- /dev/null
+++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend
@@ -0,0 +1,5 @@
+INC := "${@int(PRINC) + 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
+}
diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.63.bbappend b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.63.bbappend
deleted file mode 100644
index 52eab54..0000000
--- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.63.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-do_install_append() {
-    cd ${S}/contrib/wrt
-    oe_runmake
-
-    install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir}
-
-    # Remove /var/run as it is created on startup
-    rm -rf ${D}${localstatedir}/run
-}
diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.68.bbappend b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.68.bbappend
new file mode 100644
index 0000000..52eab54
--- /dev/null
+++ b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.68.bbappend
@@ -0,0 +1,9 @@
+do_install_append() {
+    cd ${S}/contrib/wrt
+    oe_runmake
+
+    install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir}
+
+    # Remove /var/run as it is created on startup
+    rm -rf ${D}${localstatedir}/run
+}
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend
deleted file mode 100644
index 34ad5b8..0000000
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-RRECOMMENDS_${PN} += "kernel-module-veth \
-	"
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend
new file mode 100644
index 0000000..34ad5b8
--- /dev/null
+++ b/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend
@@ -0,0 +1,2 @@
+RRECOMMENDS_${PN} += "kernel-module-veth \
+	"
-- 
cgit v1.2.3-54-g00ecf