From 73c48ad8a6ec86af4dc87bc2a2679d2ce4566706 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 22 Feb 2022 10:42:30 -0500 Subject: Update for kirkstone variable renames Apply updates from running the new convert-variable-renames script from upstream, plus a few manual tweaks to the sample BB_DISKMON_DIRS configuration in the sample local.conf files to match the changes made in upstream. There are a few things outside of BitBake variables that the script still complains about that will need to be addressed in follow up changes. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray Change-Id: I65e483043c1f2e48827e735cf8fdaec8d04e5fee --- meta-agl-bsp/conf/include/agl_bbe.inc | 2 +- meta-agl-bsp/conf/include/agl_beaglebone.inc | 2 +- meta-agl-bsp/conf/include/agl_raspberrypi4.inc | 2 +- meta-agl-bsp/conf/include/agl_rcar.inc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-agl-bsp') diff --git a/meta-agl-bsp/conf/include/agl_bbe.inc b/meta-agl-bsp/conf/include/agl_bbe.inc index 9f9eb5039..d8b24a1a1 100644 --- a/meta-agl-bsp/conf/include/agl_bbe.inc +++ b/meta-agl-bsp/conf/include/agl_bbe.inc @@ -14,7 +14,7 @@ IMAGE_INSTALL:append = " ${PACKAGES_GFX}" # Enable Gfx Pkgs MACHINE_FEATURES:append = " sgx" -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" +BB_MULTI_PROVIDER_ALLOWED += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" DEPENDS:remove = "virtual/libgl" diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc index 857a801f3..6a515d2e5 100644 --- a/meta-agl-bsp/conf/include/agl_beaglebone.inc +++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc @@ -9,7 +9,7 @@ IMAGE_INSTALL:append = " ${PACKAGES_GFX}" # Enable Gfx Pkgs MACHINE_FEATURES:append = " sgx" -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" +BB_MULTI_PROVIDER_ALLOWED += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" DEPENDS:remove = "virtual/libgl" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc index b497d72c8..3fdc68b2c 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc @@ -11,7 +11,7 @@ RPI_USE_U_BOOT = "1" ENABLE_UART ?= "1" # For libomxil -#LICENSE_FLAGS_WHITELIST = "commercial" +#LICENSE_FLAGS_ACCEPTED = "commercial" IMAGE_INSTALL:append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb " diff --git a/meta-agl-bsp/conf/include/agl_rcar.inc b/meta-agl-bsp/conf/include/agl_rcar.inc index 6dc40dcb5..7f181fcb9 100644 --- a/meta-agl-bsp/conf/include/agl_rcar.inc +++ b/meta-agl-bsp/conf/include/agl_rcar.inc @@ -5,7 +5,7 @@ MACHINE_FEATURES:append = " agl-egvirt" # Enable Gfx Pkgs MACHINE_FEATURES:append = " gsx" -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" +BB_MULTI_PROVIDER_ALLOWED += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" # for Wayland/Weston PREFERRED_PROVIDER_virtual/libgles1 = "" @@ -20,7 +20,7 @@ PREFERRED_RPROVIDER_libomxil = "omx-user-module" PREFERRED_PROVIDER_virtual/libomxil = "omx-user-module" # Add for gstreamer plugins ugly -LICENSE_FLAGS_WHITELIST = "commercial" +LICENSE_FLAGS_ACCEPTED = "commercial" MACHINE_FEATURES:append = " multimedia" -- cgit 1.2.3-korg