diff options
| -rw-r--r-- | common/conf/machine/include/amd-features.inc | 12 | ||||
| -rw-r--r-- | meta-amdfalconx86/conf/machine/amdfalconx86.conf | 4 | ||||
| -rw-r--r-- | meta-v1000/conf/machine/v1000.conf | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/common/conf/machine/include/amd-features.inc b/common/conf/machine/include/amd-features.inc index 8ca21083..6500b2bd 100644 --- a/common/conf/machine/include/amd-features.inc +++ b/common/conf/machine/include/amd-features.inc @@ -34,7 +34,7 @@ # Add common feartures to be supported for all machines here EXTRA_IMAGE_FEATURES += "amd-common-pkgs amd-feature-multimedia" -GST_PACKAGES = " \ +GSTREAMER_PKGS = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11',' \ gstreamer1.0-meta-x11-base \ gstreamer1.0-meta-audio \ @@ -43,8 +43,8 @@ GST_PACKAGES = " \ gstreamer1.0-omx \ gstreamer1.0-vaapi', '', d)} \ " -VULKAN_COMPONENTS ?= "" -CODEXL_COMPONENTS ?= "" +VULKAN_PKGS ?= "" +CODEXL_PKGS ?= "" # Additional packages can be added to the following feature specific # variables from each machine's config file @@ -58,12 +58,12 @@ FEATURE_PACKAGES_amd-common-pkgs = "\ " FEATURE_PACKAGES_amd-feature-multimedia = "\ - ${@bb.utils.contains("DISTRO", "mel", "${GST_PACKAGES}", "", d)} \ + ${@bb.utils.contains("DISTRO", "mel", "${GSTREAMER_PKGS}", "", d)} \ ${AMD_FEATURE_MULTIMEDIA_PKGS} \ " FEATURE_PACKAGES_amd-feature-graphics = "\ - ${@bb.utils.contains("INCLUDE_VULKAN", "yes", "${VULKAN_COMPONENTS}", "", d)} \ + ${@bb.utils.contains("INCLUDE_VULKAN", "yes", "${VULKAN_PKGS}", "", d)} \ ${AMD_FEATURE_GRAPHICS_PKGS} \ " FEATURE_PACKAGES_amd-feature-graphics_append_amdgpu = " mesa-demos" @@ -75,6 +75,6 @@ FEATURE_PACKAGES_amd-feature-networking = "\ " FEATURE_PACKAGES_amd-feature-debug-profile = "\ - ${@bb.utils.contains("INCLUDE_CODEXL", "yes", "${CODEXL_COMPONENTS}", "", d)} \ + ${@bb.utils.contains("INCLUDE_CODEXL", "yes", "${CODEXL_PKGS}", "", d)} \ ${AMD_FEATURE_DEBUG_PROFILE_PKGS} \ " diff --git a/meta-amdfalconx86/conf/machine/amdfalconx86.conf b/meta-amdfalconx86/conf/machine/amdfalconx86.conf index c69f9936..ce28890a 100644 --- a/meta-amdfalconx86/conf/machine/amdfalconx86.conf +++ b/meta-amdfalconx86/conf/machine/amdfalconx86.conf @@ -10,8 +10,8 @@ require conf/machine/include/tune-amdfalconx86.inc # Add machine specific AMD features and feature pkgs here EXTRA_IMAGE_FEATURES += "amd-feature-graphics amd-feature-debug-profile" -VULKAN_COMPONENTS_amdfalconx86 = "glslang spirv-tools vulkan-loader-layers vulkan-tools vulkan-samples" -CODEXL_COMPONENTS_amdfalconx86 = "codexl codexl-examples" +VULKAN_PKGS_amdfalconx86 = "glslang spirv-tools vulkan-loader-layers vulkan-tools vulkan-samples" +CODEXL_PKGS_amdfalconx86 = "codexl codexl-examples" include conf/machine/include/amd-common-configurations.inc include conf/machine/include/amd-customer-configurations.inc diff --git a/meta-v1000/conf/machine/v1000.conf b/meta-v1000/conf/machine/v1000.conf index 1141ec78..e5c24dff 100644 --- a/meta-v1000/conf/machine/v1000.conf +++ b/meta-v1000/conf/machine/v1000.conf @@ -11,7 +11,7 @@ require conf/machine/include/tune-v1000.inc # Add machine specific AMD features and feature pkgs here EXTRA_IMAGE_FEATURES += "amd-feature-graphics" -VULKAN_COMPONENTS_v1000 = "amdvlk glslang spirv-tools vulkan-loader-layers vulkan-tools vulkan-samples" +VULKAN_PKGS_v1000 = "amdvlk glslang spirv-tools vulkan-loader-layers vulkan-tools vulkan-samples" include conf/machine/include/amd-common-configurations.inc include conf/machine/include/amd-customer-configurations.inc |