diff options
| -rw-r--r-- | meta/recipes-extended/libuser/libuser_0.62.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/pam/libpam_1.3.0.bb | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-extended/libuser/libuser_0.62.bb b/meta/recipes-extended/libuser/libuser_0.62.bb index 1765346646..7ec54eb16e 100644 --- a/meta/recipes-extended/libuser/libuser_0.62.bb +++ b/meta/recipes-extended/libuser/libuser_0.62.bb @@ -22,6 +22,9 @@ SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3c DEPENDS = "popt libpam glib-2.0 python3" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + inherit autotools gettext python3native python3-dir pkgconfig gtk-doc EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 8959e3c8f4..53d100ce74 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -14,6 +14,9 @@ REQUIRED_DISTRO_FEATURES = "x11" # libglu needs virtual/libgl, which requires opengl in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES += "opengl" +# libpam, pam-plugin-wheel requires pam in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES += "pam" + # # We will skip parsing this packagegeoup for non-glibc systems # diff --git a/meta/recipes-extended/pam/libpam_1.3.0.bb b/meta/recipes-extended/pam/libpam_1.3.0.bb index 8f7753d001..92ab72a42f 100644 --- a/meta/recipes-extended/pam/libpam_1.3.0.bb +++ b/meta/recipes-extended/pam/libpam_1.3.0.bb @@ -151,11 +151,8 @@ do_install() { fi } -python do_pam_sanity () { - if not bb.utils.contains('DISTRO_FEATURES', 'pam', True, False, d): - bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") -} -addtask pam_sanity before do_configure +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" BBCLASSEXTEND = "nativesdk native" |