diff options
author | Mingli Yu <Mingli.Yu@windriver.com> | 2018-10-11 11:50:17 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-10-11 14:46:29 -0400 |
commit | 5b4e2a5ff9b36b6b244bfa0861bc8f8da16a832f (patch) | |
tree | 076a8876d939ad086670fe8f0e5c71e8216ec3c5 | |
parent | 64d636847a62f76ca8383e83fa4719180e80bacb (diff) | |
download | meta-cloud-services-5b4e2a5ff9b36b6b244bfa0861bc8f8da16a832f.tar.gz |
sanity-meta-openstack.bbclass: add class for bbappend files checking
Add a new class sanity-meta-openstack.bbclass,
to check whether necessary settings are available
for bbappend files and preferred version setting
in this layer to be effective and warn users if not.
In addition, a variable SKIP_SANITY_META_OPENSTACK_CHECK
is added to enable users to explicitly skip the
checking to avoid unwanted warnings.
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | meta-openstack/README | 19 | ||||
-rw-r--r-- | meta-openstack/classes/sanity-meta-openstack.bbclass | 10 | ||||
-rw-r--r-- | meta-openstack/conf/layer.conf | 4 |
3 files changed, 33 insertions, 0 deletions
diff --git a/meta-openstack/README b/meta-openstack/README index 81b843b..8506250 100644 --- a/meta-openstack/README +++ b/meta-openstack/README | |||
@@ -5,6 +5,25 @@ This layer provides support for building the packages from the OpenStack project | |||
5 | The layer contains recipes for the nova, glance, keystone, cinder, quantum, swift | 5 | The layer contains recipes for the nova, glance, keystone, cinder, quantum, swift |
6 | and horizon components. | 6 | and horizon components. |
7 | 7 | ||
8 | The bbappend files for some recipes (e.g. postgresql) and preferred version setting | ||
9 | (e.g. python-networkx)in this layer need to have 'openstack' in DISTRO_FEATURES to | ||
10 | have effect. To enable them, add in configuration file the following line. | ||
11 | |||
12 | DISTRO_FEATURES_append = " openstack" | ||
13 | |||
14 | If meta-openstack is included, but openstack is not enabled as a | ||
15 | distro feature a warning is printed at parse time: | ||
16 | |||
17 | You have included the meta-openstack layer, but | ||
18 | 'openstack' has not been enabled in your DISTRO_FEATURES. Some bbappend files | ||
19 | and preferred version setting may not take effect. See the meta-openstack README | ||
20 | for details on enabling openstack support. | ||
21 | |||
22 | If you know what you are doing, this warning can be disabled by setting the following | ||
23 | variable in your configuration: | ||
24 | |||
25 | SKIP_META_OPENSTACK_SANITY_CHECK = 1 | ||
26 | |||
8 | Dependencies | 27 | Dependencies |
9 | ------------ | 28 | ------------ |
10 | 29 | ||
diff --git a/meta-openstack/classes/sanity-meta-openstack.bbclass b/meta-openstack/classes/sanity-meta-openstack.bbclass new file mode 100644 index 0000000..3d5e57b --- /dev/null +++ b/meta-openstack/classes/sanity-meta-openstack.bbclass | |||
@@ -0,0 +1,10 @@ | |||
1 | addhandler openstack_bbappend_distrocheck | ||
2 | openstack_bbappend_distrocheck[eventmask] = "bb.event.SanityCheck" | ||
3 | python openstack_bbappend_distrocheck() { | ||
4 | skip_check = e.data.getVar('SKIP_META_OPENSTACK_SANITY_CHECK') == "1" | ||
5 | if 'openstack' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check: | ||
6 | bb.warn("You have included the meta-openstack layer, but \ | ||
7 | 'openstack' has not been enabled in your DISTRO_FEATURES. Some bbappend files \ | ||
8 | and preferred version setting may not take effect. See the meta-openstack README \ | ||
9 | for details on enabling openstack support.") | ||
10 | } | ||
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf index 4ce6ea7..9ca806e 100644 --- a/meta-openstack/conf/layer.conf +++ b/meta-openstack/conf/layer.conf | |||
@@ -35,4 +35,8 @@ PREFERRED_VERSION_python-jsonschema = "2.6.0" | |||
35 | PREFERRED_VERSION_python-networkx = "1.11" | 35 | PREFERRED_VERSION_python-networkx = "1.11" |
36 | PREFERRED_VERSION_python-oslo.i18n = "3.17.0+gitAUTOINC+f2729cd36f" | 36 | PREFERRED_VERSION_python-oslo.i18n = "3.17.0+gitAUTOINC+f2729cd36f" |
37 | 37 | ||
38 | # Sanity check for meta-openstack layer. | ||
39 | # Setting SKIP_META_OPENSTACK_SANITY_CHECK to "1" would skip the bbappend files check. | ||
40 | INHERIT += "sanity-meta-openstack" | ||
41 | |||
38 | LICENSE_PATH += "${LAYERDIR}/licenses" | 42 | LICENSE_PATH += "${LAYERDIR}/licenses" |