<div dir="ltr">This breaks world builds on the autobuilder with poky-lsb:<div><br></div><div><a href="https://autobuilder.yocto.io/builders/nightly-world/builds/736/steps/BuildImages/logs/stdio">https://autobuilder.yocto.io/builders/nightly-world/builds/736/steps/BuildImages/logs/stdio</a><br></div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 1 February 2018 at 14:34, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">* replace do_pam_sanity function with distro_features_check inherit<br>
* fixes:<br>
WARNING: libpam-1.3.0-r5 do_pam_sanity: Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly<br>
in world builds and prevents user to build libpam at all without pam<br>
in DISTRO_FEATURES, I don't see any users of this which wouldn't respect<br>
pam in DISTRO_FEATURES<br>
* only libuser is depending on libpam without respecting DISTRO_FEATURES<br>
* there are few recipes in meta-oe layers depending on libpam without<br>
respecting DISTRO_FEATURES, I've sent patch for them:<br>
samba, openwsman, pam-ssh-agent-auth, sblim-sfcb, passwdqc, python-pam, smbnetfs<br>
and omxplayer in meta-raspberrypi, I've sent PR for that one:<br>
<a href="https://github.com/agherzan/meta-raspberrypi/pull/192" rel="noreferrer" target="_blank">https://github.com/agherzan/<wbr>meta-raspberrypi/pull/192</a><br>
<br>
Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
---<br>
meta/recipes-extended/libuser/<a href="http://libuser_0.62.bb" rel="noreferrer" target="_blank"><wbr>libuser_0.62.bb</a> | 3 +++<br>
meta/recipes-extended/pam/<a href="http://libpam_1.3.0.bb" rel="noreferrer" target="_blank">libp<wbr>am_1.3.0.bb</a> | 7 ++-----<br>
2 files changed, 5 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/meta/recipes-extended/<wbr>libuser/<a href="http://libuser_0.62.bb" rel="noreferrer" target="_blank">libuser_0.62.bb</a> b/meta/recipes-extended/<wbr>libuser/<a href="http://libuser_0.62.bb" rel="noreferrer" target="_blank">libuser_0.62.bb</a><br>
index 1765346646..7ec54eb16e 100644<br>
--- a/meta/recipes-extended/<wbr>libuser/<a href="http://libuser_0.62.bb" rel="noreferrer" target="_blank">libuser_0.62.bb</a><br>
+++ b/meta/recipes-extended/<wbr>libuser/<a href="http://libuser_0.62.bb" rel="noreferrer" target="_blank">libuser_0.62.bb</a><br>
@@ -22,6 +22,9 @@ SRC_URI[sha256sum] = "<wbr>a58ff4fabb01a25043b142185a33ee<wbr>ea961109dd60d4b40b6a9df4fa3c<br>
<br>
DEPENDS = "popt libpam glib-2.0 python3"<br>
<br>
+inherit distro_features_check<br>
+REQUIRED_DISTRO_FEATURES = "pam"<br>
+<br>
inherit autotools gettext python3native python3-dir pkgconfig gtk-doc<br>
<br>
EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_<wbr>INCDIR}/${PYTHON_DIR}${PYTHON_<wbr>ABI}"<br>
diff --git a/meta/recipes-extended/pam/<a href="http://libpam_1.3.0.bb" rel="noreferrer" target="_blank">li<wbr>bpam_1.3.0.bb</a> b/meta/recipes-extended/pam/<a href="http://libpam_1.3.0.bb" rel="noreferrer" target="_blank">li<wbr>bpam_1.3.0.bb</a><br>
index 8f7753d001..92ab72a42f 100644<br>
--- a/meta/recipes-extended/pam/<a href="http://libpam_1.3.0.bb" rel="noreferrer" target="_blank">li<wbr>bpam_1.3.0.bb</a><br>
+++ b/meta/recipes-extended/pam/<a href="http://libpam_1.3.0.bb" rel="noreferrer" target="_blank">li<wbr>bpam_1.3.0.bb</a><br>
@@ -151,11 +151,8 @@ do_install() {<br>
fi<br>
}<br>
<br>
-python do_pam_sanity () {<br>
- if not bb.utils.contains('DISTRO_<wbr>FEATURES', 'pam', True, False, d):<br>
- bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly")<br>
-}<br>
-addtask pam_sanity before do_configure<br>
+inherit distro_features_check<br>
+REQUIRED_DISTRO_FEATURES = "pam"<br>
<br>
BBCLASSEXTEND = "nativesdk native"<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.15.1<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>