diff options
| author | Anton Gerasimov <anton@advancedtelematic.com> | 2017-07-05 12:11:52 +0200 |
|---|---|---|
| committer | Anton Gerasimov <anton@advancedtelematic.com> | 2017-07-05 12:11:52 +0200 |
| commit | 69a0db9291725b1ddfa643dc00d6d2f1bf6c5caf (patch) | |
| tree | c9e4c89bce12a81ddd364b2676c8a005fff725dd /conf | |
| parent | b0d9d7018502a29f062895f853efd41e7b760d5a (diff) | |
| parent | b56329a3745c93060888492db8e5762ba2628783 (diff) | |
| download | meta-updater-69a0db9291725b1ddfa643dc00d6d2f1bf6c5caf.tar.gz | |
Merge branch 'morty' into pyro
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/sota.conf.inc | 1 | ||||
| -rw-r--r-- | conf/include/bblayers/sota_m3ulcb.inc | 2 |
2 files changed, 2 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 @@ | |||
| 7 | DISTRO_FEATURES_append = " sota" | 7 | DISTRO_FEATURES_append = " sota" |
| 8 | DISTRO_FEATURES_NATIVE_append = " sota" | 8 | DISTRO_FEATURES_NATIVE_append = " sota" |
| 9 | INHERIT += " sota" | 9 | INHERIT += " sota" |
| 10 | SOTA_CLIENT ?= "aktualizr" | ||
| 11 | # Prelinking increases the size of downloads and causes build errors | 10 | # Prelinking increases the size of downloads and causes build errors |
| 12 | USER_CLASSES_remove = "image-prelink" | 11 | USER_CLASSES_remove = "image-prelink" |
| 13 | 12 | ||
diff --git a/conf/include/bblayers/sota_m3ulcb.inc b/conf/include/bblayers/sota_m3ulcb.inc new file mode 100644 index 0000000..04f78e4 --- /dev/null +++ b/conf/include/bblayers/sota_m3ulcb.inc | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | |||
| 2 | BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas-rcar-gen3 ${METADIR}/meta-openembedded/meta-multimedia" | ||