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.

1 files changed, 2 insertions, 9 deletions

diff --git a/recipes-support/util-linux/util-linux_%.bbappend b/recipes-support/util-linux/util-linux_%.bbappend
index bd3f686..d653bb2 100644
--- a/recipes-support/util-linux/util-linux_%.bbappend
+++ b/recipes-support/util-linux/util-linux_%.bbappend
@@ -1,10 +1,3 @@
-PACKAGES_append_class-native = "util-linux-agetty-native util-linux-fdisk-native util-linux-cfdisk-native util-linux-sfdisk-native \
-             util-linux-swaponoff-native util-linux-losetup-native util-linux-umount-native \
-             util-linux-mount-native util-linux-readprofile-native util-linux-uuidd-native \
-             util-linux-uuidgen-native util-linux-lscpu-native util-linux-fsck-native util-linux-blkid \
-             util-linux-mkfs-native util-linux-mcookie-native util-linux-reset-native \
-             util-linux-mkfs.cramfs-native util-linux-fsck.cramfs-native util-linux-fstrim-native \
-             util-linux-partx-native ${PN}-bash-completion-native util-linux-hwclock \
-             util-linux-findfs-native util-linux-getopt-native util-linux-sulogin-native \
-             ${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount-native', '', d)}"
+PACKAGES_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' util-linux-agetty-native util-linux-fdisk-native util-linux-cfdisk-native util-linux-sfdisk-native util-linux-swaponoff-native util-linux-losetup-native util-linux-umount-native util-linux-mount-native util-linux-readprofile-native util-linux-uuidd-native util-linux-uuidgen-native util-linux-lscpu-native util-linux-fsck-native util-linux-blkid util-linux-mkfs-native util-linux-mcookie-native util-linux-reset-native util-linux-mkfs.cramfs-native util-linux-fsck.cramfs-native util-linux-fstrim-native util-linux-partx-native ${PN}-bash-completion-native util-linux-hwclock util-linux-findfs-native util-linux-getopt-native util-linux-sulogin-native', ' ', d)}"
 
+PACKAGES_append_class-native = "${@' util-linux-pylibmount-native' if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d) and bb.utils.contains('PACKAGECONFIG', 'pylibmount', True, False, d) else ' '}"