diff options
-rw-r--r-- | conf/include/bblayers/sota.inc | 1 | ||||
-rw-r--r-- | conf/include/bblayers/sota_am335x-evm.inc | 3 | ||||
-rw-r--r-- | conf/include/bblayers/sota_intel-corei7-64.inc | 4 | ||||
-rw-r--r-- | conf/include/bblayers/sota_m3ulcb.inc | 5 | ||||
-rw-r--r-- | conf/include/bblayers/sota_porter.inc | 6 | ||||
-rw-r--r-- | conf/include/bblayers/sota_qemux86-64.inc | 2 | ||||
-rw-r--r-- | conf/include/bblayers/sota_raspberrypi2.inc | 5 | ||||
-rw-r--r-- | conf/include/bblayers/sota_raspberrypi3.inc | 5 | ||||
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 8 |
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 @@ | |||
1 | BBLAYERS += "${METADIR}/meta-updater" | 1 | BBLAYERS += "${METADIR}/meta-updater" |
2 | BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems" | 2 | BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems" |
3 | BBLAYERS += "${METADIR}/meta-openembedded/meta-oe" | 3 | BBLAYERS += "${METADIR}/meta-openembedded/meta-oe" |
4 | 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 @@ | |||
1 | BBLAYERS += "${METADIR}/meta-ti" | ||
2 | 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 @@ | |||
1 | 1 | BBLAYERS += "${METADIR}/meta-updater-minnowboard" | |
2 | BBLAYERS += " ${METADIR}/meta-updater-minnowboard ${METADIR}/meta-intel " | 2 | 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 @@ | |||
1 | 1 | BBLAYERS += "${METADIR}/meta-renesas" | |
2 | BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas-rcar-gen3 ${METADIR}/meta-openembedded/meta-multimedia" | 2 | BBLAYERS += "${METADIR}/meta-renesas-rcar-gen3" |
3 | 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 @@ | |||
1 | 1 | BBLAYERS += "${METADIR}/meta-renesas" | |
2 | BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas/meta-rcar-gen2 ${METADIR}/meta-openembedded/meta-multimedia ${METADIR}/meta-updater-porter" | 2 | BBLAYERS += "${METADIR}/meta-renesas/meta-rcar-gen2" |
3 | BBLAYERS += "${METADIR}/meta-openembedded/meta-multimedia" | ||
4 | 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 @@ | |||
1 | BBLAYERS += " ${METADIR}/meta-openembedded/meta-python " | 1 | BBLAYERS += "${METADIR}/meta-updater-raspberrypi" |
2 | 2 | BBLAYERS += "${METADIR}/meta-raspberrypi" | |
3 | BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${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 @@ | |||
1 | BBLAYERS += " ${METADIR}/meta-openembedded/meta-python " | 1 | BBLAYERS += "${METADIR}/meta-updater-raspberrypi" |
2 | 2 | BBLAYERS += "${METADIR}/meta-raspberrypi" | |
3 | BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${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): | |||
235 | def setUpLocal(self): | 235 | def setUpLocal(self): |
236 | # Add layers before changing the machine type, otherwise the sanity | 236 | # Add layers before changing the machine type, otherwise the sanity |
237 | # checker complains loudly. | 237 | # checker complains loudly. |
238 | layer_python = "meta-openembedded/meta-python" | ||
239 | layer_rpi = "meta-raspberrypi" | 238 | layer_rpi = "meta-raspberrypi" |
240 | layer_upd_rpi = "meta-updater-raspberrypi" | 239 | layer_upd_rpi = "meta-updater-raspberrypi" |
241 | result = runCmd('bitbake-layers show-layers') | 240 | result = runCmd('bitbake-layers show-layers') |
@@ -244,11 +243,6 @@ class RpiTests(OESelftestTestCase): | |||
244 | # layers we need aren't where we expect them, we are out of luck. | 243 | # layers we need aren't where we expect them, we are out of luck. |
245 | path = os.path.abspath(os.path.dirname(__file__)) | 244 | path = os.path.abspath(os.path.dirname(__file__)) |
246 | metadir = path + "/../../../../../" | 245 | metadir = path + "/../../../../../" |
247 | if re.search(layer_python, result.output) is None: | ||
248 | self.meta_python = metadir + layer_python | ||
249 | runCmd('bitbake-layers add-layer "%s"' % self.meta_python) | ||
250 | else: | ||
251 | self.meta_python = None | ||
252 | if re.search(layer_rpi, result.output) is None: | 246 | if re.search(layer_rpi, result.output) is None: |
253 | self.meta_rpi = metadir + layer_rpi | 247 | self.meta_rpi = metadir + layer_rpi |
254 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) | 248 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) |
@@ -284,8 +278,6 @@ class RpiTests(OESelftestTestCase): | |||
284 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) | 278 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) |
285 | if self.meta_rpi: | 279 | if self.meta_rpi: |
286 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) | 280 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) |
287 | if self.meta_python: | ||
288 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_python, ignore_status=True) | ||
289 | 281 | ||
290 | def test_rpi(self): | 282 | def test_rpi(self): |
291 | logger = logging.getLogger("selftest") | 283 | logger = logging.getLogger("selftest") |