openstlinux/meta-st-openstlinux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IMAGES-SAMPLES: cleanup and updates

Browse Source 
Change-Id: Id15cffd1bc57b654599cb540210e160d397e0a8c
This commit is contained in:
Romuald JEANNE
2020-06-18 12:34:32 +02:00
committed by Bernard PUEL
parent fd079e2d2c
commit 02c4152a22
8 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
conf/template/conf-notes.txt
View File

@ -6,8 +6,4 @@ Available images for OpenSTLinux layers are:
- Other OpenSTLinux images:
- Supported images:
st-image-core - OpenSTLinux core image
- Proposed images as example only:
st-example-image-qt - ST example of image based on Qt framework (require 'openstlinux-eglfs' distro)
st-example-image-x11 - ST example of image based on X11 (require 'openstlinux-x11' distro)
st-example-image-xfce - ST example of image based on XFCE framework (require 'openstlinux-x11' distro)
and more images are available on meta-st-openstlinux/recipes-samples/images.

4
recipes-samples/images/st-example-image-qt.bb
View File

@ -3,7 +3,7 @@ LICENSE = "Proprietary"
include recipes-st/images/st-image.inc
inherit core-image distro_features_check
inherit core-image features_check
# let's make sure we have a good image..
CONFLICT_DISTRO_FEATURES = "x11 wayland"
@ -29,6 +29,8 @@ ST_EXAMPLE_IMAGE = "1"
# INSTALL addons
#
CORE_IMAGE_EXTRA_INSTALL += " \
resize-helper \
\
packagegroup-framework-core-base \
packagegroup-framework-tools-base \
\

4
recipes-samples/images/st-example-image-x11.bb
View File

@ -3,7 +3,7 @@ LICENSE = "Proprietary"
include recipes-st/images/st-image.inc
inherit core-image distro_features_check
inherit core-image features_check
# let's make sure we have a good image..
REQUIRED_DISTRO_FEATURES = "x11"
@ -34,6 +34,8 @@ SYSTEMD_DEFAULT_TARGET = "graphical.target"
# INSTALL addons
#
CORE_IMAGE_EXTRA_INSTALL += " \
resize-helper \
\
packagegroup-framework-core-base \
packagegroup-framework-tools-base \
\

4
recipes-samples/images/st-example-image-xfce.bb
View File

@ -3,7 +3,7 @@ LICENSE = "Proprietary"
include recipes-st/images/st-image.inc
inherit core-image distro_features_check extrausers
inherit core-image features_check extrausers
# let's make sure we have a good image..
CONFLICT_DISTRO_FEATURES = "wayland"
@ -35,6 +35,8 @@ SYSTEMD_DEFAULT_TARGET = "graphical.target"
# INSTALL addons
#
CORE_IMAGE_EXTRA_INSTALL += " \
resize-helper \
\
packagegroup-framework-core-base \
packagegroup-framework-tools-base \
\

17
recipes-samples/packagegroups/packagegroup-framework-sample-qt-extra.bb
View File

@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup distro_features_check
inherit packagegroup features_check
REQUIRED_DISTRO_FEATURES = "opengl"
@ -15,7 +15,6 @@ PACKAGES = "\
"
RDEPENDS_packagegroup-framework-sample-qt-extra = "\
qtcanvas3d \
\
qt3d \
qt3d-qmlplugins \
@ -47,20 +46,6 @@ RDEPENDS_packagegroup-framework-sample-qt-extra = "\
SUMMARY_packagegroup-framework-sample-qt-extra-examples = "Framework sample qt extra components for examples"
RDEPENDS_packagegroup-framework-sample-qt-extra-examples = "\
qtcanvas3d-examples \
\
qtquickcontrols-examples \
qtwebkit-examples \
\
qtsensors-examples \
qtserialport-examples \
\
qtcharts-examples \
\
qt3d-examples \
\
qtlocation-examples \
\
qt5nmapcarousedemo \
cinematicexperience \
qtsmarthome \

8
recipes-samples/packagegroups/packagegroup-framework-sample-qt.bb
View File

@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup distro_features_check
inherit packagegroup features_check
REQUIRED_DISTRO_FEATURES = "opengl"
@ -38,10 +38,4 @@ RDEPENDS_packagegroup-framework-sample-qt = "\
SUMMARY_packagegroup-framework-sample-qt-examples = "Framework sample qt components for examples"
RDEPENDS_packagegroup-framework-sample-qt-examples = "\
qtbase-examples \
\
qtdeclarative-examples \
\
qtmultimedia-examples \
\
qtscript-examples \
"

2
recipes-samples/packagegroups/packagegroup-framework-sample-x11.bb
View File

@ -2,7 +2,7 @@ SUMMARY = "Framework sample x11 components"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
inherit packagegroup distro_features_check
inherit packagegroup features_check
REQUIRED_DISTRO_FEATURES = "x11"

2
recipes-samples/packagegroups/packagegroup-framework-sample-xfce.bb
View File

@ -2,7 +2,7 @@ SUMMARY = "Framework sample xfce components"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
inherit packagegroup distro_features_check
inherit packagegroup features_check
REQUIRED_DISTRO_FEATURES = "x11"