From 18e861fc0648fe3739d898c0e1b659bedbf569b8 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 25 Feb 2021 16:48:22 -0500 Subject: 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 Change-Id: I19a4e94f312e72b5770ecfe836fca9e8df6a91bc (cherry picked from commit d0284872017e0c7a98d6ac1104472a7b32ea57d5) --- conf/include/agl-cloudproxy.inc | 5 +++++ templates/feature/agl-demo/50_local.conf.inc | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 conf/include/agl-cloudproxy.inc 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 -- cgit 1.2.3-korg