From 6f59e2ac45dc6015784d34eb1c2d940d96ad8215 Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Tue, 15 Sep 2015 09:45:35 -0400
Subject: housekeeping: switch more bbappends to use wildcards

In order to avoid future danglers move more bbappends to use
wildcards. This also helps when folks are using meta-cloud-services
with other branches then master. These are trivial in that they are
not being modified and have been audited and shown to be still
applicable.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-dateutil_1.%.bbappend | 1 +
 meta-openstack/recipes-devtools/python/python-dateutil_1.5.bbappend | 1 -
 meta-openstack/recipes-extended/sysklogd/sysklogd_1.%.bbappend      | 6 ++++++
 meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend    | 6 ------
 meta-openstack/recipes-support/iproute2/iproute2_3.%.bbappend       | 4 ++++
 meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend    | 4 ----
 meta-openstack/recipes-support/xmlto/xmlto_0.%.bbappend             | 1 +
 meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend          | 1 -
 8 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-dateutil_1.%.bbappend
 delete mode 100644 meta-openstack/recipes-devtools/python/python-dateutil_1.5.bbappend
 create mode 100644 meta-openstack/recipes-extended/sysklogd/sysklogd_1.%.bbappend
 delete mode 100644 meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend
 create mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.%.bbappend
 delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend
 create mode 100644 meta-openstack/recipes-support/xmlto/xmlto_0.%.bbappend
 delete mode 100644 meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend

(limited to 'meta-openstack')

diff --git a/meta-openstack/recipes-devtools/python/python-dateutil_1.%.bbappend b/meta-openstack/recipes-devtools/python/python-dateutil_1.%.bbappend
new file mode 100644
index 0000000..68409e5
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-dateutil_1.%.bbappend
@@ -0,0 +1 @@
+CLEANBROKEN = "1"
diff --git a/meta-openstack/recipes-devtools/python/python-dateutil_1.5.bbappend b/meta-openstack/recipes-devtools/python/python-dateutil_1.5.bbappend
deleted file mode 100644
index 68409e5..0000000
--- a/meta-openstack/recipes-devtools/python/python-dateutil_1.5.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-CLEANBROKEN = "1"
diff --git a/meta-openstack/recipes-extended/sysklogd/sysklogd_1.%.bbappend b/meta-openstack/recipes-extended/sysklogd/sysklogd_1.%.bbappend
new file mode 100644
index 0000000..8da640f
--- /dev/null
+++ b/meta-openstack/recipes-extended/sysklogd/sysklogd_1.%.bbappend
@@ -0,0 +1,6 @@
+#
+# Copyright (C) 2014 Wind River Systems, Inc.
+#
+
+require recipes-extended/syslog/syslog-user.inc
+
diff --git a/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend b/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend
deleted file mode 100644
index 8da640f..0000000
--- a/meta-openstack/recipes-extended/sysklogd/sysklogd_1.5.1.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (C) 2014 Wind River Systems, Inc.
-#
-
-require recipes-extended/syslog/syslog-user.inc
-
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.%.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.%.bbappend
new file mode 100644
index 0000000..2fde00d
--- /dev/null
+++ b/meta-openstack/recipes-support/iproute2/iproute2_3.%.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
+
+RRECOMMENDS_${PN} += "kernel-module-veth \
+	"
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend
deleted file mode 100644
index 2fde00d..0000000
--- a/meta-openstack/recipes-support/iproute2/iproute2_3.17.0.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
-
-RRECOMMENDS_${PN} += "kernel-module-veth \
-	"
diff --git a/meta-openstack/recipes-support/xmlto/xmlto_0.%.bbappend b/meta-openstack/recipes-support/xmlto/xmlto_0.%.bbappend
new file mode 100644
index 0000000..7447c56
--- /dev/null
+++ b/meta-openstack/recipes-support/xmlto/xmlto_0.%.bbappend
@@ -0,0 +1 @@
+inherit autotools-brokensep
diff --git a/meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend b/meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend
deleted file mode 100644
index 7447c56..0000000
--- a/meta-openstack/recipes-support/xmlto/xmlto_0.0.26.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-inherit autotools-brokensep
-- 
cgit v1.2.3-54-g00ecf