summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2015-08-05 16:29:46 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-08-06 09:35:50 -0400
commit4c5711daa52b584d73c69d4c7a3818c9982b1480 (patch)
treeddafd0a6bf65ff8205266cf26e582e6d0e4c9487
parent0de609c86dc5fd37c4333eaf03ad05421013b6e1 (diff)
downloadmeta-cloud-services-4c5711daa52b584d73c69d4c7a3818c9982b1480.tar.gz
meta-openstack: fix dangling bbappends by adding wildcard
Several bbappends were raising 'dangling' warnings since the base recipe version has changed without a similar change being made in this repo. The following are renames that include a wildcard to broaden the versions to which these bbappends will be applied to. This will address the 'dangling' warnings while ensuring the changes made in this repo are properly applied to the associated recipes. For the most part the files remain unchanged, in the case of postgresql the 'brokensep' has been removed as there exists no more S != B issues in the base recipe. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-connectivity/openssh/openssh_6.%.bbappend (renamed from meta-openstack/recipes-connectivity/openssh/openssh_6.7p1.bbappend)0
-rw-r--r--meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend (renamed from meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend)0
-rw-r--r--meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend (renamed from meta-openstack/recipes-httpd/apache2/apache2_2.4.10.bbappend)0
-rw-r--r--meta-openstack/recipes-support/postgresql/postgresql_9.%.bbappend (renamed from meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend)2
4 files changed, 1 insertions, 1 deletions
diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_6.7p1.bbappend b/meta-openstack/recipes-connectivity/openssh/openssh_6.%.bbappend
index bfc543a..bfc543a 100644
--- a/meta-openstack/recipes-connectivity/openssh/openssh_6.7p1.bbappend
+++ b/meta-openstack/recipes-connectivity/openssh/openssh_6.%.bbappend
diff --git a/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend b/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend
index 0e93ace..0e93ace 100644
--- a/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend
+++ b/meta-openstack/recipes-extended/libpam/libpam_1.%.bbappend
diff --git a/meta-openstack/recipes-httpd/apache2/apache2_2.4.10.bbappend b/meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend
index 7af8143..7af8143 100644
--- a/meta-openstack/recipes-httpd/apache2/apache2_2.4.10.bbappend
+++ b/meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend
diff --git a/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend b/meta-openstack/recipes-support/postgresql/postgresql_9.%.bbappend
index db247e5..42ceaf8 100644
--- a/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend
+++ b/meta-openstack/recipes-support/postgresql/postgresql_9.%.bbappend
@@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3SRC_URI += "file://postgresql \ 3SRC_URI += "file://postgresql \
4 file://postgresql-init" 4 file://postgresql-init"
5 5
6inherit useradd update-rc.d identity hosts autotools-brokensep openstackchef 6inherit useradd update-rc.d identity hosts openstackchef
7 7
8PACKAGECONFIG[libxml] = "--with-libxml CFLAGS=-I${STAGING_INCDIR}/libxml2,--without-libxml,libxml2,libxml2" 8PACKAGECONFIG[libxml] = "--with-libxml CFLAGS=-I${STAGING_INCDIR}/libxml2,--without-libxml,libxml2,libxml2"
9 9