diff options
author | Anton Gerasimov <anton@advancedtelematic.com> | 2017-05-10 14:09:40 +0200 |
---|---|---|
committer | Anton Gerasimov <anton@advancedtelematic.com> | 2017-05-11 14:38:55 +0200 |
commit | db156eb572c52c70f6b4ec111734f314febddc47 (patch) | |
tree | 645434eda8f625aa88b84972b57cc0c305a60f0d /conf | |
parent | 83e834567264d2e38ea6e184a809159e5a13f5a8 (diff) | |
parent | 221a3753efeb67ea2c5e06dc7033c03385d37a00 (diff) | |
download | meta-updater-db156eb572c52c70f6b4ec111734f314febddc47.tar.gz |
Merge remote-tracking branch 'origin/morty' into feat/noop
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/poky-sota-systemd.conf | 1 | ||||
-rw-r--r-- | conf/distro/poky-sota.conf | 2 | ||||
-rw-r--r-- | conf/include/bblayers/sota_am335x-evm.inc | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf index 78ca1e5..62b682a 100644 --- a/conf/distro/poky-sota-systemd.conf +++ b/conf/distro/poky-sota-systemd.conf | |||
@@ -13,4 +13,5 @@ VIRTUAL-RUNTIME_init_manager = "systemd" | |||
13 | INHERIT_prepend = " sota" | 13 | INHERIT_prepend = " sota" |
14 | IMAGE_INSTALL_append = " connman connman-client rvi-sota-client" | 14 | IMAGE_INSTALL_append = " connman connman-client rvi-sota-client" |
15 | 15 | ||
16 | # Prelinking increases the size of downloads and causes build errors | ||
16 | USER_CLASSES_remove = "image-prelink" | 17 | USER_CLASSES_remove = "image-prelink" |
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf index c56695e..c52395d 100644 --- a/conf/distro/poky-sota.conf +++ b/conf/distro/poky-sota.conf | |||
@@ -9,4 +9,6 @@ DISTRO_CODENAME = "sota" | |||
9 | 9 | ||
10 | INHERIT += " sota" | 10 | INHERIT += " sota" |
11 | IMAGE_INSTALL_append = " connman connman-client" | 11 | IMAGE_INSTALL_append = " connman connman-client" |
12 | |||
13 | # Prelinking increases the size of downloads and causes build errors | ||
12 | USER_CLASSES_remove = "image-prelink" | 14 | USER_CLASSES_remove = "image-prelink" |
diff --git a/conf/include/bblayers/sota_am335x-evm.inc b/conf/include/bblayers/sota_am335x-evm.inc new file mode 100644 index 0000000..f2d485d --- /dev/null +++ b/conf/include/bblayers/sota_am335x-evm.inc | |||
@@ -0,0 +1,2 @@ | |||
1 | |||
2 | BBLAYERS += " ${METADIR}/meta-ti " | ||