summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Wise <phil@advancedtelematic.com>2017-05-23 14:17:10 +0200
committerPhil Wise <phil@advancedtelematic.com>2017-05-23 15:51:06 +0200
commita446bf18f0ef68a1a39fbf51d79cec2fa8bb4bf2 (patch)
tree1a57eb6c504582692338f6868eadc4203ead5080
parent35483eef70306015b4807d066f9cb2c19af7b200 (diff)
downloadmeta-updater-a446bf18f0ef68a1a39fbf51d79cec2fa8bb4bf2.tar.gz
Extract common distro configuration into sota.conf.inc
Pull the common lines from the poky-sota.conf and poky-sota-systemd.conf example distributions into a separate include file that can be pulled into other environments. This might be by including it in a user's own custom distro, or by directly including it in local.conf (e.g. AGL). require conf/distro/sota.conf.inc
-rw-r--r--conf/distro/poky-sota-systemd.conf6
-rw-r--r--conf/distro/poky-sota.conf7
-rw-r--r--conf/distro/sota.conf.inc11
3 files changed, 13 insertions, 11 deletions
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf
index 62b682a..726e9f9 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/conf/distro/poky-sota-systemd.conf
@@ -1,6 +1,6 @@
1require conf/distro/poky.conf 1require conf/distro/poky.conf
2 2
3DISTRO_FEATURES_append = " sota" 3require conf/distro/sota.conf.inc
4 4
5DISTRO = "poky-sota" 5DISTRO = "poky-sota"
6DISTRO_NAME = "OTA-enabled Linux" 6DISTRO_NAME = "OTA-enabled Linux"
@@ -10,8 +10,4 @@ DISTRO_CODENAME = "sota"
10DISTRO_FEATURES_append = " systemd" 10DISTRO_FEATURES_append = " systemd"
11VIRTUAL-RUNTIME_init_manager = "systemd" 11VIRTUAL-RUNTIME_init_manager = "systemd"
12 12
13INHERIT_prepend = " sota"
14IMAGE_INSTALL_append = " connman connman-client rvi-sota-client" 13IMAGE_INSTALL_append = " connman connman-client rvi-sota-client"
15
16# Prelinking increases the size of downloads and causes build errors
17USER_CLASSES_remove = "image-prelink"
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf
index c52395d..2bbc62b 100644
--- a/conf/distro/poky-sota.conf
+++ b/conf/distro/poky-sota.conf
@@ -1,14 +1,9 @@
1require conf/distro/poky.conf 1require conf/distro/poky.conf
2 2require conf/distro/sota.conf.inc
3DISTRO_FEATURES_append = " sota"
4 3
5DISTRO = "poky-sota" 4DISTRO = "poky-sota"
6DISTRO_NAME = "OTA-enabled Linux" 5DISTRO_NAME = "OTA-enabled Linux"
7DISTRO_VERSION = "1.0" 6DISTRO_VERSION = "1.0"
8DISTRO_CODENAME = "sota" 7DISTRO_CODENAME = "sota"
9 8
10INHERIT += " sota"
11IMAGE_INSTALL_append = " connman connman-client" 9IMAGE_INSTALL_append = " connman connman-client"
12
13# Prelinking increases the size of downloads and causes build errors
14USER_CLASSES_remove = "image-prelink"
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
new file mode 100644
index 0000000..fddd1d2
--- /dev/null
+++ b/conf/distro/sota.conf.inc
@@ -0,0 +1,11 @@
1# Common settings to enable SOTA
2# This can be pulled into a custom distribution, or included in
3# local.conf directly with:
4#
5# require conf/distro/sota.conf.inc
6
7DISTRO_FEATURES_append = " sota"
8INHERIT += " sota"
9IMAGE_INSTALL_append = " aktualizr"
10# Prelinking increases the size of downloads and causes build errors
11USER_CLASSES_remove = "image-prelink"