Switch meta-virt to the scarthgap branch

meta-lmp-base/conf/distro/include/lmp.inc

@@ -40,7 +40,6 @@ PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib"
 PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
 PREFERRED_PROVIDER_qemu-helper-native ?= "qemu-helper-native"
 PREFERRED_PROVIDER_nativesdk-qemu ?= "nativesdk-qemu"
-PREFERRED_PROVIDER_virtual/docker = "docker-ce"
 
 PREFERRED_VERSION_gcc-arm-none-eabi ?= "11"
 PREFERRED_VERSION_gcc-arm-none-eabi-native ?= "11"

meta-lmp-base/conf/layer.conf

@@ -51,3 +51,15 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 ## Adjust priority for tpm-layer (too high by default)
 BBFILE_PRIORITY_tpm-layer:remove = "10"
 BBFILE_PRIORITY_tpm-layer:append = " 6"
+
+# To use the meta-virt scarthgap branch we need to add kirkstone compatability
+LAYERSERIES_COMPAT_virtualization-layer:append = " kirkstone"
+
+# To use the meta-virt scarthgap branch we need to mask some bbappend
+BBMASK:append = " \
+    /meta-virtualization/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.6.bbappend \
+    /meta-virtualization/dynamic-layers/xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend \
+"
+
+# To use the meta-virt scarthgap branch we need to replace the docker-ce by docker-moby
+BBMASK:append = "/meta-tegra/external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend"

meta-lmp-base/recipes-containers/docker-compose/docker-compose/cli-config-support-default-system-config.patch

@@ -13,18 +13,18 @@ Signed-off-by: Jose Quaresma <[email protected]>
  1 file changed, 10 insertions(+)
 
 diff --git a/cli/config/config.go b/cli/config/config.go
-index b7c05c3f86..1f56eb11ba 100644
+index 952f6e71f4..2aef68aff8 100644
 --- a/cli/config/config.go
 +++ b/cli/config/config.go
-@@ -21,6 +21,7 @@ const (
+@@ -28,6 +28,7 @@ const (
+ 	ConfigFileName = "config.json"
  	configFileDir  = ".docker"
- 	oldConfigfile  = ".dockercfg" // Deprecated: remove once we stop printing deprecation warning
  	contextsDir    = "contexts"
 +	defaultSystemConfig = "/usr/lib/docker/config.json"
  )
 
  var (
-@@ -114,6 +115,15 @@ func load(configDir string) (*configfile.ConfigFile, bool, error) {
+@@ -97,6 +98,15 @@ func load(configDir string) (*configfile.ConfigFile, error) {
  	filename := filepath.Join(configDir, ConfigFileName)
  	configFile := configfile.New(filename)
 
@@ -37,9 +37,9 @@ index b7c05c3f86..1f56eb11ba 100644
 +		}
 +	}
 +
- 	// Try happy path first - latest config file
- 	if file, err := os.Open(filename); err == nil {
- 		defer file.Close()
+ 	file, err := os.Open(filename)
+ 	if err != nil {
+ 		if os.IsNotExist(err) {
 -- 
-2.34.1
+2.25.1
 

meta-lmp-base/recipes-containers/docker-compose/docker-compose_%.bbappend

@@ -1,3 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += "file://cli-config-support-default-system-config.patch;patchdir=src/github.com/docker/cli"
+SRC_URI += "file://cli-config-support-default-system-config.patch;patchdir=src/import/vendor.fetch/github.com/docker/cli"