From f23ca3e10ee67bf6e0dacc2e55b0347f52479aed Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 20 Nov 2022 18:09:04 -0500 Subject: Add Yocto Project scarthgap release compatibility Switch to scarthgap in LAYERSERIES_COMPAT in layer.conf files. Bug-AGL: SPEC-4578 Change-Id: I50e341efd6a317a830352d44db1cd756d3589861 Signed-off-by: Denys Dmytriyenko --- meta-agl-drm-lease/conf/layer.conf | 2 +- meta-agl-flutter/conf/layer.conf | 2 +- meta-agl-ic-container/conf/layer.conf | 2 +- meta-agl-jailhouse/conf/layer.conf | 2 +- meta-agl-test/conf/layer.conf | 2 +- meta-agl-wireless-monitor/conf/layer.conf | 2 +- meta-egvirt/conf/layer.conf | 2 +- meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf | 2 +- meta-offline-voice-agent/conf/layer.conf | 2 +- meta-uhmi/meta-rvgpu/conf/layer.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-agl-drm-lease/conf/layer.conf b/meta-agl-drm-lease/conf/layer.conf index 7614ba9f..7cb075ab 100644 --- a/meta-agl-drm-lease/conf/layer.conf +++ b/meta-agl-drm-lease/conf/layer.conf @@ -24,4 +24,4 @@ BBFILES_DYNAMIC += " \ LAYERVERSION_agl-drm-lease = "1" LAYERDEPENDS_agl-drm-lease = "core" -LAYERSERIES_COMPAT_agl-drm-lease = "kirkstone" +LAYERSERIES_COMPAT_agl-drm-lease = "scarthgap" diff --git a/meta-agl-flutter/conf/layer.conf b/meta-agl-flutter/conf/layer.conf index 725a25b2..e21f9bc6 100644 --- a/meta-agl-flutter/conf/layer.conf +++ b/meta-agl-flutter/conf/layer.conf @@ -12,7 +12,7 @@ BBFILE_PRIORITY_agl-flutter-layer = "61" LAYERVERSION_agl-flutter-layer = "1" LAYERDEPENDS_agl-flutter-layer = "core flutter-layer" LAYERRECOMMENDS_agl-flutter-layer = "flutter-apps-layer" -LAYERSERIES_COMPAT_agl-flutter-layer = "kirkstone" +LAYERSERIES_COMPAT_agl-flutter-layer = "scarthgap" BBFILES_DYNAMIC += " \ flutter-apps-layer:${LAYERDIR}/dynamic-layers/flutter-apps-layer/*/*/*/*.bbappend \ diff --git a/meta-agl-ic-container/conf/layer.conf b/meta-agl-ic-container/conf/layer.conf index ca1bf7a3..47000a76 100644 --- a/meta-agl-ic-container/conf/layer.conf +++ b/meta-agl-ic-container/conf/layer.conf @@ -18,5 +18,5 @@ BBFILES_DYNAMIC += " \ selinux:${LAYERDIR}/dynamic-layers/meta-selinux/*/*/*.bbappend \ " -LAYERSERIES_COMPAT_aglcontainermc = "kirkstone" +LAYERSERIES_COMPAT_aglcontainermc = "scarthgap" LAYERDEPENDS_aglcontainermc = "aglcore qt5-layer openembedded-layer virtualization-layer agl-drm-lease meta-pipewire" diff --git a/meta-agl-jailhouse/conf/layer.conf b/meta-agl-jailhouse/conf/layer.conf index 5dd68b2c..f561a86c 100644 --- a/meta-agl-jailhouse/conf/layer.conf +++ b/meta-agl-jailhouse/conf/layer.conf @@ -11,7 +11,7 @@ BBFILE_PRIORITY_agl-jailhouse = "61" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_agl-jailhouse = "1" -LAYERSERIES_COMPAT_agl-jailhouse = "kirkstone" +LAYERSERIES_COMPAT_agl-jailhouse = "scarthgap" # This is only needed for Raspberry Pi # TODO: can this be expressed dynamically? diff --git a/meta-agl-test/conf/layer.conf b/meta-agl-test/conf/layer.conf index f8dba7cb..a1c18205 100644 --- a/meta-agl-test/conf/layer.conf +++ b/meta-agl-test/conf/layer.conf @@ -11,4 +11,4 @@ BBFILE_PATTERN_agl-test = "^${LAYERDIR}/" # cause compatibility issues with other layers LAYERVERSION_agl-test = "1" -LAYERSERIES_COMPAT_agl-test = "kirkstone" +LAYERSERIES_COMPAT_agl-test = "scarthgap" diff --git a/meta-agl-wireless-monitor/conf/layer.conf b/meta-agl-wireless-monitor/conf/layer.conf index 9e4f91b8..e21fa987 100644 --- a/meta-agl-wireless-monitor/conf/layer.conf +++ b/meta-agl-wireless-monitor/conf/layer.conf @@ -12,4 +12,4 @@ BBFILE_PRIORITY_agl-drm-lease = "100" # cause compatibility issues with other layers LAYERVERSION_agl-wireless-monitor = "1" -LAYERSERIES_COMPAT_agl-wireless-monitor = "kirkstone" +LAYERSERIES_COMPAT_agl-wireless-monitor = "scarthgap" diff --git a/meta-egvirt/conf/layer.conf b/meta-egvirt/conf/layer.conf index a8dcafd8..1aea8992 100644 --- a/meta-egvirt/conf/layer.conf +++ b/meta-egvirt/conf/layer.conf @@ -11,6 +11,6 @@ BBFILE_PRIORITY_egvirt = "61" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_egvirt = "1" -LAYERSERIES_COMPAT_egvirt = "kirkstone" +LAYERSERIES_COMPAT_egvirt = "scarthgap" LAYERDEPENDS_egvirt = "core clang-layer filesystems-layer" diff --git a/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf b/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf index 10c86f64..e75e0fce 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf +++ b/meta-oem-production-readiness/meta-agl-basesystem/conf/layer.conf @@ -12,5 +12,5 @@ BBFILE_PRIORITY_agl-basesystem = "60" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_agl-basesystem = "1" -LAYERSERIES_COMPAT_agl-basesystem = "kirkstone" +LAYERSERIES_COMPAT_agl-basesystem = "scarthgap" LAYERDEPENDS_agl-basesystem = "core" diff --git a/meta-offline-voice-agent/conf/layer.conf b/meta-offline-voice-agent/conf/layer.conf index e5dca632..83ed05d4 100644 --- a/meta-offline-voice-agent/conf/layer.conf +++ b/meta-offline-voice-agent/conf/layer.conf @@ -10,7 +10,7 @@ BBFILE_PATTERN_meta-offline-voice-agent = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-offline-voice-agent = "65" LAYERDEPENDS_meta-offline-voice-agent = "core" -LAYERSERIES_COMPAT_meta-offline-voice-agent = "dunfell kirkstone" +LAYERSERIES_COMPAT_meta-offline-voice-agent = "scarthgap" BBFILES_DYNAMIC += " \ agldemo:${LAYERDIR}/dynamic-layers/meta-agl-demo/*/*/*.bb \ diff --git a/meta-uhmi/meta-rvgpu/conf/layer.conf b/meta-uhmi/meta-rvgpu/conf/layer.conf index b33aa324..5451560f 100644 --- a/meta-uhmi/meta-rvgpu/conf/layer.conf +++ b/meta-uhmi/meta-rvgpu/conf/layer.conf @@ -14,4 +14,4 @@ BBFILES_DYNAMIC += " \ raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bbappend \ " -LAYERSERIES_COMPAT_meta-rvgpu= "kirkstone" +LAYERSERIES_COMPAT_meta-rvgpu= "scarthgap" -- cgit 1.2.3-korg