zsh: fix base_bindir installation
PATCH 1/2 zsh: fix base_bindir installation
* fixes:
WARNING: zsh-5.3.1-r0 do_package: zsh: NOT adding alternative provide /bin/sh: /bin/zsh does not exist
* it was installing zsh into /usr/bin even when log.do_configure confirms correct path:
installation basename : zsh
binary install path : /bin
* no other files were moved:
$ find 5.3.1-r0.*/image 5.3.1-r0.new/image 5.3.1-r0.new/image/bin 5.3.1-r0.new/image/bin/zsh-5.3.1 5.3.1-r0.new/image/bin/zsh 5.3.1-r0.new/image/usr 5.3.1-r0.old/image 5.3.1-r0.old/image/usr 5.3.1-r0.old/image/usr/bin 5.3.1-r0.old/image/usr/bin/zsh-5.3.1 5.3.1-r0.old/image/usr/bin/zsh
--- meta-oe/recipes-extended/zsh/zsh_5.3.1.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-extended/zsh/zsh_5.3.1.bb +3 -0
@@ -30,6 +30,9 @@ EXTRA_OECONF = " \ zsh_cv_shared_environ=yes \ " +# Configure respects --bindir from EXTRA_OECONF, but then Src/Makefile will read bindir from environment +export bindir="${base_bindir}" + EXTRA_OEMAKE = "-e MAKEFLAGS=" ALTERNATIVE_${PN} = "sh"
Signature · 1 line
2.15.1
PATCH 2/2 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
--- meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb | 4 ++++ meta-networking/recipes-connectivity/samba/samba_4.7.0.bb | 7 ++++--- meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb | 3 +++ meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb | 3 +++ meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | 3 +++ meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb | 3 +++ meta-python/recipes-devtools/python/python-pam_1.8.2.bb | 3 +++ 7 files changed, 23 insertions(+), 3 deletions(-)
meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +4 -0
@@ -11,6 +11,10 @@ HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" DEPENDS = "fuse samba" DEPENDS_append_libc-musl = " libexecinfo" +# samba depends on libpam +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + inherit autotools gitpkgv pkgconfig PKGV = "${GITPKGVTAG}"
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +4 -3
@@ -40,9 +40,10 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl RDEPENDS_${PN}_remove = "perl" -#DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libbsd libaio libpam" -DEPENDS += "libldb" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc"
meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb +3 -0
@@ -12,6 +12,9 @@ SECTION = "Applications/System" DEPENDS = "curl libxml2 openssl libpam" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + SRCREV = "feb7ec9b004fcaea0dbe65ce8a1a79cc29dd994c" PV = "2.6.3"
meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +3 -0
@@ -13,6 +13,9 @@ SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f DEPENDS += "libpam openssl" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + # This gets us ssh-agent, which we are almost certain to want. # RDEPENDS_${PN} += "openssh-misc"
meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +3 -0
@@ -11,6 +11,9 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ file://sfcb.service \ file://sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch \
meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb +3 -0
@@ -21,6 +21,9 @@ SECTION = "System Environment/Base" DEPENDS += "libpam" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d"
meta-python/recipes-devtools/python/python-pam_1.8.2.bb +3 -0
@@ -10,3 +10,6 @@ PYPI_PACKAGE = "python-pam" inherit pypi setuptools RDEPENDS_${PN} = "libpam" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam"
Signature · 1 line
2.15.1
Re: [meta-oe][PATCH 2/2] samba, openwsman, pam-ssh-agent-auth, sblim-sfcb, passwdqc, python-pam, smbnetfs: require pam in DISTRO_FEATURES
Hi Martin,
Quoted 2 lines · On Thu, 1 Feb 2018 14:23:40 +0000 Martin Jansa <[email protected]> wrote:
* there is explicit dependency on libpam without respecting pam in
DISTRO_FEATURESso add the check to prevent people building it against broken libpam
[...]
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb inherit systemd waf-samba cpan-base perlnative update-rc.d · line 46
Quoted 13 lines
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +4
-3@@ -40,9 +40,10 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl RDEPENDS_${PN}_remove = "perl" -#DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libbsd libaio libpam" -DEPENDS += "libldb" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam"
AFAIR, Samba doesn't build without libpam, but runs fine without a PAM installation. Which problem you're trying to solve? I guess it's fair to expect a dysfunctional PAM library without the 'pam' distro feature.
Regards,
Andreas
Re: [meta-oe][PATCH 2/2] samba, openwsman, pam-ssh-agent-auth, sblim-sfcb, passwdqc, python-pam, smbnetfs: require pam in DISTRO_FEATURES
Hi Andreas,
I'm just trying to get rid of libpam from builds without pam in DISTRO_FEATURES (even for world builds, see the change for oe-core).
I'm aware that libpam usage from samba is a bit strange as discussed few times:
http://lists.openembedded.org/pipermail/openembedded-commits/2016-October/198752.html
http://lists.openembedded.org/pipermail/openembedded-devel/2016-March/106583.html
http://lists.openembedded.org/pipermail/openembedded-devel/2016-September/109143.html
Now RSS and also with libpam being available only when pam is in DISTRO_FEATURES, we might possibly return the PACKAGECONFIG without re-introducing undeterministic link with libpam, but I'm not using samba (other than building it in bitbake world) so I'll let that to people who actually care about samba itself (and can properly test it in runtime).
Regards,
Quoted 36 lines · Andreas Oberritter
Hi Martin,
Quoted 1 line · On Thu, 1 Feb 2018 14:23:40 +0000 Martin Jansa <[email protected]> wrote:
* there is explicit dependency on libpam without respecting pam in
DISTRO_FEATURESQuoted 1 line
so add the check to prevent people building it against broken libpam
[...]
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb inherit systemd waf-samba cpan-base perlnative
Quoted 3 lines
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +0
-0@@ -40,9 +40,10 @@ inherit systemd waf-samba cpan-base perlnativeupdate-rc.d
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb inherit systemd waf-samba cpan-base perlnative update-rc.d
Quoted 4 lines
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +0
-1# remove default added RDEPENDS on perl RDEPENDS_${PN}_remove = "perl" -#DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdblibtevent libldb libbsd libaio libpam"
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb inherit systemd waf-samba cpan-base perlnative · line 44
Quoted 1 line
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +0
-1-DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdblibtevent libbsd libaio libpam"
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb inherit systemd waf-samba cpan-base perlnative · line 43
Quoted 2 lines
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +1
-1-DEPENDS += "libldb" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdblibtevent libldb libbsd libaio libpam"
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb inherit systemd waf-samba cpan-base perlnative update-rc.d · line 46
Quoted 3 lines
meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +3
-0+ +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam"AFAIR, Samba doesn't build without libpam, but runs fine without a PAM installation. Which problem you're trying to solve? I guess it's fair to expect a dysfunctional PAM library without the 'pam' distro feature.
Regards,
Andreas
Re: [meta-oe][PATCH 2/2] samba, openwsman, pam-ssh-agent-auth, sblim-sfcb, passwdqc, python-pam, smbnetfs: require pam in DISTRO_FEATURES
Hi Martin,
Quoted 11 lines · On Thu, 1 Feb 2018 17:07:55 +0100 Martin Jansa <[email protected]> wrote:
Hi Andreas,
I'm just trying to get rid of libpam from builds without pam in
DISTRO_FEATURES(even for world builds, see the change for oe-core).I'm aware that libpam usage from samba is a bit strange as discussed few times:
http://lists.openembedded.org/pipermail/openembedded-commits/2016-October/198752.html
http://lists.openembedded.org/pipermail/openembedded-devel/2016-March/106583.html
http://lists.openembedded.org/pipermail/openembedded-devel/2016-September/109143.html
Quoted 5 lines
Now RSS and also with libpam being available only when pam is in
DISTRO_FEATURES, we might possibly return the PACKAGECONFIG without re-introducing undeterministic link with libpam, but I'm not using samba (other than building it in bitbake world) so I'll let that to people who actually care about samba itself (and can properly test it in runtime).
I see. Somebody can revert fb5967aaff1a7ee6b5508269735ce2f1b1a7e020 later.
Regards,
Andreas