From db43720c6ce4750be4776d01454a4d5cce21c9e6 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 20 Feb 2015 16:10:28 -0500
Subject: bbappend: rsync to oe-core master round2

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-support/dnsmasq/dnsmasq_2.71.bbappend        |  9 ---------
 .../recipes-support/dnsmasq/dnsmasq_2.72.bbappend        |  9 +++++++++
 meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend  |  1 -
 meta-openstack/recipes-support/ntp/ntp_4.2.8.bbappend    |  1 +
 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend            | 16 ----------------
 recipes-connectivity/dhcp/dhcp_4.3.1.bbappend            | 16 ++++++++++++++++
 6 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 meta-openstack/recipes-support/dnsmasq/dnsmasq_2.71.bbappend
 create mode 100644 meta-openstack/recipes-support/dnsmasq/dnsmasq_2.72.bbappend
 delete mode 100644 meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend
 create mode 100644 meta-openstack/recipes-support/ntp/ntp_4.2.8.bbappend
 delete mode 100644 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
 create mode 100644 recipes-connectivity/dhcp/dhcp_4.3.1.bbappend

diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.71.bbappend b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.71.bbappend
deleted file mode 100644
index 52eab54..0000000
--- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.71.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.72.bbappend b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.72.bbappend
new file mode 100644
index 0000000..52eab54
--- /dev/null
+++ b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.72.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/ntp/ntp_4.2.6p5.bbappend b/meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend
deleted file mode 100644
index 7447c56..0000000
--- a/meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-inherit autotools-brokensep
diff --git a/meta-openstack/recipes-support/ntp/ntp_4.2.8.bbappend b/meta-openstack/recipes-support/ntp/ntp_4.2.8.bbappend
new file mode 100644
index 0000000..7447c56
--- /dev/null
+++ b/meta-openstack/recipes-support/ntp/ntp_4.2.8.bbappend
@@ -0,0 +1 @@
+inherit autotools-brokensep
diff --git a/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend b/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
deleted file mode 100644
index a23f7c9..0000000
--- a/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://dhclient-exit-hooks \
-           "
-
-do_install_append () {
-	install -m 0644 ${WORKDIR}/dhclient-exit-hooks ${D}${sysconfdir}/dhcp/dhclient-exit-hooks
-	sed 's%/etc/dhclient-exit-hooks%/etc/dhcp/dhclient-exit-hooks%g' -i ${D}${base_sbindir}/dhclient-script
-
-	sed 's%request .*%\noption classless-static-routes code 121 = array of unsigned integer 8;\n\n&%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf
-	sed 's%netbios-name-servers,.*netbios-scope;%netbios-name-servers, netbios-scope, classless-static-routes;\n%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf
-
-}
-
-FILES_dhcp-client += "${sysconfdir}/dhcp/dhclient-exit-hooks \
-                     "
diff --git a/recipes-connectivity/dhcp/dhcp_4.3.1.bbappend b/recipes-connectivity/dhcp/dhcp_4.3.1.bbappend
new file mode 100644
index 0000000..a23f7c9
--- /dev/null
+++ b/recipes-connectivity/dhcp/dhcp_4.3.1.bbappend
@@ -0,0 +1,16 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://dhclient-exit-hooks \
+           "
+
+do_install_append () {
+	install -m 0644 ${WORKDIR}/dhclient-exit-hooks ${D}${sysconfdir}/dhcp/dhclient-exit-hooks
+	sed 's%/etc/dhclient-exit-hooks%/etc/dhcp/dhclient-exit-hooks%g' -i ${D}${base_sbindir}/dhclient-script
+
+	sed 's%request .*%\noption classless-static-routes code 121 = array of unsigned integer 8;\n\n&%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf
+	sed 's%netbios-name-servers,.*netbios-scope;%netbios-name-servers, netbios-scope, classless-static-routes;\n%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf
+
+}
+
+FILES_dhcp-client += "${sysconfdir}/dhcp/dhclient-exit-hooks \
+                     "
-- 
cgit v1.2.3-54-g00ecf