From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Mon, 2 Nov 2020 11:07:33 +0900 Subject: basesystem-jj recipes --- .../50_bblayers.conf.inc | 5 ----- .../50_local.conf.inc | 6 ----- ...DME_feature_agl-audio-soundmanager-framework.md | 9 -------- .../feature/agl-gstrecorder/50_bblayers.conf.inc | 5 ----- .../feature/agl-gstrecorder/50_local.conf.inc | 3 --- .../feature/agl-gstrecorder/50_setupwarning.sh | 14 ------------ .../README_feature_agl-gstrecorder.md | 9 -------- .../feature/agl-jailhouse/50_bblayers.conf.inc | 7 ++++++ .../feature/agl-jailhouse/50_local.conf.inc | 26 ++++++++++++++++++++++ .../agl-oem-extra-libs/50_bblayers.conf.inc | 5 ----- .../README_feature_agl-oem-extra-libs.md | 9 -------- .../feature/agl-pipewire/50_bblayers.conf.inc | 5 ----- .../feature/agl-pipewire/50_local.conf.inc | 2 -- .../agl-pipewire/README_feature_agl-pipewire.md | 9 -------- .../50_bblayers.conf.inc | 5 ----- .../agl-profile-graphical-html5/50_local.conf.inc | 3 --- .../README_feature_agl-profile-graphical-html5.md | 8 ------- .../agl-profile-graphical-html5/included.dep | 1 - .../agl-voiceagent-alexa/50_bblayers.conf.inc | 4 ++++ 19 files changed, 37 insertions(+), 98 deletions(-) delete mode 100644 meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/50_bblayers.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/README_feature_agl-audio-soundmanager-framework.md delete mode 100644 meta-agl-devel/templates/feature/agl-gstrecorder/50_bblayers.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-gstrecorder/50_local.conf.inc delete mode 100755 meta-agl-devel/templates/feature/agl-gstrecorder/50_setupwarning.sh delete mode 100644 meta-agl-devel/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md create mode 100644 meta-agl-devel/templates/feature/agl-jailhouse/50_bblayers.conf.inc create mode 100644 meta-agl-devel/templates/feature/agl-jailhouse/50_local.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-oem-extra-libs/50_bblayers.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-oem-extra-libs/README_feature_agl-oem-extra-libs.md delete mode 100644 meta-agl-devel/templates/feature/agl-pipewire/50_bblayers.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-pipewire/50_local.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-pipewire/README_feature_agl-pipewire.md delete mode 100644 meta-agl-devel/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-profile-graphical-html5/50_local.conf.inc delete mode 100644 meta-agl-devel/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md delete mode 100644 meta-agl-devel/templates/feature/agl-profile-graphical-html5/included.dep (limited to 'meta-agl-devel/templates') diff --git a/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/50_bblayers.conf.inc b/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/50_bblayers.conf.inc deleted file mode 100644 index 2ab00c61..00000000 --- a/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/50_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ - -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-audio-soundmanager-framework \ - " - diff --git a/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc b/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc deleted file mode 100644 index 70852b7d..00000000 --- a/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -DISTRO_FEATURES_append = " agl-audio-soundmanager-framework pulseaudio" -IMAGE_INSTALL_append += "agl-service-audio-soundmanager pulseaudio-config-soundmanager audiomanager-plugins-config-soundmanager" - -PREFERRED_PROVIDER_virtual/audio-framework = "agl-service-audio-soundmanager" -PREFERRED_RPROVIDER_virtual/pulseaudio-config = "pulseaudio-config-soundmanager" -PREFERRED_RPROVIDER_virtual/audiomanager-plugins-config = "audiomanager-plugins-config-soundmanager" diff --git a/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/README_feature_agl-audio-soundmanager-framework.md b/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/README_feature_agl-audio-soundmanager-framework.md deleted file mode 100644 index 919c2a0a..00000000 --- a/meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/README_feature_agl-audio-soundmanager-framework.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-audio-soundmanager-framework -authors: Jan-Simon Möller , Kazumasa Mitsunari , Ronan Le Martret , Stephane Desneux ---- - -### Feature agl-audio-soundmanager-framework - -*Description is missing - please complete file meta-agl-devel/templates/feature/agl-audio-soundmanager-framework/README_feature_agl-audio-soundmanager-framework.md* - diff --git a/meta-agl-devel/templates/feature/agl-gstrecorder/50_bblayers.conf.inc b/meta-agl-devel/templates/feature/agl-gstrecorder/50_bblayers.conf.inc deleted file mode 100644 index 72160da4..00000000 --- a/meta-agl-devel/templates/feature/agl-gstrecorder/50_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ - -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-gstrecorder-rcar-gen3 \ - " - diff --git a/meta-agl-devel/templates/feature/agl-gstrecorder/50_local.conf.inc b/meta-agl-devel/templates/feature/agl-gstrecorder/50_local.conf.inc deleted file mode 100644 index 54fedd6c..00000000 --- a/meta-agl-devel/templates/feature/agl-gstrecorder/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -#see meta-agl-devel/meta-gstrecorder-rcar-gen3/conf/include/agl_gstrecorder.inc -require conf/include/agl_gstrecorder.inc - diff --git a/meta-agl-devel/templates/feature/agl-gstrecorder/50_setupwarning.sh b/meta-agl-devel/templates/feature/agl-gstrecorder/50_setupwarning.sh deleted file mode 100755 index ae6b1312..00000000 --- a/meta-agl-devel/templates/feature/agl-gstrecorder/50_setupwarning.sh +++ /dev/null @@ -1,14 +0,0 @@ -#Note to the user! - -echo "##################################" -echo "# ATTENTION: the network between #" -echo "# sender and receiver of the #" -echo "# gstrecorder feed needs to be #" -echo "# configured or #" -echo "# WESTON WILL FAIL TO START ! #" -echo "# #" -echo "# (hint: 192.168.20.x) #" -echo "##################################" - -sleep 2 - diff --git a/meta-agl-devel/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md b/meta-agl-devel/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md deleted file mode 100644 index 39617bb9..00000000 --- a/meta-agl-devel/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-gstrecorder -authors: Harunobu Kurokawa , Jan-Simon Möller , Scott Murray , Stephane Desneux ---- - -### Feature agl-gstrecorder - -*Description is missing - please complete file meta-agl-devel/templates/feature/agl-gstrecorder/README_feature_agl-gstrecorder.md* - diff --git a/meta-agl-devel/templates/feature/agl-jailhouse/50_bblayers.conf.inc b/meta-agl-devel/templates/feature/agl-jailhouse/50_bblayers.conf.inc new file mode 100644 index 00000000..d3ed39d5 --- /dev/null +++ b/meta-agl-devel/templates/feature/agl-jailhouse/50_bblayers.conf.inc @@ -0,0 +1,7 @@ +BBLAYERS =+ " \ + ${METADIR}/meta-agl-devel/meta-agl-jailhouse \ + ${METADIR}/bsp/meta-arm/meta-arm \ +" + +# Up-to-date meta-arm depends on meta-arm-toolchain +#BBLAYERS =+ "${METADIR}/bsp/meta-arm/meta-arm-toolchain" diff --git a/meta-agl-devel/templates/feature/agl-jailhouse/50_local.conf.inc b/meta-agl-devel/templates/feature/agl-jailhouse/50_local.conf.inc new file mode 100644 index 00000000..565f9618 --- /dev/null +++ b/meta-agl-devel/templates/feature/agl-jailhouse/50_local.conf.inc @@ -0,0 +1,26 @@ +#### JAILHOUSE +IMAGE_INSTALL_append = " jailhouse jailhouse-demos" +PREFERRED_VERSION_linux-raspberrypi = "5.4%" + +RPI_KERNEL_DEVICETREE_OVERLAYS_append = " overlays/jailhouse-memory.dtbo" + +#Qemu Boot Config +# qemu flags for jailhouse +QB_OPT_APPEND_append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex" +QB_MEM = "-m 1G" + +# use override with higher priority than x86-64 +QB_MACHINE_qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4" +QB_CPU_qemux86-64 = "-enable-kvm" +QB_CPU_KVM_qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor" + +QB_KERNEL_CMDLINE_APPEND_append = " intel_iommu=off memmap=82M\$0x22000000" + +QB_KERNEL_ROOT = "/dev/vda" +QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server,nowait" + + +# jailhouse needs ttyS1 in the agl-qemu.cell as debug console. +# restrict the SERIAL_CONSOLES to ttyS0 only +SERIAL_CONSOLES = "115200;ttyS0" +KERNEL_CONSOLE = "ttyS0" \ No newline at end of file diff --git a/meta-agl-devel/templates/feature/agl-oem-extra-libs/50_bblayers.conf.inc b/meta-agl-devel/templates/feature/agl-oem-extra-libs/50_bblayers.conf.inc deleted file mode 100644 index 2443ecd1..00000000 --- a/meta-agl-devel/templates/feature/agl-oem-extra-libs/50_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-oem-extra-libs \ - ${METADIR}/external/meta-openembedded/meta-filesystems \ - " - diff --git a/meta-agl-devel/templates/feature/agl-oem-extra-libs/README_feature_agl-oem-extra-libs.md b/meta-agl-devel/templates/feature/agl-oem-extra-libs/README_feature_agl-oem-extra-libs.md deleted file mode 100644 index 8ff5850c..00000000 --- a/meta-agl-devel/templates/feature/agl-oem-extra-libs/README_feature_agl-oem-extra-libs.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-oem-extra-libs -authors: Jan-Simon Möller , Stephane Desneux , tte_zheng_wenlong ---- - -### Feature agl-oem-extra-libs - -*Description is missing - please complete file meta-agl-devel/templates/feature/agl-oem-extra-libs/README_feature_agl-oem-extra-libs.md* - diff --git a/meta-agl-devel/templates/feature/agl-pipewire/50_bblayers.conf.inc b/meta-agl-devel/templates/feature/agl-pipewire/50_bblayers.conf.inc deleted file mode 100644 index 8a6baaa2..00000000 --- a/meta-agl-devel/templates/feature/agl-pipewire/50_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ - -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-pipewire \ - " - diff --git a/meta-agl-devel/templates/feature/agl-pipewire/50_local.conf.inc b/meta-agl-devel/templates/feature/agl-pipewire/50_local.conf.inc deleted file mode 100644 index 33838b08..00000000 --- a/meta-agl-devel/templates/feature/agl-pipewire/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl-devel/meta-pipewire/conf/include/agl-pipewire.inc -require conf/include/agl-pipewire.inc diff --git a/meta-agl-devel/templates/feature/agl-pipewire/README_feature_agl-pipewire.md b/meta-agl-devel/templates/feature/agl-pipewire/README_feature_agl-pipewire.md deleted file mode 100644 index 55e1931c..00000000 --- a/meta-agl-devel/templates/feature/agl-pipewire/README_feature_agl-pipewire.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-pipewire -authors: George Kiagiadakis ---- - -### 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-devel/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc b/meta-agl-devel/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc deleted file mode 100644 index a7e9da1d..00000000 --- a/meta-agl-devel/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ - -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-agl-profile-graphical-html5 \ - " - diff --git a/meta-agl-devel/templates/feature/agl-profile-graphical-html5/50_local.conf.inc b/meta-agl-devel/templates/feature/agl-profile-graphical-html5/50_local.conf.inc deleted file mode 100644 index 0b2d7002..00000000 --- a/meta-agl-devel/templates/feature/agl-profile-graphical-html5/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ - -IMAGE_INSTALL_append = " packagegroup-agl-profile-graphical-html5" - diff --git a/meta-agl-devel/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md b/meta-agl-devel/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md deleted file mode 100644 index dc00f94c..00000000 --- a/meta-agl-devel/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -description: Feature agl-profile-graphical-html5 -authors: Jacobo Aragunde Pérez ---- - -### 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-devel/templates/feature/agl-profile-graphical-html5/included.dep b/meta-agl-devel/templates/feature/agl-profile-graphical-html5/included.dep deleted file mode 100644 index 032609b8..00000000 --- a/meta-agl-devel/templates/feature/agl-profile-graphical-html5/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-profile-graphical diff --git a/meta-agl-devel/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc b/meta-agl-devel/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc index 2397a1d7..dc6c1f6e 100644 --- a/meta-agl-devel/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc +++ b/meta-agl-devel/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc @@ -8,3 +8,7 @@ BBFILES += "${METADIR}/external/alexa-auto-sdk/modules/*/*.bb" # Include the recipe for the required gstreamer module as well BBFILES += "${METADIR}/external/alexa-auto-sdk/extensions/experimental/gstreamer/modules/*/*.bb" + +# For now, tweak the layer's compatibility to allow using with zeus, +# since we know it works without major issues. +LAYERSERIES_COMPAT_aac_append = " dunfell" \ No newline at end of file -- cgit 1.2.3-korg