diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-02-19 22:23:18 -0500 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-05-21 14:46:36 -0400 |
| commit | 73b4417dd0d5d1675be90ee5882c16405f789259 (patch) | |
| tree | c39a243ec9c3d237548c0e614166c270a5be9cb8 /meta-openstack/classes | |
| parent | 8106f692daf771d665f4f4cc275f0221c1527210 (diff) | |
| download | meta-cloud-services-73b4417dd0d5d1675be90ee5882c16405f789259.tar.gz | |
chef: make deploychef dependencies a distro feature
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/classes')
| -rw-r--r-- | meta-openstack/classes/openstackchef_inc.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/classes/openstackchef_inc.bbclass b/meta-openstack/classes/openstackchef_inc.bbclass index 7795082..9574008 100644 --- a/meta-openstack/classes/openstackchef_inc.bbclass +++ b/meta-openstack/classes/openstackchef_inc.bbclass | |||
| @@ -50,8 +50,8 @@ ERB_DEFAULT_SUFFIX="]" | |||
| 50 | TEMPLATE_EXTENSION='.erb' | 50 | TEMPLATE_EXTENSION='.erb' |
| 51 | #Build deploychef package since this class has run-time and buil-time dependency | 51 | #Build deploychef package since this class has run-time and buil-time dependency |
| 52 | #on it | 52 | #on it |
| 53 | DEPENDS_${PN} += "deploychef" | 53 | DEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'chef', 'deploychef', '', d)}" |
| 54 | RDEPENDS_${PN} += "deploychef" | 54 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'chef', 'deploychef', '', d)}" |
| 55 | CHEF_VERSION = '1' | 55 | CHEF_VERSION = '1' |
| 56 | #For classes that define a special substitution function, this variable is | 56 | #For classes that define a special substitution function, this variable is |
| 57 | #set by this class and specifies the file named passed back to these function | 57 | #set by this class and specifies the file named passed back to these function |