aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-02-25 16:48:22 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-03-03 12:23:16 +0000
commit18e861fc0648fe3739d898c0e1b659bedbf569b8 (patch)
treece3d25e29be5ca68fe158716490a4b1177e27e11
parente51d283144630390525e06b51eb2fc159a48ae8d (diff)
Mask out older recipes in meta-iot-cloud
Add BBMASK additions to mask out older cjson, python3-httplib2, and python3-xmltodict recipes in meta-iot-cloud. Since meta-iot-cloud is related to the agl-cloudproxy feature, they have been added to a new agl-cloudproxy.inc file to keep them distinct from other agl-demo configuration. Bug-AGL: SPEC-3826 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I19a4e94f312e72b5770ecfe836fca9e8df6a91bc (cherry picked from commit d0284872017e0c7a98d6ac1104472a7b32ea57d5)
-rw-r--r--conf/include/agl-cloudproxy.inc5
-rw-r--r--templates/feature/agl-demo/50_local.conf.inc4
2 files changed, 9 insertions, 0 deletions
diff --git a/conf/include/agl-cloudproxy.inc b/conf/include/agl-cloudproxy.inc
new file mode 100644
index 000000000..d62e3095f
--- /dev/null
+++ b/conf/include/agl-cloudproxy.inc
@@ -0,0 +1,5 @@
+# Mask out recipes with older versions than those available in
+# meta-oe and meta-python
+BBMASK += "meta-iot-cloud/recipes-support/cjson/cjson_1.7.10.bb"
+BBMASK += "meta-iot-cloud/recipes-devtools/python/python3-httplib2_0.11.3.bb"
+BBMASK += "meta-iot-cloud/recipes-devtools/python/python3-xmltodict_0.11.0.bb"
diff --git a/templates/feature/agl-demo/50_local.conf.inc b/templates/feature/agl-demo/50_local.conf.inc
index 76626243c..3b866e6f0 100644
--- a/templates/feature/agl-demo/50_local.conf.inc
+++ b/templates/feature/agl-demo/50_local.conf.inc
@@ -1,2 +1,6 @@
#see meta-agl-demo/conf/include/agl-demo.inc
require conf/include/agl-demo.inc
+
+#see meta-agl-demo/conf/include/agl-cloudproxy.inc
+#SPEC-3826
+require conf/include/agl-cloudproxy.inc