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.

3 files changed, 9 insertions, 2 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 @@
 require conf/distro/poky.conf
 
+DISTRO_FEATURES_append = " sota"
+
 DISTRO = "poky-sota"
 DISTRO_NAME = "OTA-enabled Linux"
 DISTRO_VERSION = "1.0"
@@ -8,5 +10,7 @@ DISTRO_CODENAME = "sota"
 DISTRO_FEATURES_append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
-INHERIT += " sota"
+INHERIT_prepend = " sota"
 IMAGE_INSTALL_append = " connman connman-client rvi-sota-client"
+
+USER_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 @@
 require conf/distro/poky.conf
 
+DISTRO_FEATURES_append = " sota"
+
 DISTRO = "poky-sota"
 DISTRO_NAME = "OTA-enabled Linux"
 DISTRO_VERSION = "1.0"
@@ -7,3 +9,4 @@ DISTRO_CODENAME = "sota"
 
 INHERIT += " sota"
 IMAGE_INSTALL_append = " connman connman-client"
+USER_CLASSES_remove = "image-prelink"
diff --git a/conf/include/bblayers/sota_porter.inc b/conf/include/bblayers/sota_porter.inc
index a0888d5..6964ef0 100644
--- a/conf/include/bblayers/sota_porter.inc
+++ b/conf/include/bblayers/sota_porter.inc
@@ -1,2 +1,2 @@
 
-BBLAYERS += " ${METADIR}/meta-updater-porter ${METADIR}/meta-renesas "
+BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas/meta-rcar-gen2 ${METADIR}/meta-openembedded/meta-multimedia ${METADIR}/meta-updater-porter"