From 3a864fad79d35aa44ee4db606fa88897f7ac059e Mon Sep 17 00:00:00 2001 From: Christophe Priouzeau Date: Fri, 28 Jun 2019 11:39:52 +0200 Subject: [PATCH] DISTRO: swtich to dunfell Signed-off-by: Christophe Priouzeau --- conf/distro/include/openstlinux.inc | 20 ++++++++++--------- .../include/st-default-distro-rules.inc | 6 ------ conf/distro/openstlinux-eglfs.conf | 9 +++------ conf/distro/openstlinux-weston.conf | 6 ------ conf/distro/openstlinux-x11.conf | 6 ------ conf/layer.conf | 2 +- 6 files changed, 15 insertions(+), 34 deletions(-) diff --git a/conf/distro/include/openstlinux.inc b/conf/distro/include/openstlinux.inc index 35c8abd..b0d39a0 100644 --- a/conf/distro/include/openstlinux.inc +++ b/conf/distro/include/openstlinux.inc @@ -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)} " diff --git a/conf/distro/include/st-default-distro-rules.inc b/conf/distro/include/st-default-distro-rules.inc index c25dbed..bbfcfc1 100644 --- a/conf/distro/include/st-default-distro-rules.inc +++ b/conf/distro/include/st-default-distro-rules.inc @@ -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" diff --git a/conf/distro/openstlinux-eglfs.conf b/conf/distro/openstlinux-eglfs.conf index 86e6b12..9df29b4 100644 --- a/conf/distro/openstlinux-eglfs.conf +++ b/conf/distro/openstlinux-eglfs.conf @@ -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" diff --git a/conf/distro/openstlinux-weston.conf b/conf/distro/openstlinux-weston.conf index af082ab..8346f06 100644 --- a/conf/distro/openstlinux-weston.conf +++ b/conf/distro/openstlinux-weston.conf @@ -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 # ========================================================================= diff --git a/conf/distro/openstlinux-x11.conf b/conf/distro/openstlinux-x11.conf index b3dcfc4..c12bd3b 100644 --- a/conf/distro/openstlinux-x11.conf +++ b/conf/distro/openstlinux-x11.conf @@ -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 # ========================================================================= diff --git a/conf/layer.conf b/conf/layer.conf index d3a4f45..8a6e3ad 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -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"