aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-10-30 10:23:21 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2013-10-30 10:23:21 -0400
commitc46d6acbf606e45a3b8fec4f3d1d9070257e47ce (patch)
tree32a9666a647fd3ce3111d538e98f94ad6f7715a2
parentb19f4da0c1bdf69765582a38d7ccd435ba324556 (diff)
downloadmeta-cloud-services-c46d6acbf606e45a3b8fec4f3d1d9070257e47ce.tar.gz
meta-cloud-services-c46d6acbf606e45a3b8fec4f3d1d9070257e47ce.tar.bz2
meta-cloud-services-c46d6acbf606e45a3b8fec4f3d1d9070257e47ce.zip
meta-openstack: remove duplicate dnsmasq bbappend
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend9
-rw-r--r--meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend9
2 files changed, 7 insertions, 11 deletions
diff --git a/meta-openstack/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend b/meta-openstack/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
deleted file mode 100644
index 9c031ce..0000000
--- a/meta-openstack/recipes-connectivity/dnsmasq/dnsmasq_2.55.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}
-}
-
-
-
diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend
index 15d3444..52eab54 100644
--- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend
+++ b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend
@@ -1,4 +1,9 @@
do_install_append() {
- # Remove /var/run as it is created on startup
- rm -rf ${D}${localstatedir}/run
+ 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
}