diff options
Diffstat (limited to 'meta-agl/templates')
18 files changed, 98 insertions, 40 deletions
diff --git a/meta-agl/templates/base/conf-notes.txt b/meta-agl/templates/base/conf-notes.txt index 1279e297..02e04678 100644 --- a/meta-agl/templates/base/conf-notes.txt +++ b/meta-agl/templates/base/conf-notes.txt @@ -1,17 +1,26 @@ Common targets are: - meta-agl: (core system) - agl-image-minimal - agl-image-minimal-qa - - agl-image-ivi + - 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-image-weston - - meta-agl-demo: (demo with UI) agl-demo-platform (* default demo target) agl-demo-platform-qa agl-demo-platform-crosssdk - - agl-demo-platform-html5 + 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 759f4792..c0e72005 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-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
\ No newline at end of file +agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
\ No newline at end of file diff --git a/meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/included.dep b/meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/included.dep index b8184837..01ef6c81 100644 --- a/meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/included.dep +++ b/meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/included.dep @@ -1 +1 @@ -agl-devel agl-netboot agl-archiver agl-pipewire agl-buildstats agl-ptest +agl-demo agl-devel agl-netboot agl-archiver agl-pipewire agl-buildstats agl-ptest diff --git a/meta-agl/templates/feature/agl-compositor/50_local.conf.inc b/meta-agl/templates/feature/agl-compositor/50_local.conf.inc new file mode 100644 index 00000000..4bddfb6e --- /dev/null +++ b/meta-agl/templates/feature/agl-compositor/50_local.conf.inc @@ -0,0 +1,15 @@ +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 new file mode 100644 index 00000000..4b5211ee --- /dev/null +++ b/meta-agl/templates/feature/agl-compositor/README_feature_agl-compositor.md @@ -0,0 +1,13 @@ +--- +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-profile-graphical-html5/50_bblayers.conf.inc b/meta-agl/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc deleted file mode 100644 index 97b44a21..00000000 --- a/meta-agl/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/meta-agl/meta-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 deleted file mode 100644 index 48bf84b0..00000000 --- a/meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -description: Feature agl-profile-graphical-html5 -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org> ---- - -### Feature agl-profile-graphical-html5 - -*Description is missing - please complete file meta-agl/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md* - -#### Dependent features pulled by agl-profile-graphical-html5 - -The following features are pulled: - -* agl-profile-graphical - diff --git a/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep b/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep deleted file mode 100644 index 5b54430d..00000000 --- a/meta-agl/templates/feature/agl-profile-graphical-html5/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-profile-graphical
\ No newline at end of file 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 67c41d23..48655fdc 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,5 @@ BBLAYERS =+ " \ ${METADIR}/external/meta-updater \ - ${METADIR}/external/meta-updater-qemux86-64 \ ${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 509cf612..35ab3f9a 100644 --- a/meta-agl/templates/feature/agl-sota/50_local.conf.inc +++ b/meta-agl/templates/feature/agl-sota/50_local.conf.inc @@ -2,3 +2,9 @@ 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)}" diff --git a/meta-agl/templates/feature/agl-sota/50_setup.sh b/meta-agl/templates/feature/agl-sota/50_setup.sh new file mode 100644 index 00000000..f209b944 --- /dev/null +++ b/meta-agl/templates/feature/agl-sota/50_setup.sh @@ -0,0 +1,26 @@ + +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;; + "raspberrypi3" | "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/meta-agl/templates/feature/agl-virt-xen/50_local.conf.inc b/meta-agl/templates/feature/agl-virt-xen/50_local.conf.inc new file mode 100644 index 00000000..48f4b2b7 --- /dev/null +++ b/meta-agl/templates/feature/agl-virt-xen/50_local.conf.inc @@ -0,0 +1,3 @@ +# Set Xen flag + +AGL_XEN_WANTED = "1" diff --git a/meta-agl/templates/feature/agl-virt-xen/included.dep b/meta-agl/templates/feature/agl-virt-xen/included.dep new file mode 100644 index 00000000..e4acef2b --- /dev/null +++ b/meta-agl/templates/feature/agl-virt-xen/included.dep @@ -0,0 +1 @@ +agl-virt diff --git a/meta-agl/templates/feature/agl-virt/50_bblayers.conf.inc b/meta-agl/templates/feature/agl-virt/50_bblayers.conf.inc new file mode 100644 index 00000000..04d31a22 --- /dev/null +++ b/meta-agl/templates/feature/agl-virt/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ " \ + ${METADIR}/external/meta-virtualization \ + " diff --git a/meta-agl/templates/feature/agl-virt/50_local.conf.inc b/meta-agl/templates/feature/agl-virt/50_local.conf.inc new file mode 100644 index 00000000..c15b8316 --- /dev/null +++ b/meta-agl/templates/feature/agl-virt/50_local.conf.inc @@ -0,0 +1,3 @@ +# meta-virtualization needs the "virtualization in DISTRO_FEATURES + +DISTRO_FEATURES_append = " virtualization" diff --git a/meta-agl/templates/machine/ebisu/50_setup.sh b/meta-agl/templates/machine/ebisu/50_setup.sh index c8471ae0..502c2275 100644 --- a/meta-agl/templates/machine/ebisu/50_setup.sh +++ b/meta-agl/templates/machine/ebisu/50_setup.sh @@ -19,7 +19,10 @@ fi if [ -f $COPY_SCRIPT ]; then # Extract the ZIP into the tmp directory mkdir -p $EXTRACT_DIR - unzip -q -o $EBISU_BIN_PATH/*.zip -d $EXTRACT_DIR + for PROPRIETARY_BIN in `ls -1 $EBISU_BIN_PATH/*.zip` + do + unzip -q -o $PROPRIETARY_BIN -d $EXTRACT_DIR + done cd $METADIR/bsp/meta-renesas-rcar-gen3/ $COPY_SCRIPT $EXTRACT_DIR diff --git a/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc b/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc index dcaf5e9d..e4763717 100644 --- a/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc +++ b/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc @@ -1,7 +1,3 @@ MACHINE = "raspberrypi3" #see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc require conf/include/agl_raspberrypi3.inc - -# Set appropriate version of Mesa for Raspberry Pi 3 and -# ignore the newer version with has been added for Raspberry Pi 4 -PREFERRED_VERSION_mesa_raspberrypi3 = "18.1%" diff --git a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc index 27a8bf2a..4c14d14b 100644 --- a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc +++ b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc @@ -2,7 +2,7 @@ MACHINE = "raspberrypi4" #see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc require conf/include/agl_raspberrypi3.inc -PREFERRED_VERSION_linux-raspberrypi_raspberrypi4 = "4.19%" - -# Set appropriate version of Mesa for Raspberry Pi 4 -PREFERRED_VERSION_mesa_raspberrypi4 = "19.1%" +#use the "Image" format for 64-bit AGL image for Raspberry Pi 4 +KERNEL_IMAGETYPE = "Image" +KERNEL_IMAGETYPE_UBOOT = "Image" +KERNEL_IMAGETYPE_DIRECT = "Image" |