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
Post-rc2 bump
[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
4afdf5a
..
f217f78
100644
(file)
--- a/
meta-agl-distro/conf/distro/poky-agl.conf
+++ b/
meta-agl-distro/conf/distro/poky-agl.conf
@@
-3,10
+3,10
@@
require conf/distro/poky.conf
# AGL specific derivations
DISTRO = "poky-agl"
DISTRO_NAME = "Automotive Grade Linux"
# AGL specific derivations
DISTRO = "poky-agl"
DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "5.9
0.0
+snapshot-${DATE}"
-#DISTRO_VERSION
= "5.90.0
"
+DISTRO_VERSION = "5.9
9.2
+snapshot-${DATE}"
+#DISTRO_VERSION
:= "5.99.2
"
DISTRO_CODENAME = "flounder"
DISTRO_CODENAME = "flounder"
-DISTRO_BRANCH_VERSION_TAG
= "flounder/5.90.0
"
+DISTRO_BRANCH_VERSION_TAG
:= "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}
"
SDK_VENDOR = "-aglsdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
SDK_VENDOR = "-aglsdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@
-16,8
+16,8
@@
AGL_BRANCH = "master"
AGL_APP_REVISION = "${AUTOREV}"
AGL_DEFAULT_REVISION = "${AUTOREV}"
#for release
AGL_APP_REVISION = "${AUTOREV}"
AGL_DEFAULT_REVISION = "${AUTOREV}"
#for release
-#AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-#AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#AGL_APP_REVISION
:
= "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+#AGL_DEFAULT_REVISION
:
= "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
@@
-66,7
+66,7
@@
DISTRO_FEATURES_APPEND = " "
DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
-PREFERRED_VERSION_wayland-ivi-extension ?= "
1.1
%"
+PREFERRED_VERSION_wayland-ivi-extension ?= "
2.0.
%"
# Prefer GStreamer 1.10.x by default
PREFERRED_VERSION_gstreamer1.0 ?= "1.12.%"
# Prefer GStreamer 1.10.x by default
PREFERRED_VERSION_gstreamer1.0 ?= "1.12.%"
@@
-146,8
+146,14
@@
INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FST
# THE FUTURE is 'wic'
# IMAGE_FSTYPES_append = " wic"
# THE FUTURE is 'wic'
# IMAGE_FSTYPES_append = " wic"
+# enable the packagemanagement
+IMAGE_FEATURES =+ "package-management"
+PACKAGE_FEED_URIS = "http://192.168.7.1:8000/tmp/deploy/"
+PACKAGE_FEED_BASE_PATHS = "rpm"
+PACKAGE_FEED_ARCHS = ""
+#${PACKAGE_ARCHS}"
+
# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
-# (revalidate after 2017-10-15)
+# (revalidate after 2017-10-15
, 2018-06-12: still required
)
DIRFILES_pn-nativesdk-cmake = "1"
DIRFILES_pn-nativesdk-cmake = "1"
-