diff options
Diffstat (limited to 'templates')
95 files changed, 229 insertions, 654 deletions
diff --git a/templates/base/01_setup_pkg_revision.sh b/templates/base/01_setup_pkg_revision.sh index cba278d18..a9e4ceb8c 100644 --- a/templates/base/01_setup_pkg_revision.sh +++ b/templates/base/01_setup_pkg_revision.sh @@ -36,7 +36,7 @@ EOF cat <<'EOF' >> $LOCALCONF PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}" PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}" -BB_HASHBASE_WHITELIST:append = " PKGR PKGV" +BB_BASEHASH_IGNORE_VARS:append = " PKGR PKGV" EOF ;; value:*) @@ -44,7 +44,7 @@ EOF cat <<'EOF' >> $LOCALCONF PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}" PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}" -BB_HASHBASE_WHITELIST:append = " PKGR PKGV" +BB_BASEHASH_IGNORE_VARS:append = " PKGR PKGV" EOF ;; none) diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample deleted file mode 100644 index f5680622c..000000000 --- a/templates/base/bblayers.conf.sample +++ /dev/null @@ -1,67 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "6" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -# Convenience variables usable in various configuration fragments -#---------------------------------- -BCONFDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)))}" -METADIR := "${@os.path.abspath('##OEROOT##/../..')}" - -# These are the core OE + YP Layers -#---------------------------------- -YOCTO_LAYERS = " \ - ${METADIR}/external/poky/meta \ - ${METADIR}/external/poky/meta-poky \ - " -# this is added for the boards where necessary, not globally -# ${METADIR}/external/poky/meta-yocto-bsp \ -# -# These are the AGL CORE Layers that make up the basis -# - they create a minimal bootable filesystem -# with some automotive tools/libraries -#----------------------------------------------------- -AGL_CORE_LAYERS = " \ - ${METADIR}/meta-agl/meta-agl-core \ - ${METADIR}/meta-agl/meta-agl-core-test \ - ${METADIR}/meta-agl/meta-agl-bsp \ - " - -# These are the direct dependencies of the AGL CORE Layers -#--------------------------------------------------------- -AGL_CORE_DEPENDENCY_LAYERS = " \ - ${METADIR}/external/meta-openembedded/meta-oe \ - " - -# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS -# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base -AGL_META_NETWORKING ?= "" -AGL_META_PYTHON ?= "" -AGL_META_FILESYSTEMS ?= "" -AGL_META_VIRTUALIZATION ?= "" -AGL_OTHER_DEPENDENCY_LAYERS = " \ - ${AGL_META_NETWORKING} \ - ${AGL_META_PYTHON} \ - ${AGL_META_FILESYSTEMS} \ - ${AGL_META_VIRTUALIZATION} \ - " - -#################### -# Combine the layers -BBLAYERS ?= " \ - ${AGL_OTHER_DEPENDENCY_LAYERS} \ - ${AGL_CORE_DEPENDENCY_LAYERS} \ - ${AGL_CORE_LAYERS} \ - ${YOCTO_LAYERS} \ - " - -BBLAYERS_NON_REMOVABLE ?= " \ - ${METADIR}/external/poky/meta \ - ${METADIR}/external/poky/meta-poky \ - ${METADIR}/meta-agl/meta-agl-core \ - " - - - diff --git a/templates/base/conf-notes.txt b/templates/base/conf-notes.txt deleted file mode 100644 index 09ae72647..000000000 --- a/templates/base/conf-notes.txt +++ /dev/null @@ -1,35 +0,0 @@ -Common targets are: -- meta-agl layer: - - included by default - * agl-image-boot (just enough to boot) - * agl-image-minimal (minimal filesystem with APIs) - * agl-image-minimal-crosssdk (crosssdk for ^^) - - * agl-image-weston (minimal filesystem with weston) - -- meta-agl-demo: (IVI demo with UI) - - with 'agl-demo' - * agl-image-ivi (base for IVI targets) - * agl-image-ivi-crosssdk (sdk for ^^) - - * agl-image-graphical-qt5 (weston plus qt5 framework libs) - * agl-image-graphical-qt5-crosssdk (sdk for ^^) - - * agl-image-graphical-html5 (weston plus chromium for html5) - - * agl-image-cluster (minimal image with APIs for cluster) - * agl-image-cluster-qt5 (image with QT5 and APIs for cluster) - - * agl-image-telematics (image with APIs for telematics) - - * agl-demo-platform (* default IVI demo target *) - * agl-demo-platform-crosssdk (sdk for ^^) - - * agl-cluster-demo-platform (cluster demo image) - * agl-cluster-demo-platform-crosssdk (sdk for ^^) - * agl-cluster-demo-qtcompositor (cluster demo using own compositor) - - * agl-telematics-demo-platform (telematics demo image) - * agl-telematics-demo-platform-crosssdk (sdk for ^^) - - diff --git a/templates/base/local.conf.sample b/templates/base/local.conf.sample deleted file mode 100644 index 337321ec0..000000000 --- a/templates/base/local.conf.sample +++ /dev/null @@ -1,343 +0,0 @@ -# -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. - -# -# Machine Selection -# -# You need to select a specific machine to target the build with. There are a selection -# of emulated machines available which can boot and run in the QEMU emulator: -# -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemuarm64" -#MACHINE ?= "qemumips" -#MACHINE ?= "qemumips64" -#MACHINE ?= "qemuppc" -#MACHINE ?= "qemux86" -#MACHINE ?= "qemux86-64" -# -# There are also the following hardware board target machines included for -# demonstration purposes: -# -#MACHINE ?= "beaglebone-yocto" -#MACHINE ?= "genericx86" -#MACHINE ?= "genericx86-64" -#MACHINE ?= "mpc8315e-rdb" -#MACHINE ?= "edgerouter" -# -# This sets the default machine to be qemux86-64 if no other machine is selected: -MACHINE ??= "qemux86-64" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -#DL_DIR ?= "${TOPDIR}/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" - -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - -# -# Default policy config -# -# The distribution setting controls which policy settings are used as defaults. -# The default value is fine for general Yocto project use, at least initially. -# Ultimately when creating custom policy, people will likely end up subclassing -# these defaults. -# -DISTRO ?= "poky" -# 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 -# useful to most new users. -# DISTRO ?= "poky-bleeding" - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" - -# -# SDK target architecture -# -# This variable specifies the architecture to build SDK items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 -#SDKMACHINE ?= "i686" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "src-pkgs" - add -src packages for all installed packages -# (adds source code for debugging) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES ?= "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -# - 'image-mklibs' to reduce shared library files size for an image -# - 'image-prelink' in order to prelink the filesystem image -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-mklibs image-prelink" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. It can also -# run tests against any SDK that are built. To enable this uncomment these lines. -# See classes/test{image,sdk}.bbclass for further details. -#IMAGE_CLASSES += "testimage testsdk" -#TESTIMAGE_AUTO:qemuall = "1" - -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -# It's necesary to monitor /tmp, if there is no space left the build will fail -# with very exotic errors. -BB_DISKMON_DIRS ??= "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - -# -# AGL Project SState Mirror -# -# The AGL Project has prebuilt artefacts available for its releases, you can enable -# use of these by uncommenting the following line. This will mean the build uses -# the network to check for artefacts at the start of builds, which does slow it down -# equally, it will also speed up the builds by not having to build things if they are -# present in the cache. It assumes you can download something faster than you can build it -# which will depend on your network. -# -#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" -# For AGL: -#SSTATE_MIRRORS += "file://.* http://download.automotivelinux.org/sstate-mirror/${AGL_BRANCH}/${DEFAULTTUNE}/PATH;downloadfilename=PATH" - -# -# Qemu configuration -# -# By default native qemu will build with a builtin VNC server where graphical output can be -# seen. The line below enables the SDL UI frontend too. -PACKAGECONFIG:append:pn-qemu-system-native = " sdl" -# By default libsdl2-native will be built, if you want to use your host's libSDL instead of -# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. -#ASSUME_PROVIDED += "libsdl2-native" - -# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds -# a handy set of menus for controlling the emulator. -#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" - -# -# Parallelism Options -# -# These two options control how much parallelism BitBake should use. The first -# option determines how many tasks bitbake should run in parallel: -# -#BB_NUMBER_THREADS ?= "4" -# -# Default to setting automatically based on cpu count -#BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" -# -# The second option controls how many processes make should run in parallel when -# running compile tasks: -# -#PARALLEL_MAKE ?= "-j 4" -# -# Default to setting automatically based on cpu count -#PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" -# -# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would -# be appropriate for example. - -# -# Hash Equivalence -# -# Enable support for automatically running a local hash equivalence server and -# instruct bitbake to use a hash equivalence aware signature generator. Hash -# equivalence improves reuse of sstate by detecting when a given sstate -# artifact can be reused as equivalent, even if the current task hash doesn't -# match the one that generated the artifact. -# -# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format -# -#BB_HASHSERVE = "auto" -#BB_SIGNATURE_HANDLER = "OEEquivHash" - - -# The network based PR service host and port -# Uncomment the following lines to enable PRservice. -# Set PRSERV_HOST to 'localhost:0' to automatically -# start local PRService. -# Set to other values to use remote PRService. -#PRSERV_HOST = "localhost:0" - - -# Archive the source and put them to ${DEPLOY_DIR}/sources/. -# -#INHERIT += "archiver" -# -# The tarball for the patched source will be created by default, and you -# can configure the archiver as follow: -# -# Create archive for: -# 1) original (or unpacked) source: -#ARCHIVER_MODE[src] = "original" -# 2) patched source: (default) -#ARCHIVER_MODE[src] = "patched" -# 3) configured source: -#ARCHIVER_MODE[src] = "configured" -# -# 4) the patches between do_unpack and do_patch: -#ARCHIVER_MODE[diff] = "1" -# set the files that you'd like to exclude from the diff: -#ARCHIVER_MODE[diff-exclude] ?= ".pc autom4te.cache patches" -# -# 5) the environment data, similar to 'bitbake -e recipe': -#ARCHIVER_MODE[dumpdata] = "1" -# -# 6) the recipe (.bb and .inc): -#ARCHIVER_MODE[recipe] = "1" -# -# 7) Whether output the .src.rpm package: -#ARCHIVER_MODE[srpm] = "1" -# -# 8) Filter the license, the recipe whose license in -# COPYLEFT_LICENSE_INCLUDE will be included, and in -# COPYLEFT_LICENSE_EXCLUDE will be excluded. -#COPYLEFT_LICENSE_INCLUDE = 'GPL* LGPL*' -#COPYLEFT_LICENSE_EXCLUDE = 'CLOSED Proprietary' -# -# 9) Config the recipe type that will be archived, the type can be -# target, native, nativesdk, cross, crosssdk and cross-canadian, -# you can set one or more types. Archive all types by default. -#COPYLEFT_RECIPE_TYPES = 'target' -# - - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "1" diff --git a/templates/feature/agl-app-framework/50_bblayers.conf.inc b/templates/feature/agl-app-framework/50_bblayers.conf.inc new file mode 100644 index 000000000..e6eacd9d8 --- /dev/null +++ b/templates/feature/agl-app-framework/50_bblayers.conf.inc @@ -0,0 +1,4 @@ + +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-app-framework \ + " diff --git a/templates/feature/agl-app-framework/50_local.conf.inc b/templates/feature/agl-app-framework/50_local.conf.inc new file mode 100644 index 000000000..ce541a7b0 --- /dev/null +++ b/templates/feature/agl-app-framework/50_local.conf.inc @@ -0,0 +1,2 @@ +#see meta-agl/meta-app-framework/conf/include/agl-app-framework.inc +require conf/include/agl-app-framework.inc diff --git a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc deleted file mode 100644 index 2e79797e8..000000000 --- a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc +++ /dev/null @@ -1,12 +0,0 @@ -AGL_APPFW_LAYERS = " \ - ${METADIR}/external/meta-security \ - ${METADIR}/external/meta-openembedded/meta-perl \ - ${METADIR}/meta-agl/meta-app-framework \ - " - -BBLAYERS =+ "${AGL_APPFW_LAYERS}" - -# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS -# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base -AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" -AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" diff --git a/templates/feature/agl-appfw-smack/50_local.conf.inc b/templates/feature/agl-appfw-smack/50_local.conf.inc deleted file mode 100644 index 8282a1cae..000000000 --- a/templates/feature/agl-appfw-smack/50_local.conf.inc +++ /dev/null @@ -1 +0,0 @@ -require conf/include/agl-appfw-smack.inc diff --git a/templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md b/templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md deleted file mode 100644 index c96edac38..000000000 --- a/templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-appfw-smack -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, José Bollo <jose.bollo@iot.bzh>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh> ---- - -### Feature agl-appfw-smack - -*Description is missing - please complete file meta-agl/templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md* - diff --git a/templates/feature/agl-ci-change-features-nogfx/included.dep b/templates/feature/agl-ci-change-features-nogfx/included.dep index 64e2103ca..27e9852f7 100644 --- a/templates/feature/agl-ci-change-features-nogfx/included.dep +++ b/templates/feature/agl-ci-change-features-nogfx/included.dep @@ -1 +1 @@ -agl-demo agl-devel agl-netboot agl-pipewire agl-cloudproxy agl-buildstats agl-ptest +agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest diff --git a/templates/feature/agl-ci-change-features/included.dep b/templates/feature/agl-ci-change-features/included.dep index 64e2103ca..27e9852f7 100644 --- a/templates/feature/agl-ci-change-features/included.dep +++ b/templates/feature/agl-ci-change-features/included.dep @@ -1 +1 @@ -agl-demo agl-devel agl-netboot agl-pipewire agl-cloudproxy agl-buildstats agl-ptest +agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc index 3083c0168..e17bc83a9 100644 --- a/templates/feature/agl-ci/99_local.conf.inc +++ b/templates/feature/agl-ci/99_local.conf.inc @@ -1,4 +1,4 @@ -DISTRO_FEATURES:append = " AGLCI" +AGL_FEATURES:append = " AGLCI" # opencv seems to have a parallel make bug # ...contrib/modules/xfeatures2d/test/test_features2d.cpp:51:10: fatal error: features2d/test/test_detectors_regression.impl.hpp: No such file or directory PARALLEL_MAKE:pn-opencv = "-j 1" @@ -21,12 +21,12 @@ INHERIT += "buildstats" INHERIT += "buildstats-summary" # setup for PRSERV and HASHSERV -AGL_HOST_PRSERV ?= "10.30.72.18" -AGL_HOST_HASHSERV ?= "10.30.72.18" +#AGL_HOST_PRSERV ?= "10.30.72.18" +#AGL_HOST_HASHSERV ?= "10.30.72.18" -BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8686" -BB_SIGNATURE_HANDLER = "OEEquivHash" +#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383" +#BB_SIGNATURE_HANDLER = "OEEquivHash" -PRSERV_HOST = "${AGL_HOST_PRSERV}:8585" +#PRSERV_HOST = "${AGL_HOST_PRSERV}:8181" IMAGE_INSTALL:append = " curl" diff --git a/templates/feature/agl-ci/included.dep b/templates/feature/agl-ci/included.dep new file mode 100644 index 000000000..21543697b --- /dev/null +++ b/templates/feature/agl-ci/included.dep @@ -0,0 +1 @@ +agl-create-spdx diff --git a/templates/feature/agl-create-spdx/50_local.conf.inc b/templates/feature/agl-create-spdx/50_local.conf.inc new file mode 100644 index 000000000..2dd5314f3 --- /dev/null +++ b/templates/feature/agl-create-spdx/50_local.conf.inc @@ -0,0 +1,2 @@ +#see meta-agl/meta-agl/conf/include/agl-devel.inc +require conf/include/agl-create-spdx.inc diff --git a/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md b/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md new file mode 100644 index 000000000..332a9dbd5 --- /dev/null +++ b/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md @@ -0,0 +1,7 @@ +--- +description: Feature agl-create-spdx +authors: Jan-Simon Moeller <jsmoeller@linuxfoundation.rg> +--- + +### Feature agl-create-spdx +Activation of the create-spdx class in oe-core. diff --git a/templates/feature/agl-gplv2/50_bblayers.conf.inc b/templates/feature/agl-gplv2/50_bblayers.conf.inc deleted file mode 100644 index a0f26980d..000000000 --- a/templates/feature/agl-gplv2/50_bblayers.conf.inc +++ /dev/null @@ -1 +0,0 @@ -BBLAYERS =+ "${METADIR}/external/meta-gplv2" diff --git a/templates/feature/agl-gplv2/50_local.conf.inc b/templates/feature/agl-gplv2/50_local.conf.inc deleted file mode 100644 index 8e0d5df74..000000000 --- a/templates/feature/agl-gplv2/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl/meta-agl/conf/include/agl-gplv2.inc -require conf/include/agl-gplv2.inc diff --git a/templates/feature/agl-gplv2/README_feature_agl-gplv2.md b/templates/feature/agl-gplv2/README_feature_agl-gplv2.md deleted file mode 100644 index ffbe331b8..000000000 --- a/templates/feature/agl-gplv2/README_feature_agl-gplv2.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-gplv2 -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com> ---- - -### Feature agl-gplv2 - -*Description is missing - please complete file meta-agl/templates/feature/agl-gplv2/README_feature_agl-gplv2.md* - diff --git a/templates/feature/agl-hmi-framework/50_local.conf.inc b/templates/feature/agl-hmi-framework/50_local.conf.inc deleted file mode 100644 index fdff3dbe8..000000000 --- a/templates/feature/agl-hmi-framework/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -# In order to enable the hmi-framework features , -# enables the following line: -# -AGL_FEATURES:append = " agl-hmi-framework" diff --git a/templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md b/templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md deleted file mode 100644 index e298023d9..000000000 --- a/templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-hmi-framework -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Scott Murray <scott.murray@konsulko.com> ---- - -### Feature agl-hmi-framework - -*Description is missing - please complete file meta-agl/templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md* - diff --git a/templates/feature/agl-netboot/50_bblayers.conf.inc b/templates/feature/agl-netboot/50_bblayers.conf.inc index 7cbff1662..94e784a1a 100644 --- a/templates/feature/agl-netboot/50_bblayers.conf.inc +++ b/templates/feature/agl-netboot/50_bblayers.conf.inc @@ -2,6 +2,6 @@ BBLAYERS =+ " ${METADIR}/meta-agl/meta-netboot \ " # Indirection to avoid duplicate inclusions of the same folder into BBLAYERS -# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base +# the evaluation is in the bblayers.conf.sample in meta-agl/meta-agl-core/conf/templates/base AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" diff --git a/templates/feature/agl-ptest/90_local.conf.inc b/templates/feature/agl-ptest/90_local.conf.inc index 6341b012a..dcaf72ab3 100644 --- a/templates/feature/agl-ptest/90_local.conf.inc +++ b/templates/feature/agl-ptest/90_local.conf.inc @@ -1,7 +1,7 @@ # Enabling ptest in image ... -OVERRIDES .= ":agl-ptest" +OVERRIDES:append = ":agl-ptest" DISTRO_FEATURES:append = " ptest" EXTRA_IMAGE_FEATURES:append = " ptest-pkgs" IMAGE_INSTALL:append = " lua-ptest xmlsec1-ptest libxml2-ptest" diff --git a/templates/feature/agl-selinux/50_bblayers.conf.inc b/templates/feature/agl-selinux/50_bblayers.conf.inc new file mode 100644 index 000000000..b17e292e9 --- /dev/null +++ b/templates/feature/agl-selinux/50_bblayers.conf.inc @@ -0,0 +1,5 @@ +AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" + +BBLAYERS =+ " \ + ${METADIR}/external/meta-selinux \ + " diff --git a/templates/feature/agl-selinux/50_local.conf.inc b/templates/feature/agl-selinux/50_local.conf.inc new file mode 100644 index 000000000..4aaac2d14 --- /dev/null +++ b/templates/feature/agl-selinux/50_local.conf.inc @@ -0,0 +1,2 @@ +#see meta-agl/meta-agl/conf/include/agl-selinux.inc +require conf/include/agl-selinux.inc diff --git a/templates/feature/agl-selinux/README_feature_agl-selinux.md b/templates/feature/agl-selinux/README_feature_agl-selinux.md new file mode 100644 index 000000000..c48ce06b0 --- /dev/null +++ b/templates/feature/agl-selinux/README_feature_agl-selinux.md @@ -0,0 +1,9 @@ +--- +description: Feature agl-selinux +authors: Scott Murray <scott.murray@konsulko.com> +--- + +### Feature agl-selinux + +Enables building with SELinux enabled, with the default mode +being permissive. diff --git a/templates/feature/agl-sign-wgts/50_local.conf.inc b/templates/feature/agl-sign-wgts/50_local.conf.inc deleted file mode 100644 index fb1f6ab1a..000000000 --- a/templates/feature/agl-sign-wgts/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl/meta-agl/conf/include/agl-sign-wgts.inc -require conf/include/agl-sign-wgts.inc diff --git a/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md b/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md deleted file mode 100644 index 5e3b4b12c..000000000 --- a/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -description: Feature agl-sign-wgts -authors: José Bollo <jose.bollo@iot.bzh>, ---- - -### Feature agl-sign-wgts - -Activation of the signature of wgt files diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc deleted file mode 100644 index f3623354c..000000000 --- a/templates/feature/agl-sota/50_bblayers.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/external/meta-updater \ - " diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc deleted file mode 100644 index 8019022c4..000000000 --- a/templates/feature/agl-sota/50_local.conf.inc +++ /dev/null @@ -1,8 +0,0 @@ -# See meta-updater/conf/distro/sota.conf.inc -INHERIT += "sota" -DISTRO_FEATURES:append = " sota usrmerge" -DISTRO_FEATURES_NATIVE:append = " sota" -AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz" -# Netboot is not obeying usrmerge distro feature -# therefore it is not compatible with agl-sota -CONFLICT_DISTRO_FEATURES += "netboot" diff --git a/templates/feature/agl-sota/50_setup.sh b/templates/feature/agl-sota/50_setup.sh deleted file mode 100644 index 76cb016f2..000000000 --- a/templates/feature/agl-sota/50_setup.sh +++ /dev/null @@ -1,26 +0,0 @@ - -cat <<EOF >> ${BUILDDIR}/conf/bblayers.conf - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# fragment { -# ${METADIR}/meta-agl/templates/feature/agl-sota/50_setup.sh -# -EOF - -case ${MACHINE} in - "qemux86-64") - echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-qemux86-64\"" >> ${BUILDDIR}/conf/bblayers.conf;; - "raspberrypi4") - echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-raspberrypi\"" >> ${BUILDDIR}/conf/bblayers.conf;; - *) - echo "#No extra SOTA feature layer for MACHINE ${MACHINE}" >> ${BUILDDIR}/conf/bblayers.conf;; -esac - - -cat <<EOF >> ${BUILDDIR}/conf/bblayers.conf - -# -# } -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - -EOF diff --git a/templates/feature/agl-sota/README_feature_agl-sota.md b/templates/feature/agl-sota/README_feature_agl-sota.md deleted file mode 100644 index beeffc234..000000000 --- a/templates/feature/agl-sota/README_feature_agl-sota.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-sota -authors: Anton Gerasimov <anton@advancedtelematic.com>, Changhyeok Bae <changhyeok.bae@gmail.com>, Jan-Simon Moeller <jsmoeller@linuxfoundation.org>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Leon Anavi <leon.anavi@konsulko.com>, Phil Wise <phil@advancedtelematic.com>, Ronan Le Martret <ronan.lemartret@iot.bzh> ---- - -### Feature agl-sota - -*Description is missing - please complete file meta-agl/templates/feature/agl-sota/README_feature_agl-sota.md* - diff --git a/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc b/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc deleted file mode 100644 index d965eae6f..000000000 --- a/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc +++ /dev/null @@ -1 +0,0 @@ -AGL_FEATURES:append = " waltham-remoting" diff --git a/templates/feature/agl-weston-waltham-remoting/README_feature_agl-weston-waltham-remoting.md b/templates/feature/agl-weston-waltham-remoting/README_feature_agl-weston-waltham-remoting.md deleted file mode 100644 index 416ff3f26..000000000 --- a/templates/feature/agl-weston-waltham-remoting/README_feature_agl-weston-waltham-remoting.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-weston-waltham-remoting -authors: Marius Vlad <marius.vlad@collabora.com> ---- - -### Feature agl-weston-waltham-remoting - -Enables remote display configuration using libWeston's remoting plug-in -for remote output and remote input using waltham-transmitter-plug-in. diff --git a/templates/feature/agl-weston-waltham-remoting/included.dep b/templates/feature/agl-weston-waltham-remoting/included.dep deleted file mode 100644 index 82639da07..000000000 --- a/templates/feature/agl-weston-waltham-remoting/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-demo diff --git a/templates/machine/am62xx-evm/50_bblayers.conf.inc b/templates/machine/am62xx-evm/50_bblayers.conf.inc new file mode 100644 index 000000000..6ef08c43e --- /dev/null +++ b/templates/machine/am62xx-evm/50_bblayers.conf.inc @@ -0,0 +1,5 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-arm/meta-arm-toolchain \ + ${METADIR}/bsp/meta-ti/meta-ti-bsp \ + " diff --git a/templates/machine/am62xx-evm/50_local.conf.inc b/templates/machine/am62xx-evm/50_local.conf.inc new file mode 100644 index 000000000..782d11a76 --- /dev/null +++ b/templates/machine/am62xx-evm/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "am62xx-evm" +#see meta-agl/meta-agl-bsp/conf/include/agl_am62xx-evm.inc +require conf/include/agl_am62xx-evm.inc diff --git a/templates/machine/aws-ec2-arm64/50_bblayers.conf.inc b/templates/machine/aws-ec2-arm64/50_bblayers.conf.inc new file mode 100644 index 000000000..4e619cde0 --- /dev/null +++ b/templates/machine/aws-ec2-arm64/50_bblayers.conf.inc @@ -0,0 +1,8 @@ +AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" +AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia" +AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" +AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization" + +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-aws \ + " diff --git a/templates/machine/aws-ec2-arm64/50_local.conf.inc b/templates/machine/aws-ec2-arm64/50_local.conf.inc new file mode 100644 index 000000000..ca20e0bf2 --- /dev/null +++ b/templates/machine/aws-ec2-arm64/50_local.conf.inc @@ -0,0 +1,21 @@ +MACHINE = "aws-ec2-arm64" + +VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" +IMAGE_INSTALL:append = " cloud-init" +DISTRO_FEATURES:append = " virtualization" + + +# can we shuffle this out so CI still works +INHERIT += "extrausers" +# Hardening: Locking the root password. Creating the user without password for ssh key-based login only +EXTRA_USERS_PARAMS = "usermod -L root; useradd -p '*' user" + +EXTRA_IMAGE_FEATURES:append = " ssh-server-openssh" + +# Forcing removal of debug-tweakes as that leads to reversing some sshd_config hardening done in our bbappend when do_rootfs runs +EXTRA_IMAGE_FEATURES:remove = "debug-tweaks" + +AGL_DEFAULT_IMAGE_FSTYPES := "wic.vhd" + +# workaround bug in cloud-init leading to empty cloud-init-systemd package +PACKAGES:pn-cloud-init:forcevariable = "cloud-init-src cloud-init-dbg cloud-init-staticdev cloud-init-dev cloud-init-doc cloud-init-locale cloud-init-systemd cloud-init" diff --git a/templates/machine/aws-ec2-x86-64/50_bblayers.conf.inc b/templates/machine/aws-ec2-x86-64/50_bblayers.conf.inc new file mode 100644 index 000000000..4e619cde0 --- /dev/null +++ b/templates/machine/aws-ec2-x86-64/50_bblayers.conf.inc @@ -0,0 +1,8 @@ +AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" +AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia" +AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" +AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization" + +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-aws \ + " diff --git a/templates/machine/aws-ec2-x86-64/50_local.conf.inc b/templates/machine/aws-ec2-x86-64/50_local.conf.inc new file mode 100644 index 000000000..58b4b087d --- /dev/null +++ b/templates/machine/aws-ec2-x86-64/50_local.conf.inc @@ -0,0 +1,21 @@ +MACHINE = "aws-ec2-x86-64" + +VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" +IMAGE_INSTALL:append = " cloud-init" +DISTRO_FEATURES:append = " virtualization" + + +# can we shuffle this out so CI still works +INHERIT += "extrausers" +# Hardening: Locking the root password. Creating the user without password for ssh key-based login only +EXTRA_USERS_PARAMS = "usermod -L root; useradd -p '*' user" + +EXTRA_IMAGE_FEATURES:append = " ssh-server-openssh" + +# Forcing removal of debug-tweakes as that leads to reversing some sshd_config hardening done in our bbappend when do_rootfs runs +EXTRA_IMAGE_FEATURES:remove = "debug-tweaks" + +AGL_DEFAULT_IMAGE_FSTYPES := "wic.vhd" + +# workaround bug in cloud-init leading to empty cloud-init-systemd package +PACKAGES:pn-cloud-init:forcevariable = "cloud-init-src cloud-init-dbg cloud-init-staticdev cloud-init-dev cloud-init-doc cloud-init-locale cloud-init-systemd cloud-init" diff --git a/templates/machine/bbe/50_bblayers.conf.inc b/templates/machine/bbe/50_bblayers.conf.inc index 6e6a6c951..c94c1db8f 100644 --- a/templates/machine/bbe/50_bblayers.conf.inc +++ b/templates/machine/bbe/50_bblayers.conf.inc @@ -1,7 +1,7 @@ BBLAYERS =+ " \ ${METADIR}/bsp/meta-arm/meta-arm \ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \ - ${METADIR}/bsp/meta-ti \ + ${METADIR}/bsp/meta-ti/meta-ti-bsp \ ${METADIR}/bsp/meta-sancloud \ ${METADIR}/bsp/meta-rtlwifi \ " diff --git a/templates/machine/beaglebone-ai64/50_bblayers.conf.inc b/templates/machine/beaglebone-ai64/50_bblayers.conf.inc new file mode 100644 index 000000000..6ef08c43e --- /dev/null +++ b/templates/machine/beaglebone-ai64/50_bblayers.conf.inc @@ -0,0 +1,5 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-arm/meta-arm-toolchain \ + ${METADIR}/bsp/meta-ti/meta-ti-bsp \ + " diff --git a/templates/machine/beaglebone-ai64/50_local.conf.inc b/templates/machine/beaglebone-ai64/50_local.conf.inc new file mode 100644 index 000000000..80d4aac97 --- /dev/null +++ b/templates/machine/beaglebone-ai64/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "beaglebone-ai64" +#see meta-agl/meta-agl-bsp/conf/include/agl_beaglebone-ai64.inc +require conf/include/agl_beaglebone-ai64.inc diff --git a/templates/machine/beaglebone-ai64/README_machine_beaglebone-ai64.md b/templates/machine/beaglebone-ai64/README_machine_beaglebone-ai64.md new file mode 100644 index 000000000..7edf758a5 --- /dev/null +++ b/templates/machine/beaglebone-ai64/README_machine_beaglebone-ai64.md @@ -0,0 +1,9 @@ +--- +description: Machine beaglebone-ai64 +authors: Denys Dmytriyenko <denys@konsulko.com> +--- + +### Machine beaglebone-ai64 + +BeagleBoard.org BeagleBone AI-64 (uses Texas Instruments J721e/TDA4VM SoC). + diff --git a/templates/machine/beaglebone/50_bblayers.conf.inc b/templates/machine/beaglebone/50_bblayers.conf.inc index 6152217d3..6ef08c43e 100644 --- a/templates/machine/beaglebone/50_bblayers.conf.inc +++ b/templates/machine/beaglebone/50_bblayers.conf.inc @@ -1,5 +1,5 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-arm/meta-arm \ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \ - ${METADIR}/bsp/meta-ti \ + ${METADIR}/bsp/meta-ti/meta-ti-bsp \ " diff --git a/templates/machine/beagleplay/50_bblayers.conf.inc b/templates/machine/beagleplay/50_bblayers.conf.inc new file mode 100644 index 000000000..6ef08c43e --- /dev/null +++ b/templates/machine/beagleplay/50_bblayers.conf.inc @@ -0,0 +1,5 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-arm/meta-arm-toolchain \ + ${METADIR}/bsp/meta-ti/meta-ti-bsp \ + " diff --git a/templates/machine/beagleplay/50_local.conf.inc b/templates/machine/beagleplay/50_local.conf.inc new file mode 100644 index 000000000..334f81819 --- /dev/null +++ b/templates/machine/beagleplay/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "beagleplay" +#see meta-agl/meta-agl-bsp/conf/include/agl_beagleplay.inc +require conf/include/agl_beagleplay.inc diff --git a/templates/machine/beagleplay/README_machine_beagleplay.md b/templates/machine/beagleplay/README_machine_beagleplay.md new file mode 100644 index 000000000..d4528fba2 --- /dev/null +++ b/templates/machine/beagleplay/README_machine_beagleplay.md @@ -0,0 +1,9 @@ +--- +description: Machine beagleplay +authors: Denys Dmytriyenko <denys@konsulko.com> +--- + +### Machine beagleplay + +BeagleBoard.org BeaglePlay (uses Texas Instruments AM625x SoC). + diff --git a/templates/machine/dragonboard-410c/50_bblayers.conf.inc b/templates/machine/dragonboard-410c/50_bblayers.conf.inc deleted file mode 100644 index 41fe36719..000000000 --- a/templates/machine/dragonboard-410c/50_bblayers.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-qcom" -BBMASK += "bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd" diff --git a/templates/machine/dragonboard-410c/50_local.conf.inc b/templates/machine/dragonboard-410c/50_local.conf.inc deleted file mode 100644 index f717fd8ee..000000000 --- a/templates/machine/dragonboard-410c/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "dragonboard-410c" -#see meta-agl/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc -require conf/include/agl_dragonboard-410c.inc diff --git a/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md b/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md deleted file mode 100644 index 047e08c28..000000000 --- a/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine dragonboard-410c -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kotaro Hashimoto <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>, Stephane Desneux <stephane.desneux@iot.bzh> ---- - -### Machine dragonboard-410c - -*Description is missing - please complete file meta-agl/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md* - diff --git a/templates/machine/dragonboard-820c/50_bblayers.conf.inc b/templates/machine/dragonboard-820c/50_bblayers.conf.inc deleted file mode 100644 index f3b96cbb6..000000000 --- a/templates/machine/dragonboard-820c/50_bblayers.conf.inc +++ /dev/null @@ -1 +0,0 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-qcom" diff --git a/templates/machine/dragonboard-820c/50_local.conf.inc b/templates/machine/dragonboard-820c/50_local.conf.inc deleted file mode 100644 index 1cd53d60c..000000000 --- a/templates/machine/dragonboard-820c/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "dragonboard-820c" -#see meta-agl/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc -require conf/include/agl_dragonboard-820c.inc diff --git a/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md b/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md deleted file mode 100644 index 73d9532c3..000000000 --- a/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine dragonboard-820c -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org> ---- - -### Machine dragonboard-820c - -*Description is missing - please complete file meta-agl/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md* - diff --git a/templates/machine/ebisu/50_bblayers.conf.inc b/templates/machine/ebisu/50_bblayers.conf.inc index 16397c2eb..e06bd413d 100644 --- a/templates/machine/ebisu/50_bblayers.conf.inc +++ b/templates/machine/ebisu/50_bblayers.conf.inc @@ -1,3 +1,4 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/j7-evm/50_bblayers.conf.inc b/templates/machine/generic-arm64/50_bblayers.conf.inc index 6152217d3..05e60f69b 100644 --- a/templates/machine/j7-evm/50_bblayers.conf.inc +++ b/templates/machine/generic-arm64/50_bblayers.conf.inc @@ -1,5 +1,4 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-arm/meta-arm \ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \ - ${METADIR}/bsp/meta-ti \ " diff --git a/templates/machine/generic-arm64/50_local.conf.inc b/templates/machine/generic-arm64/50_local.conf.inc new file mode 100644 index 000000000..3918af8dd --- /dev/null +++ b/templates/machine/generic-arm64/50_local.conf.inc @@ -0,0 +1,2 @@ +MACHINE = "generic-arm64" + diff --git a/templates/machine/generic-arm64/README_machine_generic-arm64.md b/templates/machine/generic-arm64/README_machine_generic-arm64.md new file mode 100644 index 000000000..22dcb1fec --- /dev/null +++ b/templates/machine/generic-arm64/README_machine_generic-arm64.md @@ -0,0 +1,10 @@ +--- +description: Machine generic-arm64 +authors: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> +--- + +### Machine generic-arm64 + +This is a standard aarch64 (ARM 64bit) machine for use with 'SystemReady' +(aka UEFI) systems. + diff --git a/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/templates/machine/h3-salvator-x/50_bblayers.conf.inc index 16397c2eb..e06bd413d 100644 --- a/templates/machine/h3-salvator-x/50_bblayers.conf.inc +++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc @@ -1,3 +1,4 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc index 61d472ab1..25e36b019 100644 --- a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc +++ b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc @@ -1,4 +1,5 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc index 16397c2eb..e06bd413d 100644 --- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc +++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc @@ -1,3 +1,4 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc index 16397c2eb..e06bd413d 100644 --- a/templates/machine/h3ulcb/50_bblayers.conf.inc +++ b/templates/machine/h3ulcb/50_bblayers.conf.inc @@ -1,3 +1,4 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/hsdk/40_bblayers.conf.inc b/templates/machine/hsdk/40_bblayers.conf.inc deleted file mode 100644 index e3954fef3..000000000 --- a/templates/machine/hsdk/40_bblayers.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -# Use meta-synopsys layer for ARC HSDK board -BBLAYERS =+ "${METADIR}/bsp/meta-synopsys" diff --git a/templates/machine/hsdk/50_local.conf.inc b/templates/machine/hsdk/50_local.conf.inc deleted file mode 100644 index 61f77435e..000000000 --- a/templates/machine/hsdk/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -MACHINE = "hsdk" -require conf/include/agl_hsdk.inc diff --git a/templates/machine/hsdk/README_machine_hsdk.md b/templates/machine/hsdk/README_machine_hsdk.md deleted file mode 100644 index 30e56d13b..000000000 --- a/templates/machine/hsdk/README_machine_hsdk.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine hsdk -authors: Evgeniy Didin <didin@synopsys.com>, Jan-Simon Möller <jsmoeller@linuxfoundation.org> ---- - -### Machine hsdk - -*Description is missing - please complete file meta-agl/templates/machine/hsdk/README_machine_hsdk.md* - diff --git a/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc index edcb6a3a2..edcb6a3a2 100644 --- a/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc +++ b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc diff --git a/templates/machine/imx8mq-evk-viv/50_local.conf.inc b/templates/machine/imx8mq-evk-viv/50_local.conf.inc new file mode 100644 index 000000000..7504c1120 --- /dev/null +++ b/templates/machine/imx8mq-evk-viv/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "imx8mq-evk" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc +require conf/include/agl_imx8mq-evk-viv.inc diff --git a/templates/machine/imx8mqevk-viv/50_setup.sh b/templates/machine/imx8mq-evk-viv/50_setup.sh index eefd1eb7f..eefd1eb7f 100644 --- a/templates/machine/imx8mqevk-viv/50_setup.sh +++ b/templates/machine/imx8mq-evk-viv/50_setup.sh diff --git a/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md index be30e00fe..be30e00fe 100644 --- a/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md +++ b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md diff --git a/templates/machine/imx8mqevk/40_bblayers.conf.inc b/templates/machine/imx8mq-evk/40_bblayers.conf.inc index edcb6a3a2..edcb6a3a2 100644 --- a/templates/machine/imx8mqevk/40_bblayers.conf.inc +++ b/templates/machine/imx8mq-evk/40_bblayers.conf.inc diff --git a/templates/machine/imx8mq-evk/50_local.conf.inc b/templates/machine/imx8mq-evk/50_local.conf.inc new file mode 100644 index 000000000..8a178e28b --- /dev/null +++ b/templates/machine/imx8mq-evk/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "imx8mq-evk" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc +require conf/include/agl_imx8mq-evk.inc diff --git a/templates/machine/imx8mqevk/50_setup.sh b/templates/machine/imx8mq-evk/50_setup.sh index eefd1eb7f..eefd1eb7f 100644 --- a/templates/machine/imx8mqevk/50_setup.sh +++ b/templates/machine/imx8mq-evk/50_setup.sh diff --git a/templates/machine/imx8mqevk/README_machine_imx8mqevk.md b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md index 5d2bcbd37..ea9ddacce 100644 --- a/templates/machine/imx8mqevk/README_machine_imx8mqevk.md +++ b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md @@ -3,11 +3,11 @@ description: i.MX8MQ EVK with etnaviv GPU driver authors: Scott Murray <scott.murray@konsulko.com> --- -### Machine imx8mqevk +### Machine imx8mq-evk i.MX8MQ EVK and EVKB boards with etnaviv GPU driver support. Note that etnaviv on the GC7000L GPU in the i.MX8MQ is currently still -a work in progress, the imx8mqevk-viv template using the NXP Vivante +a work in progress, the imx8mq-evk-viv template using the NXP Vivante driver may be a better choice for those not interested in etnaviv debugging and development. diff --git a/templates/machine/imx8mqevk-viv/50_local.conf.inc b/templates/machine/imx8mqevk-viv/50_local.conf.inc deleted file mode 100644 index e9668c307..000000000 --- a/templates/machine/imx8mqevk-viv/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "imx8mqevk" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc -require conf/include/agl_imx8mqevk-viv.inc diff --git a/templates/machine/imx8mqevk/50_local.conf.inc b/templates/machine/imx8mqevk/50_local.conf.inc deleted file mode 100644 index 5f9b95943..000000000 --- a/templates/machine/imx8mqevk/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "imx8mqevk" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc -require conf/include/agl_imx8mqevk.inc diff --git a/templates/machine/j7-evm/50_local.conf.inc b/templates/machine/j7-evm/50_local.conf.inc deleted file mode 100644 index 1a81cb7ed..000000000 --- a/templates/machine/j7-evm/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "j7-evm" -#see meta-agl/meta-agl-bsp/conf/include/agl_j7-evm.inc -require conf/include/agl_j7-evm.inc diff --git a/templates/machine/j7-evm/README_machine_j7-evm.md b/templates/machine/j7-evm/README_machine_j7-evm.md deleted file mode 100644 index f1441a301..000000000 --- a/templates/machine/j7-evm/README_machine_j7-evm.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine j7-evm -authors: Scott Murray <scott.murray@konsulko.com> ---- - -### Machine j7-evm - -*Description is missing - please complete file meta-agl/templates/machine/dra7xx-evm/README_machine_j7-evm.md* - diff --git a/templates/machine/j721e-evm/50_bblayers.conf.inc b/templates/machine/j721e-evm/50_bblayers.conf.inc new file mode 100644 index 000000000..6ef08c43e --- /dev/null +++ b/templates/machine/j721e-evm/50_bblayers.conf.inc @@ -0,0 +1,5 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-arm/meta-arm-toolchain \ + ${METADIR}/bsp/meta-ti/meta-ti-bsp \ + " diff --git a/templates/machine/j721e-evm/50_local.conf.inc b/templates/machine/j721e-evm/50_local.conf.inc new file mode 100644 index 000000000..917ca73a7 --- /dev/null +++ b/templates/machine/j721e-evm/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "j721e-evm" +#see meta-agl/meta-agl-bsp/conf/include/agl_j721e-evm.inc +require conf/include/agl_j721e-evm.inc diff --git a/templates/machine/j721e-evm/README_machine_j721e-evm.md b/templates/machine/j721e-evm/README_machine_j721e-evm.md new file mode 100644 index 000000000..c6f7320d6 --- /dev/null +++ b/templates/machine/j721e-evm/README_machine_j721e-evm.md @@ -0,0 +1,9 @@ +--- +description: Machine j721e-evm +authors: Scott Murray <scott.murray@konsulko.com> +--- + +### Machine j721e-evm + +Texas Instruments J721e EVM (formerly J7 EVM). + diff --git a/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/templates/machine/m3-salvator-x/50_bblayers.conf.inc index 16397c2eb..e06bd413d 100644 --- a/templates/machine/m3-salvator-x/50_bblayers.conf.inc +++ b/templates/machine/m3-salvator-x/50_bblayers.conf.inc @@ -1,3 +1,4 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/m3ulcb-kf/50_bblayers.conf.inc b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc index 61d472ab1..25e36b019 100644 --- a/templates/machine/m3ulcb-kf/50_bblayers.conf.inc +++ b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc @@ -1,4 +1,5 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc index 16397c2eb..e06bd413d 100644 --- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc +++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc @@ -1,3 +1,4 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc index 16397c2eb..e06bd413d 100644 --- a/templates/machine/m3ulcb/50_bblayers.conf.inc +++ b/templates/machine/m3ulcb/50_bblayers.conf.inc @@ -1,3 +1,4 @@ BBLAYERS =+ "\ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/external/poky/meta-yocto-bsp \ " diff --git a/templates/machine/nitrogen6x/40_bblayers.conf.inc b/templates/machine/nitrogen6x/40_bblayers.conf.inc deleted file mode 100644 index a4323be1a..000000000 --- a/templates/machine/nitrogen6x/40_bblayers.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -# This must be parsed after qt5, etc. layers so that they are correctly -# recognized by meta-freescale/dynamic-layers -BBLAYERS =+ "\ - ${METADIR}/bsp/meta-freescale \ - ${METADIR}/bsp/meta-freescale-3rdparty \ - " diff --git a/templates/machine/nitrogen6x/50_local.conf.inc b/templates/machine/nitrogen6x/50_local.conf.inc deleted file mode 100644 index f8178bbd1..000000000 --- a/templates/machine/nitrogen6x/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "nitrogen6x" -#see meta-agl/meta-agl-bsp/conf/include/agl_nitrogen6x.inc -require conf/include/agl_nitrogen6x.inc diff --git a/templates/machine/nitrogen6x/50_setup.sh b/templates/machine/nitrogen6x/50_setup.sh deleted file mode 100644 index eefd1eb7f..000000000 --- a/templates/machine/nitrogen6x/50_setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -find_and_ack_eula $METADIR/bsp/meta-freescale EULA -export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/nitrogen6x/README_machine_nitrogen6x.md b/templates/machine/nitrogen6x/README_machine_nitrogen6x.md deleted file mode 100644 index 9994de052..000000000 --- a/templates/machine/nitrogen6x/README_machine_nitrogen6x.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine nitrogen6x -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Mihail Grigorov <michael.grigorov@konsulko.com>, Nathan Illerbrun <nathani@validmanufacturing.com>, Scott Murray <scott.murray@konsulko.com> ---- - -### Machine nitrogen6x - -*Description is missing - please complete file meta-agl/templates/machine/nitrogen6x/README_machine_nitrogen6x.md* - diff --git a/templates/machine/raspberrypi5/50_bblayers.conf.inc b/templates/machine/raspberrypi5/50_bblayers.conf.inc new file mode 100644 index 000000000..2e677dd8a --- /dev/null +++ b/templates/machine/raspberrypi5/50_bblayers.conf.inc @@ -0,0 +1 @@ +BBLAYERS =+ "${METADIR}/bsp/meta-raspberrypi" diff --git a/templates/machine/raspberrypi5/50_local.conf.inc b/templates/machine/raspberrypi5/50_local.conf.inc new file mode 100644 index 000000000..9ee2644ab --- /dev/null +++ b/templates/machine/raspberrypi5/50_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "raspberrypi5" + +#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi5.inc +require conf/include/agl_raspberrypi5.inc diff --git a/templates/machine/s4sk/50_bblayers.conf.inc b/templates/machine/s4sk/50_bblayers.conf.inc new file mode 100644 index 000000000..0cc25a9ab --- /dev/null +++ b/templates/machine/s4sk/50_bblayers.conf.inc @@ -0,0 +1,7 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-renesas/meta-rcar-gateway \ + ${METADIR}/external/poky/meta-yocto-bsp \ + " + +AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" + diff --git a/templates/machine/s4sk/50_local.conf.inc b/templates/machine/s4sk/50_local.conf.inc new file mode 100644 index 000000000..b804b3845 --- /dev/null +++ b/templates/machine/s4sk/50_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "s4sk" +#see meta-agl/meta-agl-bsp/conf/include/agl_s4sk.inc +require conf/include/agl_s4sk.inc + diff --git a/templates/machine/s4sk/README_machine_s4sk.md b/templates/machine/s4sk/README_machine_s4sk.md new file mode 100644 index 000000000..275be67a6 --- /dev/null +++ b/templates/machine/s4sk/README_machine_s4sk.md @@ -0,0 +1,11 @@ +--- +description: Machine s4sk +authors: Loc Nguyen <loc.nguyen.wt@renesas.com> +--- + +### Machine s4sk + +Renesas RCar Gen4 "s4sk" board. + +* [R-Car S4 Starter Kit website](https://www.renesas.com/us/en/products/automotive-products/automotive-system-chips-socs/y-ask-rcar-s4-1000base-t-r-car-s4-starter-kit) +* [elinux S4 Starter Kit](https://elinux.org/R-Car/Boards/S4SK) diff --git a/templates/machine/unmatched/50_bblayers.conf.inc b/templates/machine/unmatched/50_bblayers.conf.inc new file mode 100644 index 000000000..03565bafd --- /dev/null +++ b/templates/machine/unmatched/50_bblayers.conf.inc @@ -0,0 +1,6 @@ +# This is the original place, but we need to tweak layer.conf +BBLAYERS =+ "${METADIR}/bsp/meta-sifive" + +# For now, tweak the layer's compatibility to allow using with kirkstone, +# since we know it works without major issues. +LAYERSERIES_COMPAT_meta-sifive:append = " kirkstone" diff --git a/templates/machine/unmatched/50_local.conf.inc b/templates/machine/unmatched/50_local.conf.inc new file mode 100644 index 000000000..c4d2b3ae5 --- /dev/null +++ b/templates/machine/unmatched/50_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "unmatched" + +#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +require conf/include/agl_unmatched.inc |