summaryrefslogtreecommitdiffstats
path: root/conf/distro
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2017-07-05 12:11:52 +0200
committerAnton Gerasimov <anton@advancedtelematic.com>2017-07-05 12:11:52 +0200
commit69a0db9291725b1ddfa643dc00d6d2f1bf6c5caf (patch)
treec9e4c89bce12a81ddd364b2676c8a005fff725dd /conf/distro
parentb0d9d7018502a29f062895f853efd41e7b760d5a (diff)
parentb56329a3745c93060888492db8e5762ba2628783 (diff)
downloadmeta-updater-69a0db9291725b1ddfa643dc00d6d2f1bf6c5caf.tar.gz
Merge branch 'morty' into pyro
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/sota.conf.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index 1775d92..ea1ca95 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -7,7 +7,6 @@
7DISTRO_FEATURES_append = " sota" 7DISTRO_FEATURES_append = " sota"
8DISTRO_FEATURES_NATIVE_append = " sota" 8DISTRO_FEATURES_NATIVE_append = " sota"
9INHERIT += " sota" 9INHERIT += " sota"
10SOTA_CLIENT ?= "aktualizr"
11# Prelinking increases the size of downloads and causes build errors 10# Prelinking increases the size of downloads and causes build errors
12USER_CLASSES_remove = "image-prelink" 11USER_CLASSES_remove = "image-prelink"
13 12