X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=meta-agl-core%2Fconf%2Fdistro%2Fpoky-agl.conf;h=f72553af23187d67d4fb41389c527f9e4580f406;hb=refs%2Fheads%2Fkoi;hp=63a1960af6a3237f59b4c6e1f168351132d07897;hpb=1c3c06842ac1b9c089d0a08e91c60f44e4844fac;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 63a1960af..f72553af2 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -7,8 +7,8 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 # Release flags
 DISTRO_CODENAME = "koi"
-AGL_BRANCH = "master"
-AGLVERSION = "10.90.0"
+AGL_BRANCH = "koi"
+AGLVERSION = "11.0.5"
 # switch  devel/release
 AGLRELEASETYPE ?= "agldevelopment"
 #AGLRELEASETYPE ?= "aglrelease"
@@ -40,10 +40,10 @@ INHERIT += "reproducible_build"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
-# SDKPATH is the folder where the SDK is going to be installed
+# SDKPATHINSTALL is the folder where the SDK is going to be installed
 # Due to an issue with the qt5 environment (see SPEC-1667),
 # we add DEFAULTTUNE to the SDKPATH to mitigate the issue.
-SDKPATH = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}"
+SDKPATHINSTALL = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}"
 
 
 MAINTAINER = "AGL https://lists.automotivelinux.org/g/agl-dev-community"
@@ -159,8 +159,8 @@ AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 
 # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)
 #
-IMAGE_FSTYPES := "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
-INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
+IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
+INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
 #
 # THE FUTURE is 'wic'
 # IMAGE_FSTYPES_append = " wic"
@@ -203,6 +203,4 @@ BBMASK += "meta-security/recipes-kernel/linux/linux-%_5.%.bbappend"
 # do_image_tar and do_image_ext4 can run in parallel
 # This needs to be fixed upstream:
 # See https://bugzilla.yoctoproject.org/show_bug.cgi?id=13994
-# For convenience restricted to ext4 and tar image types.
-AGL_FORBID_FSTAB_UPDATE ?= "${@bb.utils.contains_any('IMAGE_FSTYPES', 'ext4 ext4.xz tar tar.gz tar.bz2 tar.xz', '--no-fstab-update', '', d)}"
-WIC_CREATE_EXTRA_ARGS_append = " ${AGL_FORBID_FSTAB_UPDATE}"
+INHERIT += "image_types_wic_workaround"