From 791e2f9e03e2a3872b271e54d26291febe9c3aaf Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 29 Aug 2014 09:46:00 -0400
Subject: bbapends: resync bbappends to oe-core/meta-oe versions

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-graphics/xorg-app/xterm_293.bbappend         |  1 -
 .../recipes-graphics/xorg-app/xterm_303.bbappend         |  1 +
 recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend         | 16 ----------------
 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend            | 16 ++++++++++++++++
 4 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 meta-openstack/recipes-graphics/xorg-app/xterm_293.bbappend
 create mode 100644 meta-openstack/recipes-graphics/xorg-app/xterm_303.bbappend
 delete mode 100644 recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
 create mode 100644 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend

diff --git a/meta-openstack/recipes-graphics/xorg-app/xterm_293.bbappend b/meta-openstack/recipes-graphics/xorg-app/xterm_293.bbappend
deleted file mode 100644
index bb8c310..0000000
--- a/meta-openstack/recipes-graphics/xorg-app/xterm_293.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-DEPENDS += "freetype-native"
diff --git a/meta-openstack/recipes-graphics/xorg-app/xterm_303.bbappend b/meta-openstack/recipes-graphics/xorg-app/xterm_303.bbappend
new file mode 100644
index 0000000..bb8c310
--- /dev/null
+++ b/meta-openstack/recipes-graphics/xorg-app/xterm_303.bbappend
@@ -0,0 +1 @@
+DEPENDS += "freetype-native"
diff --git a/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend b/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
deleted file mode 100644
index a23f7c9..0000000
--- a/recipes-connectivity/dhcp/dhcp_4.2.3-P2.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.0.bbappend b/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
new file mode 100644
index 0000000..a23f7c9
--- /dev/null
+++ b/recipes-connectivity/dhcp/dhcp_4.3.0.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