From fb1b19ea92d18ad3866b614b020c160ab2d204c3 Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Thu, 24 Oct 2019 09:15:11 +0700 Subject: rcar-gen3: conf: Update sample configurations This commit does the following changes: - Re-create sample configurations based on YP3.0 official release. - Update BBMASK variable for dropping meta-linaro. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda Change-Id: Ib806fdf694e709053a555c26b06a28b9f7825072 --- .../conf/ebisu/poky-gcc/bsp/local-wayland.conf | 32 ++++++++++++++++------ .../docs/sample/conf/ebisu/poky-gcc/bsp/local.conf | 32 ++++++++++++++++------ .../ebisu/poky-gcc/gfx-only/local-wayland.conf | 32 ++++++++++++++++------ .../conf/ebisu/poky-gcc/mmp/local-wayland.conf | 32 ++++++++++++++++------ .../conf/h3ulcb/poky-gcc/bsp/local-wayland.conf | 32 ++++++++++++++++------ .../sample/conf/h3ulcb/poky-gcc/bsp/local.conf | 32 ++++++++++++++++------ .../h3ulcb/poky-gcc/gfx-only/local-wayland.conf | 32 ++++++++++++++++------ .../conf/h3ulcb/poky-gcc/mmp/local-wayland.conf | 32 ++++++++++++++++------ .../conf/m3nulcb/poky-gcc/bsp/local-wayland.conf | 32 ++++++++++++++++------ .../sample/conf/m3nulcb/poky-gcc/bsp/local.conf | 32 ++++++++++++++++------ .../m3nulcb/poky-gcc/gfx-only/local-wayland.conf | 32 ++++++++++++++++------ .../conf/m3nulcb/poky-gcc/mmp/local-wayland.conf | 32 ++++++++++++++++------ .../conf/m3ulcb/poky-gcc/bsp/local-wayland.conf | 32 ++++++++++++++++------ .../sample/conf/m3ulcb/poky-gcc/bsp/local.conf | 32 ++++++++++++++++------ .../m3ulcb/poky-gcc/gfx-only/local-wayland.conf | 32 ++++++++++++++++------ .../conf/m3ulcb/poky-gcc/mmp/local-wayland.conf | 32 ++++++++++++++++------ .../conf/salvator-x/poky-gcc/bsp/local-ltp.conf | 32 ++++++++++++++++------ .../salvator-x/poky-gcc/bsp/local-wayland.conf | 32 ++++++++++++++++------ .../sample/conf/salvator-x/poky-gcc/bsp/local.conf | 32 ++++++++++++++++------ .../poky-gcc/gfx-only/local-wayland.conf | 32 ++++++++++++++++------ .../salvator-x/poky-gcc/mmp/local-wayland.conf | 32 ++++++++++++++++------ 21 files changed, 483 insertions(+), 189 deletions(-) diff --git a/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/bsp/local-wayland.conf index 303b9ad..791eaa1 100644 --- a/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/bsp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/bsp/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,15 +274,12 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # for Wayland/Weston weston-laucher DISTRO_FEATURES_NATIVESDK_append = " wayland" DISTRO_FEATURES_append = " pam" # Mask the wayland related to GFX -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/bsp/local.conf index e52f839..91743bc 100644 --- a/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/bsp/local.conf +++ b/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/bsp/local.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,11 +274,8 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Mask graphic Pkgs -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/gfx-only/local-wayland.conf index dc96eb3..ebd8648 100644 --- a/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/gfx-only/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,9 +274,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -274,7 +288,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/mmp/local-wayland.conf index dae6455..6c6cd3a 100644 --- a/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/ebisu/poky-gcc/mmp/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,9 +274,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -274,7 +288,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Enable Multimedia features MACHINE_FEATURES_append = " multimedia" diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local-wayland.conf index 73057cf..90b0003 100644 --- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,15 +274,12 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # for Wayland/Weston weston-laucher DISTRO_FEATURES_NATIVESDK_append = " wayland" DISTRO_FEATURES_append = " pam" # Mask the wayland related to GFX -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local.conf index 463b0dc..52571f3 100644 --- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local.conf +++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,11 +274,8 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Mask graphic Pkgs -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/gfx-only/local-wayland.conf index 2972826..0a34fbc 100644 --- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/gfx-only/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,9 +274,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -274,7 +288,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/mmp/local-wayland.conf index ae1bbf0..e335d2b 100644 --- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/mmp/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,9 +274,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -274,7 +288,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Enable Multimedia features MACHINE_FEATURES_append = " multimedia" diff --git a/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/bsp/local-wayland.conf index f298e8f..af1fd07 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/bsp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/bsp/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,15 +274,12 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # for Wayland/Weston weston-laucher DISTRO_FEATURES_NATIVESDK_append = " wayland" DISTRO_FEATURES_append = " pam" # Mask the wayland related to GFX -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/bsp/local.conf index c7b5ab2..c7ff67d 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/bsp/local.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/bsp/local.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,11 +274,8 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Mask graphic Pkgs -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/gfx-only/local-wayland.conf index 902577b..1714a69 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/gfx-only/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,9 +274,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -274,7 +288,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/mmp/local-wayland.conf index c99d021..f0ac326 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3nulcb/poky-gcc/mmp/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,9 +274,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -274,7 +288,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Enable Multimedia features MACHINE_FEATURES_append = " multimedia" diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local-wayland.conf index ef7c778..aa70809 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,15 +274,12 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # for Wayland/Weston weston-laucher DISTRO_FEATURES_NATIVESDK_append = " wayland" DISTRO_FEATURES_append = " pam" # Mask the wayland related to GFX -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local.conf index cf47eb0..d90119a 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,11 +274,8 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Mask graphic Pkgs -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/gfx-only/local-wayland.conf index 17e9f6b..2d8e9ef 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/gfx-only/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,9 +274,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -274,7 +288,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/mmp/local-wayland.conf index 102c4f4..1520678 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/mmp/local-wayland.conf @@ -237,14 +237,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -257,9 +274,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -274,7 +288,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Enable Multimedia features MACHINE_FEATURES_append = " multimedia" diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-ltp.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-ltp.conf index 6626a02..7ebefe7 100644 --- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-ltp.conf +++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-ltp.conf @@ -243,14 +243,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -263,11 +280,8 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Mask graphic Pkgs -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-wayland.conf index b5523ac..6327a90 100644 --- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-wayland.conf @@ -243,14 +243,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -263,15 +280,12 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # for Wayland/Weston weston-laucher DISTRO_FEATURES_NATIVESDK_append = " wayland" DISTRO_FEATURES_append = " pam" # Mask the wayland related to GFX -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local.conf index f4c747d..0d1eb41 100644 --- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local.conf +++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local.conf @@ -243,14 +243,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -263,11 +280,8 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Mask graphic Pkgs -BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/gfx-only/local-wayland.conf index 7ef3894..c1147a1 100644 --- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/gfx-only/local-wayland.conf @@ -243,14 +243,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -263,9 +280,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -280,7 +294,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/mmp/local-wayland.conf index 530ff16..222409f 100644 --- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/mmp/local-wayland.conf @@ -243,14 +243,31 @@ BB_DISKMON_DIRS ??= "\ # # 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 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. +# 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" -PACKAGECONFIG_append_pn-nativesdk-qemu = " 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+" + +# +# 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 ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # 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. @@ -263,9 +280,6 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # add the static lib to SDK toolchain SDKIMAGE_FEATURES_append = " staticdev-pkgs" -# Disable optee in meta-linaro layer -BBMASK = "meta-linaro/meta-optee/recipes-security/optee" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" @@ -280,7 +294,7 @@ PREFERRED_PROVIDER_virtual/libgl = "" PREFERRED_PROVIDER_virtual/mesa = "" PREFERRED_PROVIDER_virtual/libgbm = "libgbm" PREFERRED_PROVIDER_libgbm-dev = "libgbm" -BBMASK .= "|mesa-gl" +BBMASK = "mesa-gl" # Enable Multimedia features MACHINE_FEATURES_append = " multimedia" -- cgit 1.2.3-korg