summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-03-01 10:11:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 11:35:41 +0000
commita51236a2441c33558568b649f7ca0363856697f7 (patch)
treef1b7b87b6867dd935c554aed2e6c45542e3a3ec0
parent52de574e0db0a7c5cce9681ac68fe488d5d029d2 (diff)
downloadpoky-a51236a2441c33558568b649f7ca0363856697f7.tar.gz
libpam: be more strict about user's sanity
* replace do_pam_sanity function with distro_features_check inherit * fixes: WARNING: libpam-1.3.0-r5 do_pam_sanity: Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly in world builds and prevents user to build libpam at all without pam in DISTRO_FEATURES, I don't see any users of this which wouldn't respect pam in DISTRO_FEATURES * only libuser is depending on libpam without respecting DISTRO_FEATURES * there are few recipes in meta-oe layers depending on libpam without respecting DISTRO_FEATURES, I've sent patch for them: samba, openwsman, pam-ssh-agent-auth, sblim-sfcb, passwdqc, python-pam, smbnetfs and omxplayer in meta-raspberrypi, I've sent PR for that one: https://github.com/agherzan/meta-raspberrypi/pull/192 * poky-lsb will need to add pam to DISTRO_FEATURES in order to build packagegroup-core-lsb (From OE-Core rev: c9e7a276859d38aaa03845ee09428f62760ad147) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/libuser/libuser_0.62.bb3
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb3
-rw-r--r--meta/recipes-extended/pam/libpam_1.3.0.bb7
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
22 22
23DEPENDS = "popt libpam glib-2.0 python3" 23DEPENDS = "popt libpam glib-2.0 python3"
24 24
25inherit distro_features_check
26REQUIRED_DISTRO_FEATURES = "pam"
27
25inherit autotools gettext python3native python3-dir pkgconfig gtk-doc 28inherit autotools gettext python3native python3-dir pkgconfig gtk-doc
26 29
27EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" 30EXTRA_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"
14# libglu needs virtual/libgl, which requires opengl in DISTRO_FEATURES 14# libglu needs virtual/libgl, which requires opengl in DISTRO_FEATURES
15REQUIRED_DISTRO_FEATURES += "opengl" 15REQUIRED_DISTRO_FEATURES += "opengl"
16 16
17# libpam, pam-plugin-wheel requires pam in DISTRO_FEATURES
18REQUIRED_DISTRO_FEATURES += "pam"
19
17# 20#
18# We will skip parsing this packagegeoup for non-glibc systems 21# We will skip parsing this packagegeoup for non-glibc systems
19# 22#
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() {
151 fi 151 fi
152} 152}
153 153
154python do_pam_sanity () { 154inherit distro_features_check
155 if not bb.utils.contains('DISTRO_FEATURES', 'pam', True, False, d): 155REQUIRED_DISTRO_FEATURES = "pam"
156 bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly")
157}
158addtask pam_sanity before do_configure
159 156
160BBCLASSEXTEND = "nativesdk native" 157BBCLASSEXTEND = "nativesdk native"
161 158