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

DISTRO: swtich to dunfell

Browse Source 
Signed-off-by: Christophe Priouzeau <christophe.priouzeau@linaro.org>
This commit is contained in:
Christophe Priouzeau
2019-06-28 11:39:52 +02:00
committed by Bernard PUEL
parent 1f09c1073d
commit 3a864fad79
6 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
conf/distro/include/openstlinux.inc
View File

@ -22,12 +22,13 @@ OPENSTLINUX_RELEASE ??= "snapshot"
DISTRO = "openstlinux"
DISTRO_NAME = "ST OpenSTLinux (A Yocto Project Based Distro)"
DISTRO_VERSION = "2.7-${@bb.utils.contains('OPENSTLINUX_RELEASE', 'snapshot', 'snapshot-${DATE}', '${OPENSTLINUX_RELEASE}', d)}"
DISTRO_VERSION = "3.1-${@bb.utils.contains('OPENSTLINUX_RELEASE', 'snapshot', 'snapshot-${DATE}', '${OPENSTLINUX_RELEASE}', d)}"
# Don't include the DATE variable in the sstate package signatures
DISTRO_VERSION[vardepsexclude] = "DATE"
DISTRO_CODENAME = "warrior"
DISTRO_CODENAME = "dunfell"
SDK_VENDOR = "-openstlinux_sdk"
# Warning: SDK_VENDOR does not contains a valid OS/ARCH name like : linux, arm
SDK_VENDOR = "-ostl_sdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
# Don't include the DATE variable in the sstate package signatures
SDK_VERSION[vardepsexclude] = "DATE"
@ -49,8 +50,6 @@ SDKPATH[vardepsexclude] = "DATE"
LOCALCONF_VERSION = "1"
LAYER_CONF_VERSION ?= "7"
# TODO: is that really want we want?
#IMAGE_LINGUAS = "en-us en-gb"
IMAGE_LINGUAS = "en-us en-gb"
# =========================================================================
@ -87,7 +86,7 @@ DISTRO_FEATURES_append = " splashscreen "
DISTRO_FEATURES_append = " wayland pam "
# add support of X11
DISTRO_FEATURES_append = " x11"
DISTRO_FEATURES_append = " x11 "
# add support of KDE (since OE thud version)
DISTRO_FEATURES_append = " kde "
@ -98,6 +97,9 @@ DISTRO_FEATURES_append = " systemd polkit "
# add support of efi
DISTRO_FEATURES_append = " efi "
# add support of autoresize through InitRD
DISTRO_FEATURES_append = " autoresize "
# add support of tpm2
#DISTRO_FEATURES_append = " tpm2 "
@ -124,7 +126,7 @@ VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
LICENSE_FLAGS_WHITELIST += " non-commercial commercial"
# X11 addons
IMAGE_INSTALL_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xf86-video-modesetting', '', d)} "
DISTRO_EXTRA_RDEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xf86-video-modesetting', '', d)} "
# resize tools
IMAGE_INSTALL_append = " resize-helper systemd-mount-partitions "
# INITRD addons to resize file system
DISTRO_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('COMBINED_FEATURES', 'autoresize', '${AUTORESIZE}', '', d)} "

6
conf/distro/include/st-default-distro-rules.inc
View File

@ -33,12 +33,6 @@ CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/"
#
OELAYOUT_ABI = "12"
#--------------------------
# Package configuration
#
# Force the gpl functionnality usage for libav
PACKAGECONFIG_pn-gstreamer1.0-libav = " gpl "
#--------------------------
# Add the manifest and the licenses file on image generated
COPY_LIC_MANIFEST = "1"

9
conf/distro/openstlinux-eglfs.conf
View File

@ -11,12 +11,6 @@ require include/openstlinux.inc
DISTRO = "openstlinux-eglfs"
DISTRO_NAME = "ST OpenSTLinux - EGLfs - (A Yocto Project Based Distro)"
# Warning: TARGET_VENDOR does not contains a valid OS/ARCH name like : linux, arm
# Warning: '-' are forbidden between each word of TARGET_VENDOR
TARGET_VENDOR = "-openstlinux_eglfs"
# Warning: '-' are forbidden between each word of SDK_VENDOR
SDK_VENDOR = "-openstlinux_eglfs_sdk"
# =========================================================================
# DISTRO features
# =========================================================================
@ -24,3 +18,6 @@ DISTRO_FEATURES_append = " opengl "
DISTRO_FEATURES_remove = " wayland x11 "
DISTRO_FEATURES_append = " gplv3 "
# FOR QT5 FORCE GIT PROTOCOL FOR HTTPS
#QT_GIT_PROTOCOL = "https"

6
conf/distro/openstlinux-weston.conf
View File

@ -11,12 +11,6 @@ require include/openstlinux.inc
DISTRO = "openstlinux-weston"
DISTRO_NAME = "ST OpenSTLinux - Weston - (A Yocto Project Based Distro)"
# Warning: TARGET_VENDOR does not contains a valid OS/ARCH name like : linux, arm
# Warning: '-' are forbidden between each word of TARGET_VENDOR
TARGET_VENDOR = "-openstlinux_weston"
# Warning: '-' are forbidden between each word of SDK_VENDOR
SDK_VENDOR = "-openstlinux_weston_sdk"
# =========================================================================
# DISTRO features
# =========================================================================

6
conf/distro/openstlinux-x11.conf
View File

@ -11,12 +11,6 @@ require include/openstlinux.inc
DISTRO = "openstlinux-x11"
DISTRO_NAME = "ST OpenSTLinux - X11 - (A Yocto Project Based Distro)"
# Warning: TARGET_VENDOR does not contains a valid OS/ARCH name like : linux, arm
# Warning: '-' are forbidden between each word of TARGET_VENDOR
TARGET_VENDOR = "-openstlinux_x11"
# Warning: '-' are forbidden between each word of SDK_VENDOR
SDK_VENDOR = "-openstlinux_x11_sdk"
# =========================================================================
# DISTRO features
# =========================================================================

2
conf/layer.conf
View File

@ -28,4 +28,4 @@ OPENSTLINUX_BASE = "${LAYERDIR}"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
LAYERVERSION_st-openstlinux = "1"
LAYERSERIES_COMPAT_st-openstlinux = "warrior"
LAYERSERIES_COMPAT_st-openstlinux = "dunfell"