summaryrefslogtreecommitdiffstats
path: root/conf/distro
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2017-04-27 11:56:14 +0200
committerAnton Gerasimov <anton@advancedtelematic.com>2017-05-10 13:46:18 +0200
commit83e834567264d2e38ea6e184a809159e5a13f5a8 (patch)
tree977acf085fd77113d438b6bfb4df0e5216145126 /conf/distro
parentbae52014b6e3a49e7adf49373238dab9f5f3b4a2 (diff)
downloadmeta-updater-83e834567264d2e38ea6e184a809159e5a13f5a8.tar.gz
Make layer inclusion a neutral operation
Classes are and bbappends are reworked so that mere inclusion of this layer to bbappends.conf doesn't change anything. In addition class behavior can now be controlled by both inheriting sota.bblcass and enabling "sota" DISTRO_FEATURE.
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/poky-sota-systemd.conf6
-rw-r--r--conf/distro/poky-sota.conf3
2 files changed, 8 insertions, 1 deletions
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf
index e6f43f7..78ca1e5 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/conf/distro/poky-sota-systemd.conf
@@ -1,5 +1,7 @@
1require conf/distro/poky.conf 1require conf/distro/poky.conf
2 2
3DISTRO_FEATURES_append = " sota"
4
3DISTRO = "poky-sota" 5DISTRO = "poky-sota"
4DISTRO_NAME = "OTA-enabled Linux" 6DISTRO_NAME = "OTA-enabled Linux"
5DISTRO_VERSION = "1.0" 7DISTRO_VERSION = "1.0"
@@ -8,5 +10,7 @@ DISTRO_CODENAME = "sota"
8DISTRO_FEATURES_append = " systemd" 10DISTRO_FEATURES_append = " systemd"
9VIRTUAL-RUNTIME_init_manager = "systemd" 11VIRTUAL-RUNTIME_init_manager = "systemd"
10 12
11INHERIT += " sota" 13INHERIT_prepend = " sota"
12IMAGE_INSTALL_append = " connman connman-client rvi-sota-client" 14IMAGE_INSTALL_append = " connman connman-client rvi-sota-client"
15
16USER_CLASSES_remove = "image-prelink"
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf
index 6972a94..c56695e 100644
--- a/conf/distro/poky-sota.conf
+++ b/conf/distro/poky-sota.conf
@@ -1,5 +1,7 @@
1require conf/distro/poky.conf 1require conf/distro/poky.conf
2 2
3DISTRO_FEATURES_append = " sota"
4
3DISTRO = "poky-sota" 5DISTRO = "poky-sota"
4DISTRO_NAME = "OTA-enabled Linux" 6DISTRO_NAME = "OTA-enabled Linux"
5DISTRO_VERSION = "1.0" 7DISTRO_VERSION = "1.0"
@@ -7,3 +9,4 @@ DISTRO_CODENAME = "sota"
7 9
8INHERIT += " sota" 10INHERIT += " sota"
9IMAGE_INSTALL_append = " connman connman-client" 11IMAGE_INSTALL_append = " connman connman-client"
12USER_CLASSES_remove = "image-prelink"