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
Change master to Magic Marlin
[AGL/meta-agl.git]
/
meta-agl-core
/
conf
/
distro
/
poky-agl.conf
diff --git
a/meta-agl-core/conf/distro/poky-agl.conf
b/meta-agl-core/conf/distro/poky-agl.conf
index
a5cf79d
..
e13dff4
100644
(file)
--- a/
meta-agl-core/conf/distro/poky-agl.conf
+++ b/
meta-agl-core/conf/distro/poky-agl.conf
@@
-6,9
+6,9
@@
DISTRO_NAME = "Automotive Grade Linux"
# Release flags
# Release flags
-DISTRO_CODENAME = "
lamprey
"
+DISTRO_CODENAME = "
marlin
"
AGL_BRANCH = "master"
AGL_BRANCH = "master"
-AGLVERSION = "1
1
.90.0"
+AGLVERSION = "1
2
.90.0"
# switch devel/release
AGLRELEASETYPE ?= "agldevelopment"
#AGLRELEASETYPE ?= "aglrelease"
# switch devel/release
AGLRELEASETYPE ?= "agldevelopment"
#AGLRELEASETYPE ?= "aglrelease"
@@
-60,6
+60,8
@@
DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
INIT_MANAGER = "systemd"
# Override default of "systemd-compat-units"
VIRTUAL-RUNTIME_initscripts = ""
INIT_MANAGER = "systemd"
# Override default of "systemd-compat-units"
VIRTUAL-RUNTIME_initscripts = ""
+# Override default of "busybox-syslog"
+VIRTUAL-RUNTIME_base-utils-syslog = ""
# network manager to use (possible values: systemd, connman)
VIRTUAL-RUNTIME_net_manager = "connman"
# network manager to use (possible values: systemd, connman)
VIRTUAL-RUNTIME_net_manager = "connman"
@@
-150,13
+152,6
@@
INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTY
# 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}"
-
# Complementary package definitions for agl-test-wgt and agl-devel-wgt
# image features
COMPLEMENTARY_GLOB[agl-test-wgt] = '*-test'
# Complementary package definitions for agl-test-wgt and agl-devel-wgt
# image features
COMPLEMENTARY_GLOB[agl-test-wgt] = '*-test'