X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=67e141ed01b0f273f3e7b4c6d77bf52e8c715eb8;hb=refs%2Fchanges%2F27%2F9927%2F2;hp=4b39be1b7b9bfd83ae210561a1df78d20500f7ff;hpb=310012e631074cd089c0284a4f7f0bee9e214c80;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 4b39be1b7..67e141ed0 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,9 +3,9 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "3.99.1+snapshot-${DATE}"
+DISTRO_VERSION = "3.99.2+snapshot-${DATE}"
 DISTRO_CODENAME = "dab"
-DISTRO_BRANCH_VERSION_TAG = "dab/3.99.1"
+DISTRO_BRANCH_VERSION_TAG = "dab/3.99.2"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
@@ -16,6 +16,7 @@ TARGET_VENDOR = "-agl"
 # Override these in poky based distros
 AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5"
 POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
+OVERRIDES .= ":${DISTRO_CODENAME}"
 
 QEMU_TARGETS ?= "arm aarch64 i386 x86_64"
 # Other QEMU_TARGETS "mips mips64 mips64el ppc sh4"
@@ -112,6 +113,16 @@ require conf/distro/include/${TARGET_ARCH}-tune.inc
 # - use 1G RAM by default
 QB_MEM ?= "-m 1024"
 
-# temporary fix for meta-updater (to be removed 2017-05-01)
-IMAGE_INSTALL_remove = "rvi-sota-client"
 
+# DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)
+#
+IMAGE_FSTYPES := "tar.xz ext4.xz"
+INITRAMFS_FSTYPES := ""
+
+#
+# THE FUTURE is 'wic'
+# IMAGE_FSTYPES_append = " wic"
+
+# Board templates can add extra IMAGE_FSTYPES through this.
+# It is added (late) through the AGL image recipes.
+AGL_EXTRA_IMAGE_FSTYPES ?= ""