Index: conf/distro/ely.conf =================================================================== diff -u --- conf/distro/ely.conf (revision 0) +++ conf/distro/ely.conf (revision 0b4c1a3520876af880e854b9db9e6b24af26ea89) @@ -0,0 +1,94 @@ +require conf/distro/poky.conf + +# Discrete version values. +YOCTO_MAJOR = "4" +YOCTO_MINOR = "0" +# DEY_RELEASE = "6" +# DEY_BUILD = "2" + +ELY_RELEASE = "0" +ELY_BUILD = "1" + +# Firmware version of the system. +DEY_FIRMWARE_VERSION ?= "${YOCTO_MAJOR}.${YOCTO_MINOR}.${ELY_RELEASE}.${ELY_BUILD}" + +# Distribution info. +DISTRO = "ely" +DISTRO_NAME = "Embedded Leahi Yocto" +DISTRO_VERSION = "${YOCTO_MAJOR}.${YOCTO_MINOR}-r${ELY_RELEASE}" + +SDK_VENDOR = "-deysdk" + +MAINTAINER = "Digi Support " + +TARGET_VENDOR = "-dey" + +POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-dey-core" +POKY_DEFAULT_EXTRA_RRECOMMENDS = "" + +# +# Rework distro features for DEY distribution +# +MACHINE_DISTRO_FEATURES_ADD ?= "" +MACHINE_DISTRO_FEATURES_REMOVE ?= "" +DISTRO_FEATURES:append = " cellular gstreamer pam ${MACHINE_DISTRO_FEATURES_ADD}" +DISTRO_FEATURES:remove = "3g nfc nfs ptest zeroconf ${MACHINE_DISTRO_FEATURES_REMOVE}" + +GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'fb', d), d), d)}" + +# Recovery initramfs image name. +RECOVERY_INITRAMFS_IMAGE ?= "dey-image-recovery-initramfs" + +# DEY image features (alphabetical order) +FEATURE_PACKAGES_dey-audio = "packagegroup-dey-audio" +FEATURE_PACKAGES_dey-bluetooth = "packagegroup-dey-bluetooth" +FEATURE_PACKAGES_dey-crank = "packagegroup-dey-crank" +FEATURE_PACKAGES_dey-debug = "packagegroup-dey-debug" +FEATURE_PACKAGES_dey-examples = "packagegroup-dey-examples" +FEATURE_PACKAGES_dey-gstreamer = "packagegroup-dey-gstreamer" +FEATURE_PACKAGES_dey-lvgl = "packagegroup-dey-lvgl" +FEATURE_PACKAGES_dey-network = "packagegroup-dey-network" +FEATURE_PACKAGES_dey-qt = "packagegroup-dey-qt" +FEATURE_PACKAGES_dey-trustfence = "packagegroup-dey-trustfence" +FEATURE_PACKAGES_dey-webkit = "packagegroup-dey-webkit" +FEATURE_PACKAGES_dey-wireless = "packagegroup-dey-wireless" + +# Our layer only provides version 5.41, which we want to keep because +# it was used for Bluetooth certification. However by default the newer +# 5.65 version should be used, which is provided by the poky layer. +PREFERRED_VERSION_bluez5 ?= "5.65" + +# There's a generic opencl-headers recipe in the thud branch of +# meta-openembedded, but we should use the package provided by the imx-gpu-viv +# recipe in case there are NXP-specific changes in it +PREFERRED_PROVIDER_opencl-headers ?= "imx-gpu-viv" + +# Use the FDO backend for WPE WebKit +PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-fdo" + +SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}/${MACHINE}" + +# Some packages need this (e.g. gstreamer1.0-plugins-ugly) +LICENSE_FLAGS_ACCEPTED += "commercial" + +# Use systemd init manager by default +INIT_MANAGER ?= "systemd" + +# Enable examples for some QT packages +PACKAGECONFIG:append:class-target:pn-qtbase = " examples" +PACKAGECONFIG:append:class-target:pn-qtdeclarative = " examples" +PACKAGECONFIG:append:class-target:pn-qtquick3d = " examples" +PACKAGECONFIG:append:class-target:pn-qtwebengine = " examples" + +# Remove unnecessary libarchive configurations to trim down the recovery image, +# while keeping the "zlib" one to make sure our file update mechanism still +# works (libarchive needs to be able to handle .tar.gz files, every other +# format can be omitted). +PACKAGECONFIG:remove:class-target:pn-libarchive = "bz2 xz lzo zstd acl xattr" + +# cryptsetup still works as expected in our eMMC partition encryption use case +# when udev support is disabled, so remove it to avoid dragging a bunch of +# dependencies into the recovery and trustfence initramfs. +PACKAGECONFIG:remove:class-target:pn-cryptsetup = "udev" Index: recipes-core/images/ely-image-qt.bb =================================================================== diff -u -r5c171d378380ac0748a7062b58f4dd904fb385fa -r0b4c1a3520876af880e854b9db9e6b24af26ea89 --- recipes-core/images/ely-image-qt.bb (.../ely-image-qt.bb) (revision 5c171d378380ac0748a7062b58f4dd904fb385fa) +++ recipes-core/images/ely-image-qt.bb (.../ely-image-qt.bb) (revision 0b4c1a3520876af880e854b9db9e6b24af26ea89) @@ -7,9 +7,19 @@ GRAPHICAL_CORE ??= "qt" -SOC_PACKAGES = " \ - nano \ - htop \ +DISTRO_FEATURES:remove = “x11 wayland vulcan weston” +IMAGE_FEATURES:remove = “dey-qt” + +# Add extra tools +SOC_PACKAGES = " \ + fbset \ + tslib \ + tzdata \ + nano \ + htop \ + strace \ + curl \ + can-utils \ " SOC_PACKAGES:ccimx6 = "imx-gpu-viv-demos imx-gpu-viv-tools" @@ -25,19 +35,19 @@ dey-${GRAPHICAL_CORE} \ eclipse-debug \ ssh-server-dropbear \ - ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer', 'dey-gstreamer', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', \ - '', d), d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'alsa', 'dey-audio', '', d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'dey-wireless', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer' , 'dey-gstreamer' , '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland' , 'weston' , \ + bb.utils.contains('DISTRO_FEATURES', 'x11' , 'x11-base x11-sato' , \ + '', d), d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'alsa' , 'dey-audio' , '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth' , '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'wifi' , 'dey-wireless' , '', d)} \ " # SDK features (for toolchains generated from an image with populate_sdk) SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs" -IMAGE_LINGUAS = "" +IMAGE_LINGUAS = "en es" inherit core-image inherit dey-image @@ -55,3 +65,4 @@ CORE_IMAGE_EXTRA_INSTALL += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)} \ dey-examples-digiapix \ +" Index: sdk/config/leahi/bblayers.conf.sample =================================================================== diff -u -r15d33523b06de5f4d0d98f1533cc282481dea0db -r0b4c1a3520876af880e854b9db9e6b24af26ea89 --- sdk/config/leahi/bblayers.conf.sample (.../bblayers.conf.sample) (revision 15d33523b06de5f4d0d98f1533cc282481dea0db) +++ sdk/config/leahi/bblayers.conf.sample (.../bblayers.conf.sample) (revision 0b4c1a3520876af880e854b9db9e6b24af26ea89) @@ -20,4 +20,4 @@ ##DIGIBASE##/meta-digi/meta-digi-arm \ ##DIGIBASE##/meta-digi/meta-digi-dey \ ##DIGIBASE##/meta-leahi \ - " +" Index: sdk/config/leahi/conf-notes.txt =================================================================== diff -u -r15d33523b06de5f4d0d98f1533cc282481dea0db -r0b4c1a3520876af880e854b9db9e6b24af26ea89 --- sdk/config/leahi/conf-notes.txt (.../conf-notes.txt) (revision 15d33523b06de5f4d0d98f1533cc282481dea0db) +++ sdk/config/leahi/conf-notes.txt (.../conf-notes.txt) (revision 0b4c1a3520876af880e854b9db9e6b24af26ea89) @@ -1,18 +1,5 @@ Digi Embedded Yocto provides the following image recipes: - * dey-image-qt: graphical QT image + * ely-image-qt: graphical Qt image - By default the image is X11-based so it provides a full SATO theme - desktop environment. - To compile the image for the framebuffer (instead of X11) add the - following line to the project's conf/local.conf: - - DISTRO_FEATURES_remove = "x11" - - * dey-image-aws: console-only image supporting Amazon Web Services IoT - - This image includes the AWS Greengrass Core and an AWS IoT platform - example application. For more information on AWS support in Digi - Embedded Yocto see the online documentation. - Index: sdk/config/leahi/local.conf.sample =================================================================== diff -u -ra197b4dc093cae61afe5837b8036fe26eee6f469 -r0b4c1a3520876af880e854b9db9e6b24af26ea89 --- sdk/config/leahi/local.conf.sample (.../local.conf.sample) (revision a197b4dc093cae61afe5837b8036fe26eee6f469) +++ sdk/config/leahi/local.conf.sample (.../local.conf.sample) (revision 0b4c1a3520876af880e854b9db9e6b24af26ea89) @@ -93,7 +93,7 @@ # Ultimately when creating custom policy, people will likely end up subclassing # these defaults. # -DISTRO ?= "dey" +DISTRO ?= "ely" # As an example of a subclass there is a "bleeding" edge policy configuration # where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not @@ -291,3 +291,33 @@ # Some libraries and packages are covered by NXP EULA # ACCEPT_FSL_EULA = "1" + + +################################################################################ +# LEAHI DISTRO CONFIGURATIONS Notes to be moved to the layer +################################################################################ + +#IMAGE_INSTALL:append = " python3-pydoc" +#IMAGE_INSTALL:append = " python3-pip" + +# Add Qt packages and ensure linuxfb support +#IMAGE_INSTALL:append = " qtbase qtbase-dev qtbase-plugins qtdeclarative qtquickcontrols2 qtgraphicaleffects qtimageformats qttools qtmultimedia qtconnectivity qtvirtualkeyboard qtserialbus" +#PACKAGECONFIG:append:pn-qtbase = " directfb linuxfb gles2 pulseaudio tslib accessibility dbus sql-sqlite openssl glib icu widgets xml eglfs" +#PACKAGECONFIG:append:pn-qtmultimedia = " alsa gstreamer pulseaudio" +# PACKAGECONFIG:append:pn-qtwebkit = " gstreamer" + +# Remove Wayland +#DISTRO_FEATURES:append = " opengl alsa bluetooth wifi" +#DISTRO_FEATURES:remove = " x11 wayland vulkan" +#IMAGE_INSTALL:remove = " wayland weston" +#IMAGE_FEATURES:remove = "dey-qt" + + +#isntalling fonts +# ROOTFS_POSTPROCESS_COMMAND += "cp /home/bruce/digi_yocto/ccimx8mm-dvk/update/fonts/* ${IMAGE_ROOTFS}/usr/lib/fonts/;" + + +# the following lines are defined for files-based update. +# SWUPDATE_FILES_TARGZ_FILE = "/home/bruce/digi_yocto/ccimx8mm-dvk/update/swupdate.tar.gz" +# SWUPDATE_SCRIPT = "/home/bruce/digi_yocto/ccimx8mm-dvk/update/update_files.sh" +