Merge pull request #493 from advancedtelematic/fix/meta-python-depend

Add meta-python layer to all platforms

9 files changed, 16 insertions, 23 deletions

diff --git a/conf/include/bblayers/sota.inc b/conf/include/bblayers/sota.inc
index 26eea22..c4ecd4e 100644
--- a/conf/include/bblayers/sota.inc
+++ b/conf/include/bblayers/sota.inc
@@ -1,3 +1,4 @@
 BBLAYERS += "${METADIR}/meta-updater"
 BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems"
 BBLAYERS += "${METADIR}/meta-openembedded/meta-oe"
+BBLAYERS += "${METADIR}/meta-openembedded/meta-python"
diff --git a/conf/include/bblayers/sota_am335x-evm.inc b/conf/include/bblayers/sota_am335x-evm.inc
index f2d485d..909a7a4 100644
--- a/conf/include/bblayers/sota_am335x-evm.inc
+++ b/conf/include/bblayers/sota_am335x-evm.inc
@@ -1,2 +1 @@
-
-BBLAYERS += " ${METADIR}/meta-ti "
+BBLAYERS += "${METADIR}/meta-ti"
diff --git a/conf/include/bblayers/sota_intel-corei7-64.inc b/conf/include/bblayers/sota_intel-corei7-64.inc
index 1771e6c..8e85a6c 100644
--- a/conf/include/bblayers/sota_intel-corei7-64.inc
+++ b/conf/include/bblayers/sota_intel-corei7-64.inc
@@ -1,2 +1,2 @@
-
-BBLAYERS += " ${METADIR}/meta-updater-minnowboard ${METADIR}/meta-intel "
+BBLAYERS += "${METADIR}/meta-updater-minnowboard"
+BBLAYERS += "${METADIR}/meta-intel"
diff --git a/conf/include/bblayers/sota_m3ulcb.inc b/conf/include/bblayers/sota_m3ulcb.inc
index 04f78e4..4f2e0a9 100644
--- a/conf/include/bblayers/sota_m3ulcb.inc
+++ b/conf/include/bblayers/sota_m3ulcb.inc
@@ -1,2 +1,3 @@
-
-BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas-rcar-gen3 ${METADIR}/meta-openembedded/meta-multimedia"
+BBLAYERS += "${METADIR}/meta-renesas"
+BBLAYERS += "${METADIR}/meta-renesas-rcar-gen3"
+BBLAYERS += "${METADIR}/meta-openembedded/meta-multimedia"
diff --git a/conf/include/bblayers/sota_porter.inc b/conf/include/bblayers/sota_porter.inc
index 6964ef0..a50b71c 100644
--- a/conf/include/bblayers/sota_porter.inc
+++ b/conf/include/bblayers/sota_porter.inc
@@ -1,2 +1,4 @@
-
-BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas/meta-rcar-gen2 ${METADIR}/meta-openembedded/meta-multimedia ${METADIR}/meta-updater-porter"
+BBLAYERS += "${METADIR}/meta-renesas"
+BBLAYERS += "${METADIR}/meta-renesas/meta-rcar-gen2"
+BBLAYERS += "${METADIR}/meta-openembedded/meta-multimedia"
+BBLAYERS += "${METADIR}/meta-updater-porter"
diff --git a/conf/include/bblayers/sota_qemux86-64.inc b/conf/include/bblayers/sota_qemux86-64.inc
index 12d32ff..9ccbfa6 100644
--- a/conf/include/bblayers/sota_qemux86-64.inc
+++ b/conf/include/bblayers/sota_qemux86-64.inc
@@ -1 +1 @@
-BBLAYERS += " ${METADIR}/meta-updater-qemux86-64 " 
+BBLAYERS += "${METADIR}/meta-updater-qemux86-64"
diff --git a/conf/include/bblayers/sota_raspberrypi2.inc b/conf/include/bblayers/sota_raspberrypi2.inc
index cc26679..ea420ba 100644
--- a/conf/include/bblayers/sota_raspberrypi2.inc
+++ b/conf/include/bblayers/sota_raspberrypi2.inc
@@ -1,3 +1,2 @@
-BBLAYERS += " ${METADIR}/meta-openembedded/meta-python "
-
-BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " 
+BBLAYERS += "${METADIR}/meta-updater-raspberrypi"
+BBLAYERS += "${METADIR}/meta-raspberrypi"
diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc
index cc26679..ea420ba 100644
--- a/conf/include/bblayers/sota_raspberrypi3.inc
+++ b/conf/include/bblayers/sota_raspberrypi3.inc
@@ -1,3 +1,2 @@
-BBLAYERS += " ${METADIR}/meta-openembedded/meta-python "
-
-BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " 
+BBLAYERS += "${METADIR}/meta-updater-raspberrypi"
+BBLAYERS += "${METADIR}/meta-raspberrypi"
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 08521d5..a34a8cf 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -235,7 +235,6 @@ class RpiTests(OESelftestTestCase):
     def setUpLocal(self):
         # Add layers before changing the machine type, otherwise the sanity
         # checker complains loudly.
-        layer_python = "meta-openembedded/meta-python"
         layer_rpi = "meta-raspberrypi"
         layer_upd_rpi = "meta-updater-raspberrypi"
         result = runCmd('bitbake-layers show-layers')
@@ -244,11 +243,6 @@ class RpiTests(OESelftestTestCase):
         # layers we need aren't where we expect them, we are out of luck.
         path = os.path.abspath(os.path.dirname(__file__))
         metadir = path + "/../../../../../"
-        if re.search(layer_python, result.output) is None:
-            self.meta_python = metadir + layer_python
-            runCmd('bitbake-layers add-layer "%s"' % self.meta_python)
-        else:
-            self.meta_python = None
         if re.search(layer_rpi, result.output) is None:
             self.meta_rpi = metadir + layer_rpi
             runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi)
@@ -284,8 +278,6 @@ class RpiTests(OESelftestTestCase):
             runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True)
         if self.meta_rpi:
             runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True)
-        if self.meta_python:
-            runCmd('bitbake-layers remove-layer "%s"' % self.meta_python, ignore_status=True)
 
     def test_rpi(self):
         logger = logging.getLogger("selftest")