Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update distro manifest for 9.99.2
[AGL/meta-agl.git]
/
meta-agl-distro
/
conf
/
distro
/
poky-agl.conf
diff --git
a/meta-agl-distro/conf/distro/poky-agl.conf
b/meta-agl-distro/conf/distro/poky-agl.conf
index
ef0e7f7
..
9e753f1
100644
(file)
--- a/
meta-agl-distro/conf/distro/poky-agl.conf
+++ b/
meta-agl-distro/conf/distro/poky-agl.conf
@@
-8,10
+8,10
@@
DISTRO_NAME = "Automotive Grade Linux"
# Release flags
DISTRO_CODENAME = "jellyfish"
AGL_BRANCH = "master"
# Release flags
DISTRO_CODENAME = "jellyfish"
AGL_BRANCH = "master"
-AGLVERSION = "9.9
0.0
"
+AGLVERSION = "9.9
9.2
"
# switch devel/release
# switch devel/release
-AGLRELEASETYPE ?= "agldevelopment"
-
#
AGLRELEASETYPE ?= "aglrelease"
+
#
AGLRELEASETYPE ?= "agldevelopment"
+AGLRELEASETYPE ?= "aglrelease"
OVERRIDES .= ":${AGLRELEASETYPE}"
#
OVERRIDES .= ":${AGLRELEASETYPE}"
#
@@
-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
# enable the flag
BUILD_REPRODUCIBLE_BINARIES = "1"
# Set the desired timestamps
-export SOURCE_DATE_EPOCH = "15
837984
00"
-REPRODUCIBLE_TIMESTAMP_ROOTFS = "15
837984
00"
+export SOURCE_DATE_EPOCH = "15
934000
00"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = "15
934000
00"
# inherit the class
INHERIT += "reproducible_build"
# 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}"
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"
TARGET_VENDOR = "-agl"
@@
-103,10
+103,7
@@
DISTRO_FEATURES_APPEND = " "
DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio"
DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio"
-# Prefer linux-yocto 4.19 LTS version by default
-PREFERRED_VERSION_linux-yocto = "4.19%"
-
-# Prefer GStreamer 1.14.x by default
+# 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 ?= "1.16.%"
PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.16.%"
PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.%"
@@
-174,6
+171,10
@@
PACKAGE_FEED_BASE_PATHS = "rpm"
PACKAGE_FEED_ARCHS = ""
#${PACKAGE_ARCHS}"
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)
# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
# (revalidate after 2017-10-15, 2018-06-12: still required)