X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=72af5d0cbedf0ebb780eee6a3fcbe8977e2b1060;hb=3903550aa47775917963f87040ec96bed122cf7c;hp=639e35554450931fee3f394300616fbc01cae014;hpb=b16f1f6b8bdd7b0cef4aad3a6714798b66d8b0a5;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 639e35554..72af5d0cb 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -6,9 +6,9 @@ DISTRO_NAME = "Automotive Grade Linux" # Release flags -DISTRO_CODENAME = "jellyfish" +DISTRO_CODENAME = "koi" AGL_BRANCH = "master" -AGLVERSION = "9.90.0" +AGLVERSION = "10.90.0" # switch devel/release AGLRELEASETYPE ?= "agldevelopment" #AGLRELEASETYPE ?= "aglrelease" @@ -30,8 +30,8 @@ AGL_DEFAULT_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" # enable the flag BUILD_REPRODUCIBLE_BINARIES = "1" # Set the desired timestamps -export SOURCE_DATE_EPOCH = "1583798400" -REPRODUCIBLE_TIMESTAMP_ROOTFS = "1583798400" +export SOURCE_DATE_EPOCH = "1593400000" +REPRODUCIBLE_TIMESTAMP_ROOTFS = "1593400000" # inherit the class INHERIT += "reproducible_build" @@ -46,7 +46,7 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" SDKPATH = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}" -MAINTAINER = "AGL " +MAINTAINER = "AGL https://lists.automotivelinux.org/g/agl-dev-community" TARGET_VENDOR = "-agl" @@ -55,7 +55,7 @@ AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bl POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}" OVERRIDES .= ":${DISTRO_CODENAME}" -QEMU_TARGETS ?= "arm aarch64 i386 x86_64" +QEMU_TARGETS ?= "arm aarch64 i386 x86_64 riscv64" # Other QEMU_TARGETS "mips mips64 mips64el ppc sh4" MIRRORS =+ "\ @@ -171,6 +171,10 @@ PACKAGE_FEED_BASE_PATHS = "rpm" PACKAGE_FEED_ARCHS = "" #${PACKAGE_ARCHS}" +# Complementary package definitions for agl-test-wgt and agl-devel-wgt +# image features +COMPLEMENTARY_GLOB[agl-test-wgt] = '*-test' +COMPLEMENTARY_GLOB[agl-devel-wgt] = '*-coverage *-debug' # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools # (revalidate after 2017-10-15, 2018-06-12: still required) @@ -192,3 +196,12 @@ PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping" # support. Not having it is not an issue, since there is also explicit # enabling of required security features done by meta-agl/meta-security. BBMASK += "meta-security/recipes-kernel/linux/linux-%_5.%.bbappend" + +# Workaround for https://jira.automotivelinux.org/browse/SPEC-3621 +# TLDR: do_image_wic will modify the target's /etc/fstab while +# 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}"