From 83e834567264d2e38ea6e184a809159e5a13f5a8 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 27 Apr 2017 11:56:14 +0200 Subject: 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. --- recipes-support/fuse/fuse_%.bbappend | 4 ++-- recipes-support/glib-networking/glib-networking_%.bbappend | 2 +- recipes-support/gpgme/gpgme_%.bbappend | 2 +- recipes-support/libsoup/libsoup-2.4_%.bbappend | 4 ++-- recipes-support/libssh2/libssh2_%.bbappend | 2 +- recipes-support/util-linux/util-linux_%.bbappend | 11 ++--------- 6 files changed, 9 insertions(+), 16 deletions(-) (limited to 'recipes-support') diff --git a/recipes-support/fuse/fuse_%.bbappend b/recipes-support/fuse/fuse_%.bbappend index 4f23349..85bdf50 100644 --- a/recipes-support/fuse/fuse_%.bbappend +++ b/recipes-support/fuse/fuse_%.bbappend @@ -1,3 +1,3 @@ -BBCLASSEXTEND = "native" +BBCLASSEXTEND_append_sota = " native" -PACKAGES_append_class-native = "fuse-utils-dbg-native fuse-utils-native libulockmgr-native libulockmgr-dev-native libulockmgr-dbg-native" +PACKAGES_append_class-native_sota = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' fuse-utils-dbg-native fuse-utils-native libulockmgr-native libulockmgr-dev-native libulockmgr-dbg-native', ' ', d)}" diff --git a/recipes-support/glib-networking/glib-networking_%.bbappend b/recipes-support/glib-networking/glib-networking_%.bbappend index d3267ac..fccb949 100644 --- a/recipes-support/glib-networking/glib-networking_%.bbappend +++ b/recipes-support/glib-networking/glib-networking_%.bbappend @@ -1 +1 @@ -BBCLASSEXTEND = "native" +BBCLASSEXTEND_append_sota = " native" diff --git a/recipes-support/gpgme/gpgme_%.bbappend b/recipes-support/gpgme/gpgme_%.bbappend index d3267ac..27f258e 100644 --- a/recipes-support/gpgme/gpgme_%.bbappend +++ b/recipes-support/gpgme/gpgme_%.bbappend @@ -1 +1 @@ -BBCLASSEXTEND = "native" +BBCLASSEXTEND_append_sota = "native" diff --git a/recipes-support/libsoup/libsoup-2.4_%.bbappend b/recipes-support/libsoup/libsoup-2.4_%.bbappend index ed24273..ce4df6d 100644 --- a/recipes-support/libsoup/libsoup-2.4_%.bbappend +++ b/recipes-support/libsoup/libsoup-2.4_%.bbappend @@ -1,3 +1,3 @@ -BBCLASSEXTEND = "native" +BBCLASSEXTEND_append_sota = " native" -DEPENDS_append_class-native = " glib-networking-native" +DEPENDS_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' glib-networking-native', ' ', d)}" diff --git a/recipes-support/libssh2/libssh2_%.bbappend b/recipes-support/libssh2/libssh2_%.bbappend index ce4807e..bebaf84 100644 --- a/recipes-support/libssh2/libssh2_%.bbappend +++ b/recipes-support/libssh2/libssh2_%.bbappend @@ -1,2 +1,2 @@ # meta-oe/recipes-support/libssh2 -BBCLASSEXTEND = "native" +BBCLASSEXTEND_append_sota = " native" 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 ' '}" -- cgit v1.2.3-54-g00ecf