diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-02-01 14:23:40 +0000 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2018-03-05 11:45:40 -0500 |
commit | 0db9697dc6b8cb470cd97377638af69dc1052189 (patch) | |
tree | c22262d4a8729e2b9de0afdb0f070ffee59a13f7 | |
parent | 29e280ee11c9a6f13c004ff25299668e4616f275 (diff) | |
download | meta-openembedded-0db9697dc6b8cb470cd97377638af69dc1052189.tar.gz |
samba, openwsman, pam-ssh-agent-auth, sblim-sfcb, passwdqc, python-pam, smbnetfs: require pam in DISTRO_FEATURES
* there is explicit dependency on libpam without respecting pam in DISTRO_FEATURES
so add the check to prevent people building it against broken libpam
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
7 files changed, 23 insertions, 3 deletions
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb index fefc04538..c72936c08 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb | |||
@@ -11,6 +11,10 @@ HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" | |||
11 | DEPENDS = "fuse samba" | 11 | DEPENDS = "fuse samba" |
12 | DEPENDS_append_libc-musl = " libexecinfo" | 12 | DEPENDS_append_libc-musl = " libexecinfo" |
13 | 13 | ||
14 | # samba depends on libpam | ||
15 | inherit distro_features_check | ||
16 | REQUIRED_DISTRO_FEATURES = "pam" | ||
17 | |||
14 | inherit autotools gitpkgv pkgconfig | 18 | inherit autotools gitpkgv pkgconfig |
15 | 19 | ||
16 | PKGV = "${GITPKGVTAG}" | 20 | PKGV = "${GITPKGVTAG}" |
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb index 686998e5e..854cb8af5 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb | |||
@@ -40,9 +40,10 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d | |||
40 | # remove default added RDEPENDS on perl | 40 | # remove default added RDEPENDS on perl |
41 | RDEPENDS_${PN}_remove = "perl" | 41 | RDEPENDS_${PN}_remove = "perl" |
42 | 42 | ||
43 | #DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" | 43 | DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" |
44 | DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libbsd libaio libpam" | 44 | |
45 | DEPENDS += "libldb" | 45 | inherit distro_features_check |
46 | REQUIRED_DISTRO_FEATURES = "pam" | ||
46 | 47 | ||
47 | DEPENDS_append_libc-musl = " libtirpc" | 48 | DEPENDS_append_libc-musl = " libtirpc" |
48 | CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" | 49 | CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" |
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb index c4778ca38..f618f02b5 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb | |||
@@ -12,6 +12,9 @@ SECTION = "Applications/System" | |||
12 | 12 | ||
13 | DEPENDS = "curl libxml2 openssl libpam" | 13 | DEPENDS = "curl libxml2 openssl libpam" |
14 | 14 | ||
15 | inherit distro_features_check | ||
16 | REQUIRED_DISTRO_FEATURES = "pam" | ||
17 | |||
15 | SRCREV = "feb7ec9b004fcaea0dbe65ce8a1a79cc29dd994c" | 18 | SRCREV = "feb7ec9b004fcaea0dbe65ce8a1a79cc29dd994c" |
16 | PV = "2.6.3" | 19 | PV = "2.6.3" |
17 | 20 | ||
diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index ff88533ff..1638c41c8 100644 --- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb | |||
@@ -13,6 +13,9 @@ SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f | |||
13 | 13 | ||
14 | DEPENDS += "libpam openssl" | 14 | DEPENDS += "libpam openssl" |
15 | 15 | ||
16 | inherit distro_features_check | ||
17 | REQUIRED_DISTRO_FEATURES = "pam" | ||
18 | |||
16 | # This gets us ssh-agent, which we are almost certain to want. | 19 | # This gets us ssh-agent, which we are almost certain to want. |
17 | # | 20 | # |
18 | RDEPENDS_${PN} += "openssh-misc" | 21 | RDEPENDS_${PN} += "openssh-misc" |
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index c6b9f1019..152ae2290 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | |||
@@ -11,6 +11,9 @@ LICENSE = "EPL-1.0" | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" |
12 | DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" | 12 | DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" |
13 | 13 | ||
14 | inherit distro_features_check | ||
15 | REQUIRED_DISTRO_FEATURES = "pam" | ||
16 | |||
14 | SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ | 17 | SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ |
15 | file://sfcb.service \ | 18 | file://sfcb.service \ |
16 | file://sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch \ | 19 | file://sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch \ |
diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb index 198db3ce7..8fc0b3591 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb | |||
@@ -21,6 +21,9 @@ SECTION = "System Environment/Base" | |||
21 | 21 | ||
22 | DEPENDS += "libpam" | 22 | DEPENDS += "libpam" |
23 | 23 | ||
24 | inherit distro_features_check | ||
25 | REQUIRED_DISTRO_FEATURES = "pam" | ||
26 | |||
24 | LICENSE = "BSD" | 27 | LICENSE = "BSD" |
25 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" | 28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" |
26 | 29 | ||
diff --git a/meta-python/recipes-devtools/python/python-pam_1.8.2.bb b/meta-python/recipes-devtools/python/python-pam_1.8.2.bb index 05bddd527..60a3b43de 100644 --- a/meta-python/recipes-devtools/python/python-pam_1.8.2.bb +++ b/meta-python/recipes-devtools/python/python-pam_1.8.2.bb | |||
@@ -10,3 +10,6 @@ PYPI_PACKAGE = "python-pam" | |||
10 | inherit pypi setuptools | 10 | inherit pypi setuptools |
11 | 11 | ||
12 | RDEPENDS_${PN} = "libpam" | 12 | RDEPENDS_${PN} = "libpam" |
13 | |||
14 | inherit distro_features_check | ||
15 | REQUIRED_DISTRO_FEATURES = "pam" | ||