diff options
Diffstat (limited to 'meta-agl/meta-agl-distro/conf')
-rw-r--r-- | meta-agl/meta-agl-distro/conf/distro/include/x86_64-tune.inc | 2 | ||||
-rw-r--r-- | meta-agl/meta-agl-distro/conf/distro/poky-agl.conf | 51 | ||||
-rw-r--r-- | meta-agl/meta-agl-distro/conf/layer.conf | 2 |
3 files changed, 38 insertions, 17 deletions
diff --git a/meta-agl/meta-agl-distro/conf/distro/include/x86_64-tune.inc b/meta-agl/meta-agl-distro/conf/distro/include/x86_64-tune.inc index 2efeca04..9f2bdc86 100644 --- a/meta-agl/meta-agl-distro/conf/distro/include/x86_64-tune.inc +++ b/meta-agl/meta-agl-distro/conf/distro/include/x86_64-tune.inc @@ -52,4 +52,4 @@ QB_CPU_x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" QB_CPU_KVM_x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy -QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" +QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci" diff --git a/meta-agl/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl/meta-agl-distro/conf/distro/poky-agl.conf index d1c580ea..42982944 100644 --- a/meta-agl/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl/meta-agl-distro/conf/distro/poky-agl.conf @@ -6,9 +6,9 @@ DISTRO_NAME = "Automotive Grade Linux" # Release flags -DISTRO_CODENAME = "icefish" -AGL_BRANCH = "icefish" -AGLVERSION = "9.0.1" +DISTRO_CODENAME = "jellyfish" +AGL_BRANCH = "jellyfish" +AGLVERSION = "10.0.0" # switch devel/release #AGLRELEASETYPE ?= "agldevelopment" AGLRELEASETYPE ?= "aglrelease" @@ -26,6 +26,15 @@ DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace(' AGL_APP_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" AGL_DEFAULT_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" +# reproducible builds: +# enable the flag +BUILD_REPRODUCIBLE_BINARIES = "1" +# Set the desired timestamps +export SOURCE_DATE_EPOCH = "1593400000" +REPRODUCIBLE_TIMESTAMP_ROOTFS = "1593400000" +# inherit the class +INHERIT += "reproducible_build" + # SDK SDK_VENDOR = "-aglsdk" @@ -37,12 +46,12 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" SDKPATH = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}" -MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>" +MAINTAINER = "AGL https://lists.automotivelinux.org/g/agl-dev-community" TARGET_VENDOR = "-agl" # Override these in poky based distros -AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5 3g" +AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5 3g polkit" POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}" OVERRIDES .= ":${DISTRO_CODENAME}" @@ -94,14 +103,14 @@ DISTRO_FEATURES_APPEND = " " DISTRO_FEATURES_remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio" -# Prefer GStreamer 1.14.x by default -PREFERRED_VERSION_gstreamer1.0 ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-libav ?= "1.14.%" -PREFERRED_VERSION_gstreamer1.0-omx ?= "1.14.%" +# Prefer GStreamer 1.16.x by default +PREFERRED_VERSION_gstreamer1.0 ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-libav ?= "1.16.%" +PREFERRED_VERSION_gstreamer1.0-omx ?= "1.16.%" # Prefer libjpeg-turbo PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" @@ -141,8 +150,10 @@ QB_AUDIO_OPT = "-soundhw hda" AGL_EXTRA_IMAGE_FSTYPES ??= "" AGL_EXTRA_INITRAMFS_FSTYPES ??= "" # -# Default IMAGE FSTYPES compressed tarball + ext4.xz -AGL_DEFAULT_IMAGE_FSTYPES ?= "tar.xz ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" +# Default IMAGE FSTYPES wic.xz +AGL_DEFAULT_IMAGE_FSTYPES ?= "wic.xz wic.bmap wic.xz.sha256sum" +AGL_DEFAULT_IMAGE_FSTYPES_qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" +AGL_DEFAULT_IMAGE_FSTYPES_append_netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz" # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this) @@ -160,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) @@ -175,3 +190,9 @@ PREFERRED_RPROVIDER_virtual/navigation ?= "ondemandnavi" # Set preferred provider for low-can device mapping configuration PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping" + +# Mask upstream meta-security bbappend that interferes with non-linux-yocto +# kernels due to the bug of having two wildcards, which bitbake does not +# 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" diff --git a/meta-agl/meta-agl-distro/conf/layer.conf b/meta-agl/meta-agl-distro/conf/layer.conf index 3c60fd4c..f8cf50c7 100644 --- a/meta-agl/meta-agl-distro/conf/layer.conf +++ b/meta-agl/meta-agl-distro/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "agl-distro" BBFILE_PATTERN_agl-distro = "^${LAYERDIR}/" BBFILE_PRIORITY_agl-distro = "70" -LAYERSERIES_COMPAT_agl-distro = "thud" +LAYERSERIES_COMPAT_agl-distro = "dunfell" |