diff options
Diffstat (limited to 'meta-agl/templates')
75 files changed, 442 insertions, 170 deletions
diff --git a/meta-agl/templates/base/99_local.conf.inc b/meta-agl/templates/base/99_local.conf.inc index 871ea0eb..c4f43998 100644 --- a/meta-agl/templates/base/99_local.conf.inc +++ b/meta-agl/templates/base/99_local.conf.inc @@ -17,3 +17,17 @@ # Additional free disk space created in the image in Kbytes. #IMAGE_ROOTFS_EXTRA_SPACE="524288" +# meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend +# AGL's compositor is started instead of weston like so +# AGL_DEFAULT_WESTONSTART ?= "/usr/bin/agl-compositor --config ${sysconfdir}/xdg/weston/weston.ini" +# you can redefine it using this variable to go back to weston, +# but be careful that this needs further changes to work ! +# Especially the AGL demo apps will not work as-is. +#AGL_DEFAULT_WESTONSTART = "/usr/bin/weston" + +# meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend +# This defines the QT integration. We default to xdg-shell +# AGL_DEFAULT_WM_SHELL ?= "xdg-shell" +# you can redefine it using this variable to e.g. use ivi-shell +# but be careful that this needs further changes to work ! +#AGL_DEFAULT_WM_SHELL = "" diff --git a/meta-agl/templates/base/conf-notes.txt b/meta-agl/templates/base/conf-notes.txt index 02e04678..ed020184 100644 --- a/meta-agl/templates/base/conf-notes.txt +++ b/meta-agl/templates/base/conf-notes.txt @@ -1,26 +1,45 @@ Common targets are: - - meta-agl: (core system) - - agl-profile-core: - agl-image-boot - agl-image-minimal - agl-image-minimal-qa - - - agl-profile-graphical: - agl-image-weston - - - agl-profile-graphical-qt5: - agl-image-graphical-qt5 - agl-image-graphical-qt5-crosssdk - - - agl-profile-graphical-html5 - agl-demo-platform-html5 - - - meta-agl-demo: (demo with UI) - agl-image-ivi (base for ivi targets) - agl-image-ivi-qa - agl-image-ivi-crosssdk - - agl-demo-platform (* default demo target) - agl-demo-platform-qa - agl-demo-platform-crosssdk +- 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 ^^) + + - with 'agl-profile-graphical' + * agl-image-weston (minimal filesystem with weston) + + - with 'agl-profile-graphical-qt5' + * agl-image-graphical-qt5 (weston plus qt5 framework libs) + * agl-image-graphical-qt5-crosssdk (crosssdk for ^^) + + - with 'agl-profile-graphical-html5' + * agl-image-graphical-html5 (weston plus chromium for html5) + + - with 'agl-profile-cluster' + * agl-image-cluster (minimal image with APIs for cluster) + + - with 'agl-profile-cluster-qt5' + * agl-image-cluster-qt5 (image with QT5 and APIs for cluster) + + - with 'agl-profile-telematics' + * agl-image-telematics (image with APIs for telematics) + +- meta-agl-cluster-demo layer: (Instrument Cluster demo with UI) + - with 'agl-cluster-demo' + * agl-cluster-demo-platform (cluster demo image) + * agl-cluster-demo-platform-crosssdk (sdk for ^^) + * agl-cluster-demo-qtcompositor (cluster demo using own compositor) + +- meta-agl-telematics-demo layer: (Telematics demo w/o UI) + - with 'agl-telematics-demo' + * agl-telematics-demo-platform (telematics demo image) + * agl-telematics-demo-platform-crosssdk (sdk for ^^) + +- meta-agl-demo: (IVI demo with UI) + - with 'agl-demo' + * agl-image-ivi (base for IVI targets) + * agl-image-ivi-crosssdk (sdk for ^^) + + * agl-demo-platform (* default IVI demo target *) + * agl-demo-platform-crosssdk (sdk for ^^) diff --git a/meta-agl/templates/base/local.conf.sample b/meta-agl/templates/base/local.conf.sample index 365b6eb2..d506c818 100644 --- a/meta-agl/templates/base/local.conf.sample +++ b/meta-agl/templates/base/local.conf.sample @@ -28,14 +28,14 @@ # There are also the following hardware board target machines included for # demonstration purposes: # -#MACHINE ?= "beaglebone" +#MACHINE ?= "beaglebone-yocto" #MACHINE ?= "genericx86" #MACHINE ?= "genericx86-64" #MACHINE ?= "mpc8315e-rdb" #MACHINE ?= "edgerouter" # -# This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "qemux86" +# This sets the default machine to be qemux86-64 if no other machine is selected: +MACHINE ??= "qemux86-64" # # Where to place downloads @@ -124,6 +124,8 @@ PACKAGE_CLASSES ?= "package_rpm" # 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 @@ -149,7 +151,6 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # - 'buildstats' collect build statistics # - 'image-mklibs' to reduce shared library files size for an image # - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection # 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" @@ -158,10 +159,12 @@ 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. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# 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 # @@ -191,7 +194,7 @@ PATCHRESOLVE = "noop" # 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 = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -219,17 +222,120 @@ BB_DISKMON_DIRS = "\ #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 qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +# 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 diff --git a/meta-agl/templates/feature/agl-archiver/.50_FEATURE.md.swp b/meta-agl/templates/feature/agl-archiver/.50_FEATURE.md.swp Binary files differdeleted file mode 100644 index b9384551..00000000 --- a/meta-agl/templates/feature/agl-archiver/.50_FEATURE.md.swp +++ /dev/null diff --git a/meta-agl/templates/feature/agl-archiver/50_local.conf.inc b/meta-agl/templates/feature/agl-archiver/50_local.conf.inc index 946c262d..6ff284cd 100644 --- a/meta-agl/templates/feature/agl-archiver/50_local.conf.inc +++ b/meta-agl/templates/feature/agl-archiver/50_local.conf.inc @@ -1,2 +1,4 @@ INHERIT += "archiver" ARCHIVER_MODE[src] = "original" +COPYLEFT_LICENSE_INCLUDE = "*" +COPYLEFT_LICENSE_EXCLUDE += "CLOSED Proprietary Custom Firmware-* Freescale-* NXP-* TI TI-*" diff --git a/meta-agl/templates/feature/agl-ci-change-features-nogfx/included.dep b/meta-agl/templates/feature/agl-ci-change-features-nogfx/included.dep index c0e72005..64e2103c 100644 --- a/meta-agl/templates/feature/agl-ci-change-features-nogfx/included.dep +++ b/meta-agl/templates/feature/agl-ci-change-features-nogfx/included.dep @@ -1 +1 @@ -agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
\ No newline at end of file +agl-demo agl-devel agl-netboot agl-pipewire agl-cloudproxy agl-buildstats agl-ptest diff --git a/meta-agl/templates/feature/agl-ci-change-features/included.dep b/meta-agl/templates/feature/agl-ci-change-features/included.dep index 27e9852f..64e2103c 100644 --- a/meta-agl/templates/feature/agl-ci-change-features/included.dep +++ b/meta-agl/templates/feature/agl-ci-change-features/included.dep @@ -1 +1 @@ -agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest +agl-demo agl-devel agl-netboot agl-pipewire agl-cloudproxy agl-buildstats agl-ptest diff --git a/meta-agl/templates/feature/agl-ci/99_local.conf.inc b/meta-agl/templates/feature/agl-ci/99_local.conf.inc index 5386671b..8f6f697c 100644 --- a/meta-agl/templates/feature/agl-ci/99_local.conf.inc +++ b/meta-agl/templates/feature/agl-ci/99_local.conf.inc @@ -1 +1,4 @@ DISTRO_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" diff --git a/meta-agl/templates/feature/agl-compositor/50_local.conf.inc b/meta-agl/templates/feature/agl-compositor/50_local.conf.inc deleted file mode 100644 index 4bddfb6e..00000000 --- a/meta-agl/templates/feature/agl-compositor/50_local.conf.inc +++ /dev/null @@ -1,15 +0,0 @@ -DISTRO_FEATURES_append = " agl-compositor" - -# note that these are for testing only, should be removed once the changes -# land in their respective repositories - -# shell client -AGL_BRANCH_pn-homescreen = "sandbox/mvlad/agl-compositor" -DEPENDS_append_pn-homescreen = " wayland-native wayland qtwayland qtwayland-native" - -# normal apps -AGL_BRANCH_pn-launcher = "sandbox/mvlad/agl-compositor" -AGL_BRANCH_pn-hvac = "sandbox/mvlad/agl-compositor" -DEPENDS_append_pn-hvac = " libafb-helpers-qt" -AGL_BRANCH_pn-navigation-demo = "sandbox/mvlad/agl-compositor" -AGL_BRANCH_pn-mediaplayer = "sandbox/mvlad/agl-compositor" diff --git a/meta-agl/templates/feature/agl-compositor/README_feature_agl-compositor.md b/meta-agl/templates/feature/agl-compositor/README_feature_agl-compositor.md deleted file mode 100644 index 4b5211ee..00000000 --- a/meta-agl/templates/feature/agl-compositor/README_feature_agl-compositor.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -description: Feature agl-compositor -authors: Daniel Stone <daniels@collabora.com> ---- - -### Feature agl-compositor - -_agl-compositor_ is a new Wayland display server framework, based on the -existing libweston library. It provides AGL users an extensible framework for -window/input/output management within the display server. - -It is included as a technology preview, and is not currently ready for -production use. diff --git a/meta-agl/templates/feature/agl-egvirt/50_local.conf.inc b/meta-agl/templates/feature/agl-egvirt/50_local.conf.inc deleted file mode 100644 index 48590c40..00000000 --- a/meta-agl/templates/feature/agl-egvirt/50_local.conf.inc +++ /dev/null @@ -1,9 +0,0 @@ -#see meta-agl-devel/meta-egvirt/conf/include/agl_egvirt.inc -require conf/include/agl_egvirt.inc - -# In order to enable the agl virtualization features (agl-egvirt), -# each supported board needs to add in one of its configuration -# files (see for instance meta-agl/meta-agl-bsp/conf/include) -# the following line: -# -# MACHINE_FEATURES += "agl-egvirt" diff --git a/meta-agl/templates/feature/agl-egvirt/README_feature_agl-egvirt.md b/meta-agl/templates/feature/agl-egvirt/README_feature_agl-egvirt.md deleted file mode 100644 index 658b39f8..00000000 --- a/meta-agl/templates/feature/agl-egvirt/README_feature_agl-egvirt.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-egvirt -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org> ---- - -### Feature agl-egvirt - -*Description is missing - please complete file meta-agl/templates/feature/agl-egvirt/README_feature_agl-egvirt.md* - diff --git a/meta-agl/templates/feature/agl-pipewire/50_bblayers.conf.inc b/meta-agl/templates/feature/agl-pipewire/50_bblayers.conf.inc new file mode 100644 index 00000000..e05cd409 --- /dev/null +++ b/meta-agl/templates/feature/agl-pipewire/50_bblayers.conf.inc @@ -0,0 +1,7 @@ + +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-pipewire \ + " + +# we ship our own pipewire +BBMASK += "meta-openembedded/meta-oe/recipes-multimedia/pipewire/" diff --git a/meta-agl/templates/feature/agl-pipewire/50_local.conf.inc b/meta-agl/templates/feature/agl-pipewire/50_local.conf.inc new file mode 100644 index 00000000..33838b08 --- /dev/null +++ b/meta-agl/templates/feature/agl-pipewire/50_local.conf.inc @@ -0,0 +1,2 @@ +#see meta-agl-devel/meta-pipewire/conf/include/agl-pipewire.inc +require conf/include/agl-pipewire.inc diff --git a/meta-agl/templates/feature/agl-pipewire/README_feature_agl-pipewire.md b/meta-agl/templates/feature/agl-pipewire/README_feature_agl-pipewire.md new file mode 100644 index 00000000..55e1931c --- /dev/null +++ b/meta-agl/templates/feature/agl-pipewire/README_feature_agl-pipewire.md @@ -0,0 +1,9 @@ +--- +description: Feature agl-pipewire +authors: George Kiagiadakis <george.kiagiadakis@collabora.com> +--- + +### Feature agl-pipewire + +*Description is missing - please complete file meta-agl-devel/templates/feature/agl-pipewire/README_feature_agl-pipewire.md* + diff --git a/meta-agl/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc b/meta-agl/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc new file mode 100644 index 00000000..a35f93fb --- /dev/null +++ b/meta-agl/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc @@ -0,0 +1,6 @@ + +BBLAYERS =+ " \ + ${METADIR}/meta-agl/meta-agl-profile-graphical-html5 \ + ${METADIR}/external/meta-python2 \ + " + diff --git a/meta-agl/templates/feature/agl-profile-graphical-html5/50_local.conf.inc b/meta-agl/templates/feature/agl-profile-graphical-html5/50_local.conf.inc new file mode 100644 index 00000000..0b2d7002 --- /dev/null +++ b/meta-agl/templates/feature/agl-profile-graphical-html5/50_local.conf.inc @@ -0,0 +1,3 @@ + +IMAGE_INSTALL_append = " packagegroup-agl-profile-graphical-html5" + diff --git a/meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md b/meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md new file mode 100644 index 00000000..dc00f94c --- /dev/null +++ b/meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md @@ -0,0 +1,8 @@ +--- +description: Feature agl-profile-graphical-html5 +authors: Jacobo Aragunde Pérez <jaragunde@igalia.com> +--- + +### Feature agl-profile-graphical-html5 + +Packages required to run web applications in AGL. The provided image agl-image-graphical-html5 includes the minimum set of packages required for this purpose. diff --git a/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep b/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep new file mode 100644 index 00000000..032609b8 --- /dev/null +++ b/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep @@ -0,0 +1 @@ +agl-profile-graphical diff --git a/meta-agl/templates/feature/agl-ptest/90_local.conf.inc b/meta-agl/templates/feature/agl-ptest/90_local.conf.inc index bee38fab..4c546e70 100644 --- a/meta-agl/templates/feature/agl-ptest/90_local.conf.inc +++ b/meta-agl/templates/feature/agl-ptest/90_local.conf.inc @@ -2,8 +2,8 @@ # Enabling ptest in image ... OVERRIDES .= ":agl-ptest" -EXTRA_OECMAKE_append = " -DBUILD_TEST_WGT=TRUE" DISTRO_FEATURES_append = " ptest" EXTRA_IMAGE_FEATURES_append = " ptest-pkgs" +IMAGE_INSTALL_append = " lua-ptest xmlsec1-ptest libxml2-ptest" # / ptest diff --git a/meta-agl/templates/feature/agl-sign-wgts/50_local.conf.inc b/meta-agl/templates/feature/agl-sign-wgts/50_local.conf.inc new file mode 100644 index 00000000..fb1f6ab1 --- /dev/null +++ b/meta-agl/templates/feature/agl-sign-wgts/50_local.conf.inc @@ -0,0 +1,2 @@ +#see meta-agl/meta-agl/conf/include/agl-sign-wgts.inc +require conf/include/agl-sign-wgts.inc diff --git a/meta-agl/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md b/meta-agl/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md new file mode 100644 index 00000000..5e3b4b12 --- /dev/null +++ b/meta-agl/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md @@ -0,0 +1,8 @@ +--- +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/meta-agl/templates/feature/agl-sota/50_bblayers.conf.inc b/meta-agl/templates/feature/agl-sota/50_bblayers.conf.inc index 48655fdc..f3623354 100644 --- a/meta-agl/templates/feature/agl-sota/50_bblayers.conf.inc +++ b/meta-agl/templates/feature/agl-sota/50_bblayers.conf.inc @@ -1,6 +1,3 @@ BBLAYERS =+ " \ ${METADIR}/external/meta-updater \ - ${METADIR}/external/meta-openembedded/meta-filesystems \ - ${METADIR}/external/meta-openembedded/meta-python \ " - diff --git a/meta-agl/templates/feature/agl-sota/50_local.conf.inc b/meta-agl/templates/feature/agl-sota/50_local.conf.inc index 35ab3f9a..3ceb04df 100644 --- a/meta-agl/templates/feature/agl-sota/50_local.conf.inc +++ b/meta-agl/templates/feature/agl-sota/50_local.conf.inc @@ -1,10 +1,8 @@ -#see meta-updater/conf/distro/sota.conf.inc +# 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" -# rpi4 and recent rpi3 firmwares need dtb in /boot partition -# so that they can be read by the firmware. This fixes UART -# issues for Raspberry Pi 3. For branches based on release -# Thud this fix is not present in meta-updater. -IMAGE_BOOT_FILES_append_rpi = "${@make_dtb_boot_files(d)}" +# Netboot is not obeying usrmerge distro feature +# therefore it is not compatible with agl-sota +CONFLICT_DISTRO_FEATURES += "netboot" diff --git a/meta-agl/templates/feature/agl-virt-guest-xen/50_local.conf.inc b/meta-agl/templates/feature/agl-virt-guest-xen/50_local.conf.inc new file mode 100644 index 00000000..07950559 --- /dev/null +++ b/meta-agl/templates/feature/agl-virt-guest-xen/50_local.conf.inc @@ -0,0 +1,3 @@ +# Set Xen flag + +AGL_XEN_GUEST_WANTED = "1" diff --git a/meta-agl/templates/feature/agl-weston-remoting/50_local.conf.inc b/meta-agl/templates/feature/agl-weston-remoting/50_local.conf.inc new file mode 100644 index 00000000..da1ddb3a --- /dev/null +++ b/meta-agl/templates/feature/agl-weston-remoting/50_local.conf.inc @@ -0,0 +1 @@ +DISTRO_FEATURES_append = " weston-remoting" diff --git a/meta-agl/templates/feature/agl-weston-remoting/README_feature_agl-weston-remoting.md b/meta-agl/templates/feature/agl-weston-remoting/README_feature_agl-weston-remoting.md new file mode 100644 index 00000000..03b05d49 --- /dev/null +++ b/meta-agl/templates/feature/agl-weston-remoting/README_feature_agl-weston-remoting.md @@ -0,0 +1,9 @@ +--- +description: Feature agl-weston-remoting +authors: Scott Murray <scott.murray@konsulko.com> +--- + +### Feature agl-weston-remoting + +Enables secondary remote display configuration using Weston's remoting feaure. + diff --git a/meta-agl/templates/feature/agl-weston-remoting/included.dep b/meta-agl/templates/feature/agl-weston-remoting/included.dep new file mode 100644 index 00000000..032609b8 --- /dev/null +++ b/meta-agl/templates/feature/agl-weston-remoting/included.dep @@ -0,0 +1 @@ +agl-profile-graphical diff --git a/meta-agl/templates/machine/bbe/50_bblayers.conf.inc b/meta-agl/templates/machine/bbe/50_bblayers.conf.inc index 0b42c9bf..b2fffb9d 100644 --- a/meta-agl/templates/machine/bbe/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/bbe/50_bblayers.conf.inc @@ -1,4 +1,5 @@ BBLAYERS =+ " \ + ${METADIR}/bsp/meta-arm/meta-arm \ ${METADIR}/bsp/meta-ti \ ${METADIR}/bsp/meta-sancloud \ ${METADIR}/bsp/meta-rtlwifi \ diff --git a/meta-agl/templates/machine/bbe/README_machine_bbe.md b/meta-agl/templates/machine/bbe/README_machine_bbe.md index c32f23d4..3161a019 100644 --- a/meta-agl/templates/machine/bbe/README_machine_bbe.md +++ b/meta-agl/templates/machine/bbe/README_machine_bbe.md @@ -1,9 +1,12 @@ --- -description: Machine bbe -authors: Paul Barker <paul.barker@sancloud.co.uk> +description: SanCloud BeagleBone Enhanced (BBE) +authors: SanCloud Ltd <yocto@sancloud.co.uk> --- -### Machine bbe - -*Description is missing - please complete file meta-agl/templates/machine/bbe/README_machine_bbe.md* +### SanCloud BeagleBone Enhanced (BBE) +* [SanCloud website](https://www.sancloud.co.uk/) + +* [BeagleBone Enhanced Description](https://www.sancloud.co.uk/beaglebone-enhanced-bbe) + +* [Sancloud repositories on GitHub](https://github.com/SanCloudLtd) diff --git a/meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc b/meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc index f116ca28..6b932326 100644 --- a/meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc @@ -1 +1,4 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-ti" +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-ti \ + " diff --git a/meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc b/meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc index f116ca28..6b932326 100644 --- a/meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc @@ -1 +1,4 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-ti" +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-arm/meta-arm \ + ${METADIR}/bsp/meta-ti \ + " diff --git a/meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc b/meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc index 4a3cae0f..41fe3671 100644 --- a/meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc @@ -1,2 +1,2 @@ BBLAYERS =+ "${METADIR}/bsp/meta-qcom" -BBMASK .= "|bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd" +BBMASK += "bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd" diff --git a/meta-agl/templates/machine/ebisu/50_bblayers.conf.inc b/meta-agl/templates/machine/ebisu/50_bblayers.conf.inc index 7b0db440..16397c2e 100644 --- a/meta-agl/templates/machine/ebisu/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/ebisu/50_bblayers.conf.inc @@ -1,3 +1,3 @@ BBLAYERS =+ "\ - ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ " diff --git a/meta-agl/templates/machine/ebisu/50_local.conf.inc b/meta-agl/templates/machine/ebisu/50_local.conf.inc index e780501a..c62dec4a 100644 --- a/meta-agl/templates/machine/ebisu/50_local.conf.inc +++ b/meta-agl/templates/machine/ebisu/50_local.conf.inc @@ -1,6 +1,3 @@ MACHINE = "ebisu" #see meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc require conf/include/agl_ebisu.inc - -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -#require conf/include/rcar-gen3-adas.inc diff --git a/meta-agl/templates/machine/ebisu/50_setup.sh b/meta-agl/templates/machine/ebisu/50_setup.sh index 502c2275..188da6e5 100644 --- a/meta-agl/templates/machine/ebisu/50_setup.sh +++ b/meta-agl/templates/machine/ebisu/50_setup.sh @@ -1,7 +1,7 @@ # setup proprietary gfx drivers and multimedia packages pushd $METADIR 2>/dev/null -COPY_SCRIPT="$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_proprietary_softwares.sh" +COPY_SCRIPT="$METADIR/bsp/meta-renesas/meta-rcar-gen3/docs/sample/copyscript/copy_proprietary_softwares.sh" EXTRACT_DIR=$METADIR/binary-tmp #EBISU_BIN_PATH should contain the path where the .zip archive of E3 binaries is. #CUSTOM_RENESAS_CONFIG_SCRIPT should contain the custom script needed for setup. If not filled, do not failed, just warn. @@ -24,7 +24,7 @@ if [ -f $COPY_SCRIPT ]; then unzip -q -o $PROPRIETARY_BIN -d $EXTRACT_DIR done - cd $METADIR/bsp/meta-renesas-rcar-gen3/ + cd $METADIR/bsp/meta-renesas/ $COPY_SCRIPT $EXTRACT_DIR cd .. diff --git a/meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc index 7b0db440..16397c2e 100644 --- a/meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc @@ -1,3 +1,3 @@ BBLAYERS =+ "\ - ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ " diff --git a/meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md b/meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md index 2dcdcd42..9cd793f7 100644 --- a/meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md +++ b/meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md @@ -1,9 +1,11 @@ --- description: Machine h3-salvator-x -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com> +authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com>, Ronan Le Martret <ronan.lemartret@iot.bzh> Duy Dang <duy.dang.yw@renesas.com> --- - + ### Machine h3-salvator-x - -*Description is missing - please complete file meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md* +salvator-x board with an h3 SoC. + +* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html) +* [elinux H3 Salvator-X](https://elinux.org/R-Car/Boards/Salvator-X) diff --git a/meta-agl/templates/machine/h3ulcb-kf/50_bblayers.conf.inc b/meta-agl/templates/machine/h3ulcb-kf/50_bblayers.conf.inc new file mode 100644 index 00000000..61d472ab --- /dev/null +++ b/meta-agl/templates/machine/h3ulcb-kf/50_bblayers.conf.inc @@ -0,0 +1,4 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ + " diff --git a/meta-agl/templates/machine/h3ulcb-kf/50_local.conf.inc b/meta-agl/templates/machine/h3ulcb-kf/50_local.conf.inc new file mode 100644 index 00000000..43e11737 --- /dev/null +++ b/meta-agl/templates/machine/h3ulcb-kf/50_local.conf.inc @@ -0,0 +1,7 @@ +MACHINE = "h3ulcb" +#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc +require conf/include/agl_h3ulcb.inc + +#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc +require conf/include/rcar-gen3-adas.inc + diff --git a/meta-agl/templates/machine/h3ulcb-kf/50_setup.sh b/meta-agl/templates/machine/h3ulcb-kf/50_setup.sh new file mode 100644 index 00000000..abd2a33a --- /dev/null +++ b/meta-agl/templates/machine/h3ulcb-kf/50_setup.sh @@ -0,0 +1,10 @@ +# setup proprietary gfx drivers and multimedia packages +pushd $METADIR 2>/dev/null + +SETUP_MM_SCRIPT=$METADIR/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh +if [ -f $SETUP_MM_SCRIPT ]; then + . $SETUP_MM_SCRIPT + copy_mm_packages +fi + +popd 2>/dev/null diff --git a/meta-agl/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md b/meta-agl/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md new file mode 100644 index 00000000..cdef9afa --- /dev/null +++ b/meta-agl/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md @@ -0,0 +1,12 @@ +--- +description: Machine h3ulcb-kf +authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh> +--- + +### Machine h3ulcb-kf + +Renesas RCar Gen3 "h3ulcb" board with Kingfisher baseboard. + +* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html) +* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK) +* [R-Car/Boards/Kingfisher](https://elinux.org/R-Car/Boards/Kingfisher) diff --git a/meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc index 5f410f0f..16397c2e 100644 --- a/meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc @@ -1,4 +1,3 @@ BBLAYERS =+ "\ - ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ " diff --git a/meta-agl/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/meta-agl/templates/machine/h3ulcb-nogfx/50_local.conf.inc index 4403e6ea..2f7cd6b3 100644 --- a/meta-agl/templates/machine/h3ulcb-nogfx/50_local.conf.inc +++ b/meta-agl/templates/machine/h3ulcb-nogfx/50_local.conf.inc @@ -1,7 +1,3 @@ MACHINE = "h3ulcb" #see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc require conf/include/agl_h3ulcb-nogfx.inc - -# custom inclusion of cogent layer -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc diff --git a/meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md b/meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md index da5d9b73..a1f3b9f6 100644 --- a/meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md +++ b/meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md @@ -2,8 +2,10 @@ description: Machine h3ulcb-nogfx authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilman@baylibre.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh> --- - + ### Machine h3ulcb-nogfx - -*Description is missing - please complete file meta-agl/templates/machine/m3ulcb-nogfx/README_machine_h3ulcb-nogfx.md* +This is a "h3ulcb" machine without proprietary graphics driver support. + +* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html) +* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK) diff --git a/meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc b/meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc index 5f410f0f..16397c2e 100644 --- a/meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc @@ -1,4 +1,3 @@ BBLAYERS =+ "\ - ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ " diff --git a/meta-agl/templates/machine/h3ulcb/50_local.conf.inc b/meta-agl/templates/machine/h3ulcb/50_local.conf.inc index 43e11737..4bb2a821 100644 --- a/meta-agl/templates/machine/h3ulcb/50_local.conf.inc +++ b/meta-agl/templates/machine/h3ulcb/50_local.conf.inc @@ -2,6 +2,3 @@ MACHINE = "h3ulcb" #see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc require conf/include/agl_h3ulcb.inc -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc - diff --git a/meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md b/meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md index be3aa0f6..fffad09b 100644 --- a/meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md +++ b/meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md @@ -2,8 +2,10 @@ description: Machine h3ulcb authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh> --- - + ### Machine h3ulcb - -*Description is missing - please complete file meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md* +Renesas RCar Gen3 "h3ulcb" board. + +* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html) +* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK) diff --git a/meta-agl/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc b/meta-agl/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc new file mode 100644 index 00000000..edcb6a3a --- /dev/null +++ b/meta-agl/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc @@ -0,0 +1,5 @@ +# This must be parsed after qt5, etc. layers so that they are correctly +# recognized by meta-freescale/dynamic-layers +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-freescale \ + " diff --git a/meta-agl/templates/machine/imx8mqevk-viv/50_local.conf.inc b/meta-agl/templates/machine/imx8mqevk-viv/50_local.conf.inc new file mode 100644 index 00000000..e9668c30 --- /dev/null +++ b/meta-agl/templates/machine/imx8mqevk-viv/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "imx8mqevk" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc +require conf/include/agl_imx8mqevk-viv.inc diff --git a/meta-agl/templates/machine/imx8mqevk-viv/50_setup.sh b/meta-agl/templates/machine/imx8mqevk-viv/50_setup.sh new file mode 100644 index 00000000..eefd1eb7 --- /dev/null +++ b/meta-agl/templates/machine/imx8mqevk-viv/50_setup.sh @@ -0,0 +1,2 @@ +find_and_ack_eula $METADIR/bsp/meta-freescale EULA +export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/meta-agl/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md b/meta-agl/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md new file mode 100644 index 00000000..be30e00f --- /dev/null +++ b/meta-agl/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md @@ -0,0 +1,9 @@ +--- +description: i.MX8MQ EVK with Vivante GPU driver +authors: Scott Murray <scott.murray@konsulko.com> +--- + +### Machine imx8mqevk-viv + +i.MX8MQ EVK and EVKB boards with Vivante GPU driver support. + diff --git a/meta-agl/templates/machine/imx8mqevk/40_bblayers.conf.inc b/meta-agl/templates/machine/imx8mqevk/40_bblayers.conf.inc new file mode 100644 index 00000000..edcb6a3a --- /dev/null +++ b/meta-agl/templates/machine/imx8mqevk/40_bblayers.conf.inc @@ -0,0 +1,5 @@ +# This must be parsed after qt5, etc. layers so that they are correctly +# recognized by meta-freescale/dynamic-layers +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-freescale \ + " diff --git a/meta-agl/templates/machine/imx8mqevk/50_local.conf.inc b/meta-agl/templates/machine/imx8mqevk/50_local.conf.inc new file mode 100644 index 00000000..5f9b9594 --- /dev/null +++ b/meta-agl/templates/machine/imx8mqevk/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "imx8mqevk" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc +require conf/include/agl_imx8mqevk.inc diff --git a/meta-agl/templates/machine/imx8mqevk/50_setup.sh b/meta-agl/templates/machine/imx8mqevk/50_setup.sh new file mode 100644 index 00000000..eefd1eb7 --- /dev/null +++ b/meta-agl/templates/machine/imx8mqevk/50_setup.sh @@ -0,0 +1,2 @@ +find_and_ack_eula $METADIR/bsp/meta-freescale EULA +export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/meta-agl/templates/machine/imx8mqevk/README_machine_imx8mqevk.md b/meta-agl/templates/machine/imx8mqevk/README_machine_imx8mqevk.md new file mode 100644 index 00000000..5d2bcbd3 --- /dev/null +++ b/meta-agl/templates/machine/imx8mqevk/README_machine_imx8mqevk.md @@ -0,0 +1,13 @@ +--- +description: i.MX8MQ EVK with etnaviv GPU driver +authors: Scott Murray <scott.murray@konsulko.com> +--- + +### Machine imx8mqevk + +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 +driver may be a better choice for those not interested in etnaviv +debugging and development. + diff --git a/meta-agl/templates/machine/intel-corei7-64 b/meta-agl/templates/machine/intel-corei7-64 new file mode 120000 index 00000000..9d468439 --- /dev/null +++ b/meta-agl/templates/machine/intel-corei7-64 @@ -0,0 +1 @@ +qemux86-64
\ No newline at end of file diff --git a/meta-agl/templates/machine/intel-corei7-64/50_bblayers.conf.inc b/meta-agl/templates/machine/intel-corei7-64/50_bblayers.conf.inc deleted file mode 100644 index 8fd7af53..00000000 --- a/meta-agl/templates/machine/intel-corei7-64/50_bblayers.conf.inc +++ /dev/null @@ -1 +0,0 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-intel" diff --git a/meta-agl/templates/machine/intel-corei7-64/50_local.conf.inc b/meta-agl/templates/machine/intel-corei7-64/50_local.conf.inc deleted file mode 100644 index 48d26c56..00000000 --- a/meta-agl/templates/machine/intel-corei7-64/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "intel-corei7-64" -#see meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc -require conf/include/agl_intel-corei7-64.inc diff --git a/meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md b/meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md deleted file mode 100644 index 5cab9e8f..00000000 --- a/meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine intel-corei7-64 -authors: Dominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net>, Jan-Simon Moeller <jsmoeller@linuxfoundation.org>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh> ---- - -### Machine intel-corei7-64 - -*Description is missing - please complete file meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md* - diff --git a/meta-agl/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/meta-agl/templates/machine/m3-salvator-x/50_bblayers.conf.inc new file mode 100644 index 00000000..16397c2e --- /dev/null +++ b/meta-agl/templates/machine/m3-salvator-x/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + " diff --git a/meta-agl/templates/machine/m3-salvator-x/50_local.conf.inc b/meta-agl/templates/machine/m3-salvator-x/50_local.conf.inc new file mode 100644 index 00000000..82766fd5 --- /dev/null +++ b/meta-agl/templates/machine/m3-salvator-x/50_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "salvator-x" +#see meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc +require conf/include/agl_m3-salvator-x.inc + diff --git a/meta-agl/templates/machine/m3-salvator-x/50_setup.sh b/meta-agl/templates/machine/m3-salvator-x/50_setup.sh new file mode 100644 index 00000000..abd2a33a --- /dev/null +++ b/meta-agl/templates/machine/m3-salvator-x/50_setup.sh @@ -0,0 +1,10 @@ +# setup proprietary gfx drivers and multimedia packages +pushd $METADIR 2>/dev/null + +SETUP_MM_SCRIPT=$METADIR/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh +if [ -f $SETUP_MM_SCRIPT ]; then + . $SETUP_MM_SCRIPT + copy_mm_packages +fi + +popd 2>/dev/null diff --git a/meta-agl/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md b/meta-agl/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md new file mode 100644 index 00000000..99c9dffb --- /dev/null +++ b/meta-agl/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md @@ -0,0 +1,11 @@ +--- +description: Machine m3-salvator-x +authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh> Duy Dang <duy.dang.yw@renesas.com> +--- + +### Machine m3-salvator-x + +salvator-x board with an m3 SoC. + +* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html) +* [elinux H3 Salvator-X](https://elinux.org/R-Car/Boards/Salvator-X) diff --git a/meta-agl/templates/machine/m3ulcb-kf/50_bblayers.conf.inc b/meta-agl/templates/machine/m3ulcb-kf/50_bblayers.conf.inc new file mode 100644 index 00000000..61d472ab --- /dev/null +++ b/meta-agl/templates/machine/m3ulcb-kf/50_bblayers.conf.inc @@ -0,0 +1,4 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ + ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ + " diff --git a/meta-agl/templates/machine/m3ulcb-kf/50_local.conf.inc b/meta-agl/templates/machine/m3ulcb-kf/50_local.conf.inc new file mode 100644 index 00000000..e2fe41a8 --- /dev/null +++ b/meta-agl/templates/machine/m3ulcb-kf/50_local.conf.inc @@ -0,0 +1,6 @@ +MACHINE = "m3ulcb" +#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc +require conf/include/agl_m3ulcb.inc + +#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc +require conf/include/rcar-gen3-adas.inc diff --git a/meta-agl/templates/machine/m3ulcb-kf/50_setup.sh b/meta-agl/templates/machine/m3ulcb-kf/50_setup.sh new file mode 100644 index 00000000..abd2a33a --- /dev/null +++ b/meta-agl/templates/machine/m3ulcb-kf/50_setup.sh @@ -0,0 +1,10 @@ +# setup proprietary gfx drivers and multimedia packages +pushd $METADIR 2>/dev/null + +SETUP_MM_SCRIPT=$METADIR/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh +if [ -f $SETUP_MM_SCRIPT ]; then + . $SETUP_MM_SCRIPT + copy_mm_packages +fi + +popd 2>/dev/null diff --git a/meta-agl/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md b/meta-agl/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md new file mode 100644 index 00000000..075c203f --- /dev/null +++ b/meta-agl/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md @@ -0,0 +1,12 @@ +--- +description: Machine m3ulcb +authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh> +--- + +### Machine m3ulcb + +Renesas RCar Gen3 "m3ulcb" board with Kingfisher baseboard. + +* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html) +* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK) +* [R-Car/Boards/Kingfisher](https://elinux.org/R-Car/Boards/Kingfisher) diff --git a/meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc index 5f410f0f..16397c2e 100644 --- a/meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc @@ -1,4 +1,3 @@ BBLAYERS =+ "\ - ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ " diff --git a/meta-agl/templates/machine/m3ulcb-nogfx/50_local.conf.inc b/meta-agl/templates/machine/m3ulcb-nogfx/50_local.conf.inc index 3fd5d6ee..521dedb4 100644 --- a/meta-agl/templates/machine/m3ulcb-nogfx/50_local.conf.inc +++ b/meta-agl/templates/machine/m3ulcb-nogfx/50_local.conf.inc @@ -1,6 +1,3 @@ MACHINE = "m3ulcb" #see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc require conf/include/agl_m3ulcb-nogfx.inc - -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc diff --git a/meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md b/meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md index 1e5140c2..5c87986d 100644 --- a/meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md +++ b/meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md @@ -2,8 +2,10 @@ description: Machine m3ulcb-nogfx authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilman@baylibre.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh> --- - + ### Machine m3ulcb-nogfx - -*Description is missing - please complete file meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md* +This is a "m3ulcb" machine without proprietary graphics driver support. + +* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html) +* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK) diff --git a/meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc b/meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc index 5f410f0f..16397c2e 100644 --- a/meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc +++ b/meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc @@ -1,4 +1,3 @@ BBLAYERS =+ "\ - ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ + ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \ " diff --git a/meta-agl/templates/machine/m3ulcb/50_local.conf.inc b/meta-agl/templates/machine/m3ulcb/50_local.conf.inc index e2fe41a8..c75bc531 100644 --- a/meta-agl/templates/machine/m3ulcb/50_local.conf.inc +++ b/meta-agl/templates/machine/m3ulcb/50_local.conf.inc @@ -1,6 +1,3 @@ MACHINE = "m3ulcb" #see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc require conf/include/agl_m3ulcb.inc - -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc diff --git a/meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md b/meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md index 3b5e0f45..07034a6d 100644 --- a/meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md +++ b/meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md @@ -2,8 +2,10 @@ description: Machine m3ulcb authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh> --- - + ### Machine m3ulcb - -*Description is missing - please complete file meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md* +Renesas RCar Gen3 "m3ulcb" board. + +* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html) +* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK) diff --git a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc index 4c14d14b..e5556f27 100644 --- a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc +++ b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc @@ -1,8 +1,4 @@ -MACHINE = "raspberrypi4" -#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc -require conf/include/agl_raspberrypi3.inc +MACHINE = "raspberrypi4-64" -#use the "Image" format for 64-bit AGL image for Raspberry Pi 4 -KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPE_UBOOT = "Image" -KERNEL_IMAGETYPE_DIRECT = "Image" +#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +require conf/include/agl_raspberrypi4.inc |