summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-02-03 14:17:30 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2022-02-16 11:53:36 +0000
commit87eaa818b63ef528945953ccb83734aab7403e71 (patch)
treeb7466362e2bcb7c6674e528e725efd2070924619
parentc7bd56fd97882ae8ce9ca7e4b529cc0b8f1f3448 (diff)
Remove use of meta-openstlinux
Build images without meta-openstlinux distro layer. Change-Id: I7f3585bd322c107207b1f948441b157a18ae548f Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
-rw-r--r--conf/bblayers.conf.sample1
-rw-r--r--conf/distro/include/b2qt.inc15
-rw-r--r--conf/layer.conf2
3 files changed, 0 insertions, 18 deletions
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 26d4725..1351810 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -39,7 +39,6 @@ BBLAYERS ?= " \
${BSPDIR}/sources/poky/meta \
${BSPDIR}/sources/poky/meta-poky \
${BSPDIR}/sources/meta-stm32mp \
- ${BSPDIR}/sources/meta-st-openstlinux \
${BSPDIR}/sources/meta-openembedded/meta-oe \
${BSPDIR}/sources/meta-openembedded/meta-python \
${BSPDIR}/sources/meta-openembedded/meta-networking \
diff --git a/conf/distro/include/b2qt.inc b/conf/distro/include/b2qt.inc
index c2f6a27..005febf 100644
--- a/conf/distro/include/b2qt.inc
+++ b/conf/distro/include/b2qt.inc
@@ -46,20 +46,5 @@ OGL_RUNTIME_DEV = ""
ST_VENDORFS = "0"
-IMAGE_INSTALL:append = " resize-helper systemd-mount-partitions userfs-cleanup-package "
-
TOOLCHAIN_HOST_TASK:remove:sdkmingw32 = " ${ST_TOOLS_FOR_SDK} "
TOOLCHAIN_HOST_TASK:remove:sdkmingw32 = " ${ST_DEPENDENCIES_BUILD_FOR_SDK} "
-
-BBMASK += "\
- meta-st-openstlinux/recipes-qt \
- meta-st-openstlinux/recipes-connectivity \
- meta-st-openstlinux/recipes-graphics \
- meta-st-openstlinux/recipes-multimedia \
- meta-st-openstlinux/recipes-webadmin \
- meta-st-openstlinux/oe-core \
- meta-st-openstlinux/recipes-st \
- meta-st-openstlinux/recipes-samples \
- meta-st-openstlinux/recipes-core/systemd/systemd_244.3.bbappend \
-"
-
diff --git a/conf/layer.conf b/conf/layer.conf
index a88915c..5d79992 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -40,5 +40,3 @@ BBFILE_PATTERN_b2qt_st := "^${LAYERDIR}/"
BBFILE_PRIORITY_b2qt_st = "20"
LAYERSERIES_COMPAT_b2qt_st = "zeus"
-LAYERSERIES_COMPAT_st-openstlinux = "zeus"
-